Skip to content

Commit

Permalink
build: Upgrade karma-chrome-launcher to support Chromium on Mac/Windows
Browse files Browse the repository at this point in the history
Before karma-chrome-launcher 2.0.0, Chromium was only detected on Linux
and as part of the "Chrome" setting. "Chromium" is now recognised as a
separate browser and is detected on Mac and Windows as well.

karma-runner/karma-chrome-launcher#45

Add a grunt target for Chromium so users may run the following to use
Chromium instead of Chrome:

    grunt karma:chromium

Since we keep the default of "Chrome", we'll need an override for CI
since we install Chromium there instead of Chrome.

Depends on Ie9f906f8 being merged and Nodepool images updated.

Bug: T153756
Change-Id: I6ba0d971e7e8c3022d2ab6268ae637688189d768
  • Loading branch information
hashar authored and Krinkle committed Jan 12, 2017
1 parent 57f0e4a commit 307ead4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ module.exports = function ( grunt ) {
main: {
browsers: [ 'Chrome' ]
},
chromium: {
browsers: [ 'Chromium' ]
},
more: {
browsers: [ 'Chrome', 'Firefox' ]
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"grunt-karma": "2.0.0",
"grunt-stylelint": "0.6.0",
"karma": "1.1.0",
"karma-chrome-launcher": "1.0.1",
"karma-chrome-launcher": "2.0.0",
"karma-firefox-launcher": "1.0.0",
"karma-qunit": "1.0.0",
"qunitjs": "1.22.0",
Expand Down

0 comments on commit 307ead4

Please sign in to comment.