diff --git a/Gruntfile.js b/Gruntfile.js index 449434d3..d7a8b606 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -200,7 +200,6 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-open'); grunt.loadNpmTasks('grunt-concurrent'); - grunt.loadNpmTasks('grunt-saucelabs'); grunt.loadNpmTasks('grunt-contrib-watch'); @@ -260,10 +259,10 @@ module.exports = function(grunt) { 'concat', 'uglify']); - grunt.registerTask('test', ['manifests-to-js', 'karma:saucelabs']); + grunt.registerTask('test', ['jshint', 'manifests-to-js', 'karma:saucelabs']); // travis build task - grunt.registerTask('build:travis', ['jshint', 'test:node', 'test:sauce-browser']); + grunt.registerTask('test-local', ['jshint', 'manifests-to-js', 'qunit']); }; diff --git a/package.json b/package.json index 03292ffb..d841a907 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "license": "Apache 2", "scripts": { - "test": "grunt test" + "test": "grunt test-local" }, "devDependencies": { "grunt-contrib-jshint": "~0.6.0", diff --git a/test/.jshintrc b/test/.jshintrc index ee34e403..26c4a2ab 100644 --- a/test/.jshintrc +++ b/test/.jshintrc @@ -11,6 +11,7 @@ "boss": true, "eqnull": true, "browser": true, + "node": true, "predef": [ "QUnit", "module", @@ -26,6 +27,7 @@ "notDeepEqual", "strictEqual", "notStrictEqual", - "throws" + "throws", + "process" ] } diff --git a/test/karma.conf.js b/test/karma.conf.js index 5a817c7f..df9ab759 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -26,7 +26,7 @@ module.exports = function(config) { // - PhantomJS // - IE (only Windows) // Example usage: - browsers: ['chrome_test'] + browsers: ['chrome_test'], //'firefox_test', //'safari_test', //'ipad_test',