From: Antoine Musso <hashar@free.fr>
Date: Tue, 20 Dec 2016 15:38:09 +0000 (+0100)
Subject: build: Upgrade karma-chrome-launcher to support Chromium on Mac/Windows
X-Git-Tag: 1.31.0-rc.0~4333
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=307ead451ce4010db18c4fdab8960c0943495756;p=lhc%2Fweb%2Fwiklou.git

build: Upgrade karma-chrome-launcher to support Chromium on Mac/Windows

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.

https://github.com/karma-runner/karma-chrome-launcher/issues/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
---

diff --git a/Gruntfile.js b/Gruntfile.js
index 7b3af54c95..4cc9721857 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -88,6 +88,9 @@ module.exports = function ( grunt ) {
 			main: {
 				browsers: [ 'Chrome' ]
 			},
+			chromium: {
+				browsers: [ 'Chromium' ]
+			},
 			more: {
 				browsers: [ 'Chrome', 'Firefox' ]
 			}
diff --git a/package.json b/package.json
index e415d66986..983da09389 100644
--- a/package.json
+++ b/package.json
@@ -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",