Skip to content

Commit

Permalink
vendor: update QUnit to 2.17.2
Browse files Browse the repository at this point in the history
- update QUnit to latest version, which fixes checkboxes
- fix rerun test anchors
- fix type warning in test/main
  • Loading branch information
bastimeyer committed Sep 20, 2021
1 parent 678e723 commit 41f94a9
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 26 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"mini-css-extract-plugin": "1.6.0",
"node-fetch": "3.0.0-beta.9",
"nw-builder": "github:bastimeyer/nw-builder#48b4ae8",
"qunit": "2.17.1",
"qunit": "2.17.2",
"raw-loader": "0.5.1",
"sinon": "11.1.2",
"svgo": "2.4.0",
Expand Down Expand Up @@ -119,7 +119,7 @@
"**/exec-sh": "^0.4.0",
"**/optimist/minimist": "0.2.1",
"**/plist/xmldom": "github:xmldom/xmldom#0.7.0",
"ember-qunit/qunit": "2.17.1",
"ember-qunit/qunit": "2.17.2",
"load-grunt-config/lodash": "^4.17.21",
"sinon/nise/just-extend": "^4.0.0"
},
Expand Down
21 changes: 16 additions & 5 deletions src/test/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,35 @@ import "qunit/assertion-helpers";
import "./web_modules/ember-test";


// TODO: fix QUnit's urlParams / broken checkbox states
const { config } = QUnit;


// don't start automatically
config.autostart = false;
// check for pollution of the global scope (window)
config.noglobals = true;

// urlParams
// TODO: fix this once QUnit implements default config values instead of forced overrides

// hide passed tests
config.hidepassed = true;
// check for pollution of the global scope (window)
config.noglobals = true;


// load tests and then start
require( [ "tests" ], /* istanbul ignore next */ function() {
if ( global._noQUnitBridge ) {
// fix broken "Rerun" anchor on completed tests
document.documentElement.addEventListener( "click", function( ev ) {
if ( ev.target instanceof HTMLAnchorElement && ev.target.closest( "#qunit-tests" ) ) {
ev.stopImmediatePropagation();
document.location.href = ev.target.href;
}
}, { capture: true } );

return QUnit.start();
}
if ( global._setupQUnitBridge ) {

if ( typeof global._setupQUnitBridge === "function" ) {
// bridge injected, set it up and start QUnit
global._setupQUnitBridge( QUnit );
} else {
Expand Down
33 changes: 14 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1383,10 +1383,10 @@ [email protected]:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
integrity sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==

[email protected]:
version "7.1.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
commander@7.2.0, commander@^7.1.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==

commander@^2.20.0:
version "2.20.0"
Expand All @@ -1398,11 +1398,6 @@ commander@^4.1.1:
resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==

commander@^7.1.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==

commander@~2.20.3:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
Expand Down Expand Up @@ -3889,10 +3884,10 @@ node-releases@^1.1.71:
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==

[email protected].1:
version "0.7.1"
resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.1.tgz#0caaa6a6833b0d533487f953c52a6c787769ba7c"
integrity sha512-UWblPYuZYrkCQCW5PxAwYSxaELNBLUckrTBBk8xr1/bUgyOkYYTsUcV4e3ytcazFEOyiRyiUrsG37pu6I0I05g==
[email protected].2:
version "0.7.2"
resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.2.tgz#545f057da8500487eb8287adcb4cb5a7338d7e21"
integrity sha512-g53VjSARRv1JdST0LZRIg8RiuLr1TaBbVPsVvxh0/0Ymvi0xYUjDuoqQQAWtHJQUXhiShowPT/aXKNeHBcyQsw==

nopt@~3.0.6:
version "3.0.6"
Expand Down Expand Up @@ -4570,13 +4565,13 @@ qs@~6.5.2:
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==

[email protected].1, qunit@~2.6.0:
version "2.17.1"
resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.17.1.tgz#1969efe4c9b776b4b8cd4fc2fb9634e8f762e177"
integrity sha512-Gx1tpSfYbjRe4TRKCVBLlnCaVThF5Pdnmbbv/zLFfgWKddeQHV/eNi1BG392hw4gEDh2sflMj8kmPJlT7+kVMA==
[email protected].2, qunit@~2.6.0:
version "2.17.2"
resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.17.2.tgz#5cb278e131d931f25c109a0fdb0518be7754c25a"
integrity sha512-17isVvuOmALzsPjiV7wFg/6O5vJYXBrQZPwocfQSSh0I/rXvfX7bKMFJ4GMVW3U4P8r2mBeUy8EAngti4QD2Vw==
dependencies:
commander "7.1.0"
node-watch "0.7.1"
commander "7.2.0"
node-watch "0.7.2"
tiny-glob "0.2.9"

randombytes@^2.1.0:
Expand Down

0 comments on commit 41f94a9

Please sign in to comment.