From c6f326732a56825af057f6a8962fce655f42cbe7 Mon Sep 17 00:00:00 2001
From: benjaminapetersen <admin@benjaminapetersen.me>
Date: Fri, 18 Nov 2016 12:53:02 -0500
Subject: [PATCH] Update karma to run both firefox & chrome tests

---
 Gruntfile.js       | 10 +++++++++-
 package.json       |  1 +
 test/karma.conf.js |  3 +--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 19229520c8..1dbdf5bc3a 100644
--- a/Gruntfile.js
+++ b/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']
       }
     },
 
diff --git a/package.json b/package.json
index 1a7918260a..a4cbac3e7a 100644
--- a/package.json
+++ b/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",
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 842b1655d7..feb495a6f8 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -79,10 +79,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'