Skip to content

Commit b45638b

Browse files
Update karma to run both firefox & chrome tests
1 parent 402dd22 commit b45638b

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Diff for: package.json

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"jasmine-spec-reporter": "1.1.2",
4242
"jshint-stylish": "0.2.0",
4343
"karma": "0.12.23",
44+
"karma-chrome-launcher": "^2.0.0",
4445
"karma-coverage": "0.2.6",
4546
"karma-firefox-launcher": "^1.0.0",
4647
"karma-jasmine": "0.1.5",

Diff for: test/karma.conf.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,15 @@ module.exports = function(config) {
7979
// - Safari (only Mac)
8080
// - PhantomJS
8181
// - IE (only Windows)
82-
browsers: ['Firefox'],
82+
// default in karma.conf.js is Firefox, however, Chrome has much better
83+
// error messages when writing tests. Call with chrome like this:
84+
// grunt test --browsers Chrome
85+
//browsers: grunt.option('browsers') ? [grunt.option('browsers')] : ['Firefox'],
86+
browsers: process.env.browsers ? [process.env.browsers] : ['Firefox'],
8387
// Which plugins to enable
8488
plugins: [
8589
'karma-firefox-launcher',
90+
'karma-chrome-launcher',
8691
'karma-ng-html2js-preprocessor',
8792
'karma-jasmine',
8893
'karma-coverage'

0 commit comments

Comments
 (0)