Skip to content

Commit

Permalink
build: Update karma to 1.5.0, karma-firefox-launcher to 1.0.1
Browse files Browse the repository at this point in the history
karma:
 Changelog at https://github.com/karma-runner/karma/releases
 karma-runner/karma@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
 karma-runner/karma-firefox-launcher@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
  • Loading branch information
paladox authored and Krinkle committed Apr 15, 2017
1 parent b2fb10f commit 7dfe22b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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' ]
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 7dfe22b

Please sign in to comment.