From: Paladox <thomasmulhall410@yahoo.com>
Date: Mon, 20 Mar 2017 19:25:36 +0000 (+0000)
Subject: build: Update karma to 1.5.0, karma-firefox-launcher to 1.0.1
X-Git-Tag: 1.31.0-rc.0~3504
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=7dfe22b45e5568b289c7622d79a2220d2dbe2dfa;p=lhc%2Fweb%2Fwiklou.git

build: Update karma to 1.5.0, karma-firefox-launcher to 1.0.1

karma:
 Changelog at https://github.com/karma-runner/karma/releases
 https://github.com/karma-runner/karma/compare/v1.1.0...v1.5.0

karma-firefox-launcher:
 Changelog at https://github.com/karma-runner/karma-firefox-launcher/blob/master/CHANGELOG.md#101-2017-03-04
 https://github.com/karma-runner/karma-firefox-launcher/compare/v1.0.0...v1.0.1


Karma v1.1.1 added use of `<script crossorigin="anonymous">` for
the urls it initially loads. While most requests will be done by
MW itself directly (and served locally via the proxy at /w/) the
initial request cannot come from the proxy and is loaded from wgServer
directly. Therefore we need to set crossOriginAttribute=false to override
the new default that v1.1.1 introduced.

Change-Id: I9f5067b949c0a77e46f47c2a110a7b5df5953fda
---

diff --git a/Gruntfile.js b/Gruntfile.js
index 6c56772720..811d2c06eb 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -92,7 +92,10 @@ module.exports = function ( grunt ) {
 				singleRun: true,
 				autoWatch: false,
 				// Some tests in extensions don't yield for more than the default 10s (T89075)
-				browserNoActivityTimeout: 60 * 1000
+				browserNoActivityTimeout: 60 * 1000,
+				// Karma requires Same-Origin (or CORS) by default since v1.1.1
+				// for better stacktraces. But we load the first request from wgServer
+				crossOriginAttribute: false
 			},
 			main: {
 				browsers: [ 'Chrome' ]
diff --git a/package.json b/package.json
index 762c5e71d0..29388c5ac5 100644
--- a/package.json
+++ b/package.json
@@ -19,9 +19,9 @@
     "grunt-karma": "2.0.0",
     "grunt-stylelint": "0.7.0",
     "grunt-webdriver": "2.0.3",
-    "karma": "1.1.0",
+    "karma": "1.5.0",
     "karma-chrome-launcher": "2.0.0",
-    "karma-firefox-launcher": "1.0.0",
+    "karma-firefox-launcher": "1.0.1",
     "karma-mocha-reporter": "2.2.3",
     "karma-qunit": "1.0.0",
     "qunitjs": "1.22.0",