summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-05-22 00:23:49 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-05-22 00:23:49 +0200
commit295adcbef7618f4a0b4781c92e4b1c32b31a5f36 (patch)
tree47580336ff753b02e1e0f61e105dca03667de2c7 /js
parentfe486da549f69e50b0bd59433969eb4213663515 (diff)
add chrome to js unit tests
Diffstat (limited to 'js')
-rw-r--r--js/Gruntfile.js1
-rw-r--r--js/karma.conf.js2
-rw-r--r--js/package.json1
3 files changed, 3 insertions, 1 deletions
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
index 844461e1f..b29c8de67 100644
--- a/js/Gruntfile.js
+++ b/js/Gruntfile.js
@@ -133,6 +133,7 @@ module.exports = function (grunt) {
},
continuous: {
configFile: 'karma.conf.js',
+ browsers: ['Firefox', 'Chrome'],
singleRun: true,
}
},
diff --git a/js/karma.conf.js b/js/karma.conf.js
index 504d4155b..7fab2d9fd 100644
--- a/js/karma.conf.js
+++ b/js/karma.conf.js
@@ -67,7 +67,7 @@ module.exports = function (config) {
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
- reporters: ['coverage'],
+ reporters: ['coverage', 'progress'],
// web server port
diff --git a/js/package.json b/js/package.json
index f1d7fd509..269ae3f5e 100644
--- a/js/package.json
+++ b/js/package.json
@@ -38,6 +38,7 @@
"grunt-traceur": "^0.1.2",
"grunt-wrap": "^0.3.0",
"karma": "^0.12.16",
+ "karma-chrome-launcher": "^0.1.3",
"karma-coverage": "^0.2.1",
"karma-firefox-launcher": "^0.1.3",
"karma-jasmine": "^0.1.5",