Updated testing configuration to work in both TravisCI and Drone.io

jmdobry · Jun 15, 2013 · 5965937 · 5965937
1 parent b984e11
commit 5965937
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,3 +4,4 @@ node_js:
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
+script: "npm test_travis"
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -43,8 +43,11 @@ module.exports = function (grunt) {
             dev: {
                 browsers: ['Chrome']
             },
-            CI: {
-                browsers: ['Firefox', 'Chrome']
+            drone: {
+                browsers: ['Firefox', 'Chrome', 'PhantomJS']
+            },
+            travis: {
+                browsers: ['Firefox', 'PhantomJS']
             }
         },
         jsdoc : {
@@ -71,5 +74,6 @@ module.exports = function (grunt) {
     grunt.registerTask('build', ['clean', 'jshint', 'copy', 'uglify', 'karma:dev']);
     grunt.registerTask('build:all', ['build', 'jsdoc']);
 
-    grunt.registerTask('CI', ['clean', 'jshint', 'copy', 'uglify', 'karma:CI']);
+    grunt.registerTask('drone', ['clean', 'jshint', 'copy', 'uglify', 'karma:drone']);
+    grunt.registerTask('travis', ['clean', 'jshint', 'copy', 'uglify', 'karma:travis']);
 };
diff --git a/package.json b/package.json
@@ -20,7 +20,8 @@
         "grunt-cli": "~0.1.8"
     },
     "scripts": {
-        "test": "node node_modules/grunt-cli/bin/grunt CI",
-        "test_dev": "node node_modules/grunt-cli/bin/grunt build"
+        "test": "node node_modules/grunt-cli/bin/grunt build",
+        "test_drone": "node node_modules/grunt-cli/bin/grunt drone",
+        "test_travis": "node node_modules/grunt-cli/bin/grunt travis"
     }
 }