Merge pull request #894 from benjaminapetersen/karma-update

Merged by openshift-bot

Author: OpenShift Bot

Gruntfile.js

@@ -576,7 +576,15 @@ module.exports = function (grunt) {
     karma: {
       unit: {
         configFile: 'test/karma.conf.js',
-        singleRun: true
+        singleRun: true,
+        // default in karma.conf.js is Firefox, however, Chrome has much better
+        // error messages when writing tests.  Call like this:
+        // grunt test
+        // grunt test --browsers=Chrome
+        // grunt test --browsers=Chrome,Firefox,Safari (be sure karma-<browser_name>-launcher is installed)
+        browsers: grunt.option('browsers') ?
+                    grunt.option('browsers').split(',') :
+                    ['Firefox']
       }
     },
 

package.json

@@ -41,6 +41,7 @@
     "jasmine-spec-reporter": "1.1.2",
     "jshint-stylish": "0.2.0",
     "karma": "0.12.23",
+    "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "0.2.6",
     "karma-firefox-launcher": "^1.0.0",
     "karma-jasmine": "0.1.5",

test/karma.conf.js

@@ -80,10 +80,9 @@ module.exports = function(config) {
     // - Safari (only Mac)
     // - PhantomJS
     // - IE (only Windows)
-    browsers: ['Firefox'],
-    // Which plugins to enable
     plugins: [
       'karma-firefox-launcher',
+      'karma-chrome-launcher',
       'karma-ng-html2js-preprocessor',
       'karma-jasmine',
       'karma-coverage'