083e264e by Gary Katsevman

Don't use saucelabs for a bit now

1 parent 6a3fccb1
...@@ -200,7 +200,6 @@ module.exports = function(grunt) { ...@@ -200,7 +200,6 @@ module.exports = function(grunt) {
200 grunt.loadNpmTasks('grunt-contrib-connect'); 200 grunt.loadNpmTasks('grunt-contrib-connect');
201 grunt.loadNpmTasks('grunt-open'); 201 grunt.loadNpmTasks('grunt-open');
202 grunt.loadNpmTasks('grunt-concurrent'); 202 grunt.loadNpmTasks('grunt-concurrent');
203 grunt.loadNpmTasks('grunt-saucelabs');
204 grunt.loadNpmTasks('grunt-contrib-watch'); 203 grunt.loadNpmTasks('grunt-contrib-watch');
205 204
206 205
...@@ -260,10 +259,10 @@ module.exports = function(grunt) { ...@@ -260,10 +259,10 @@ module.exports = function(grunt) {
260 'concat', 259 'concat',
261 'uglify']); 260 'uglify']);
262 261
263 grunt.registerTask('test', ['manifests-to-js', 'karma:saucelabs']); 262 grunt.registerTask('test', ['jshint', 'manifests-to-js', 'karma:saucelabs']);
264 263
265 // travis build task 264 // travis build task
266 grunt.registerTask('build:travis', ['jshint', 'test:node', 'test:sauce-browser']); 265 grunt.registerTask('test-local', ['jshint', 'manifests-to-js', 'qunit']);
267 266
268 267
269 }; 268 };
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 }, 10 },
11 "license": "Apache 2", 11 "license": "Apache 2",
12 "scripts": { 12 "scripts": {
13 "test": "grunt test" 13 "test": "grunt test-local"
14 }, 14 },
15 "devDependencies": { 15 "devDependencies": {
16 "grunt-contrib-jshint": "~0.6.0", 16 "grunt-contrib-jshint": "~0.6.0",
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
11 "boss": true, 11 "boss": true,
12 "eqnull": true, 12 "eqnull": true,
13 "browser": true, 13 "browser": true,
14 "node": true,
14 "predef": [ 15 "predef": [
15 "QUnit", 16 "QUnit",
16 "module", 17 "module",
...@@ -26,6 +27,7 @@ ...@@ -26,6 +27,7 @@
26 "notDeepEqual", 27 "notDeepEqual",
27 "strictEqual", 28 "strictEqual",
28 "notStrictEqual", 29 "notStrictEqual",
29 "throws" 30 "throws",
31 "process"
30 ] 32 ]
31 } 33 }
......
...@@ -26,7 +26,7 @@ module.exports = function(config) { ...@@ -26,7 +26,7 @@ module.exports = function(config) {
26 // - PhantomJS 26 // - PhantomJS
27 // - IE (only Windows) 27 // - IE (only Windows)
28 // Example usage: 28 // Example usage:
29 browsers: ['chrome_test'] 29 browsers: ['chrome_test'],
30 //'firefox_test', 30 //'firefox_test',
31 //'safari_test', 31 //'safari_test',
32 //'ipad_test', 32 //'ipad_test',
......