Browse Source

Don't use saucelabs for a bit now

pull/80/head
Gary Katsevman 12 years ago
parent
commit
083e264e4e
  1. 5
      Gruntfile.js
  2. 2
      package.json
  3. 4
      test/.jshintrc
  4. 2
      test/karma.conf.js

5
Gruntfile.js

@ -200,7 +200,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-open'); grunt.loadNpmTasks('grunt-open');
grunt.loadNpmTasks('grunt-concurrent'); grunt.loadNpmTasks('grunt-concurrent');
grunt.loadNpmTasks('grunt-saucelabs');
grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-watch');
@ -260,10 +259,10 @@ module.exports = function(grunt) {
'concat', 'concat',
'uglify']); 'uglify']);
grunt.registerTask('test', ['manifests-to-js', 'karma:saucelabs']);
grunt.registerTask('test', ['jshint', 'manifests-to-js', 'karma:saucelabs']);
// travis build task // travis build task
grunt.registerTask('build:travis', ['jshint', 'test:node', 'test:sauce-browser']);
grunt.registerTask('test-local', ['jshint', 'manifests-to-js', 'qunit']);
}; };

2
package.json

@ -10,7 +10,7 @@
}, },
"license": "Apache 2", "license": "Apache 2",
"scripts": { "scripts": {
"test": "grunt test"
"test": "grunt test-local"
}, },
"devDependencies": { "devDependencies": {
"grunt-contrib-jshint": "~0.6.0", "grunt-contrib-jshint": "~0.6.0",

4
test/.jshintrc

@ -11,6 +11,7 @@
"boss": true, "boss": true,
"eqnull": true, "eqnull": true,
"browser": true, "browser": true,
"node": true,
"predef": [ "predef": [
"QUnit", "QUnit",
"module", "module",
@ -26,6 +27,7 @@
"notDeepEqual", "notDeepEqual",
"strictEqual", "strictEqual",
"notStrictEqual", "notStrictEqual",
"throws"
"throws",
"process"
] ]
} }

2
test/karma.conf.js

@ -26,7 +26,7 @@ module.exports = function(config) {
// - PhantomJS // - PhantomJS
// - IE (only Windows) // - IE (only Windows)
// Example usage: // Example usage:
browsers: ['chrome_test']
browsers: ['chrome_test'],
//'firefox_test', //'firefox_test',
//'safari_test', //'safari_test',
//'ipad_test', //'ipad_test',

Loading…
Cancel
Save