Do not consider success for saucelabs test

dchest · May 6, 2015 · c96fd30 · c96fd30
1 parent f0a1929
commit c96fd30
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,6 @@ node_js:
 before_script:
   - npm install -g grunt-cli
 script:
-  - grunt test
-  - grunt coveralls
-  - grunt saucelabs
+  - grunt build
+  - grunt test_and_coveralls
+  - grunt saucelabs || true
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -27,29 +27,23 @@ module.exports = function(grunt) {
     },
     mocha_istanbul: {
       coverage: {
-        src: 'test'
+        src: 'test',
+        options: {
+          timeout: 6000,
+        }
       },
       coveralls: {
         src: ['test'],
         options: {
           coverage:true,
-          timeout: 4000,
+          timeout: 6000,
           reportFormats: ['cobertura','lcovonly']
         }
       }
     },
     mocha_phantomjs: {
       all: ['test/**/*.html']
     },
-    mochaTest: {
-      unittests: {
-        options: {
-          reporter: 'spec',
-          timeout: 4000
-        },
-        src: [ 'test/unittests.js' ]
-      }
-    },
     'saucelabs-mocha': {
       all: {
         options: {
@@ -86,7 +80,6 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-mocha-istanbul')
   grunt.loadNpmTasks('grunt-mocha-phantomjs');
   grunt.loadNpmTasks('grunt-saucelabs');
-  grunt.loadNpmTasks('grunt-mocha-test');
 
   grunt.event.on('coverage', function(lcov, done){
       require('coveralls').handleInput(lcov, function(err){
@@ -98,8 +91,7 @@ module.exports = function(grunt) {
   });
 
   grunt.registerTask('build', ['uglify']);
-  grunt.registerTask('coverage', ['mocha_istanbul:coverage']);
-  grunt.registerTask('coveralls', ['mocha_istanbul:coveralls']);
-  grunt.registerTask('test', ['browserify', 'copy:test', 'mochaTest', 'mocha_phantomjs']);
+  grunt.registerTask('test', ['browserify', 'copy:test', 'mocha_istanbul', 'mocha_phantomjs']);
+  grunt.registerTask('test_and_coveralls', ['browserify', 'copy:test', 'mocha_istanbul:coveralls', 'mocha_phantomjs']);
   grunt.registerTask('saucelabs', ['connect', 'saucelabs-mocha']);
 };
diff --git a/package.json b/package.json
@@ -18,7 +18,6 @@
     "grunt-mocha-istanbul": "^2.4.0",
     "grunt-mocha-phantomjs": "0.6.1",
     "grunt-saucelabs": "8.6.1",
-    "grunt-mocha-test": "~0.12.7",
     "istanbul": "^0.3.13",
     "mocha": "~2.2.4",
     "mocha-phantomjs": "~3.5.3",