Skip to content

Commit 0f19af7

Browse files
committed
update qunit
1 parent 6a9da99 commit 0f19af7

File tree

19 files changed

+215
-180
lines changed

19 files changed

+215
-180
lines changed

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
"ember-cli-htmlbars": "^6.3.0",
161161
"ember-cli-typescript": "^5.3.0",
162162
"webpack": "5.94.0",
163-
"qunit": "2.19.4",
163+
"qunit": "2.24.1",
164164
"ember-compatibility-helpers": "^1.2.7",
165165
"testem": "~3.11.0"
166166
},
@@ -180,7 +180,8 @@
180180
"testem@3.11.0": "patches/testem@3.11.0.patch",
181181
"@ember/test-helpers@3.3.0": "patches/@ember__test-helpers@3.3.0.patch",
182182
"@ember/test-helpers@4.0.4": "patches/@ember__test-helpers@4.0.4.patch",
183-
"@ember/test-helpers@5.1.0": "patches/@ember__test-helpers@5.1.0.patch"
183+
"@ember/test-helpers@5.1.0": "patches/@ember__test-helpers@5.1.0.patch",
184+
"qunit@2.24.1": "patches/qunit@2.24.1.patch"
184185
}
185186
}
186187
}

packages/-ember-data/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
"eslint": "^9.12.0",
115115
"vite": "^5.4.14",
116116
"typescript": "^5.7.2",
117-
"qunit": "^2.18.0"
117+
"qunit": "^2.24.1"
118118
},
119119
"engines": {
120120
"node": ">= 18.20.4"

packages/codemods/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"@types/jscodeshift": "0.11.11",
4545
"@warp-drive/internal-config": "workspace:*",
4646
"eslint": "^9.12.0",
47-
"qunit": "^2.20.1"
47+
"qunit": "^2.24.1"
4848
},
4949
"engines": {
5050
"node": ">= 18.20.4"

packages/diagnostic/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ index 2fbga6a55..c9537dd37 100644
388388
--- a/package.json
389389
+++ b/package.json
390390
@@ -23,5 +23,5 @@
391-
- "qunit": "2.20.0",
391+
- "qunit": "2.24.1",
392392
+ "@warp-drive/diagnostic": "latest",
393393
```
394394

packages/unpublished-test-infra/package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"peerDependencies": {
4545
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
46-
"qunit": "^2.20.1",
46+
"qunit": "^2.24.1",
4747
"testem": "^3.12.0",
4848
"@ember-data/store": "workspace:*",
4949
"@warp-drive/diagnostic": "workspace:*",
@@ -64,7 +64,6 @@
6464
"dependencies": {
6565
"@embroider/macros": "^1.16.10",
6666
"chalk": "^4.1.2",
67-
"qunit": "^2.20.1",
6867
"semver": "^7.6.3",
6968
"@warp-drive/build-config": "workspace:*"
7069
},
@@ -87,7 +86,7 @@
8786
"ember-source": "~5.12.0",
8887
"typescript": "^5.7.2",
8988
"vite": "^5.4.14",
90-
"qunit": "^2.20.1"
89+
"qunit": "^2.24.1"
9190
},
9291
"engines": {
9392
"node": ">= 18.20.4"

patches/README.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
# Patch Overview
22

3+
## @ember/test-helpers
4+
5+
We patch in order to support concurrently running tests.
6+
37
## @ember/test-helpers @3.3.0
48

59
This patch exists because @ember/test-helpers 4.0+ does not support ember-source 3.28.
610
We install 3.3.0 during our ember-try scenario, and make pnpm happy by installing 3.3.0 all
711
the time in the root dev-dependencies.
812

913
It should be the same as the 4.x patch.
14+
15+
## qunit
16+
17+
We patch in order to support disabling the DOM reporter for memory leak investigations.
18+
19+
We patch in order to fix keysOf detection for modern javascript constructs like Proxy.
20+
21+
## testem
22+
23+
We patch in order to keep better track of launchers and to provide more complete information to reporters when a test begins running.

patches/qunit@2.19.4.patch patches/qunit@2.24.1.patch

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/qunit/qunit.js b/qunit/qunit.js
2-
index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed602862a772 100644
2+
index 460e0e58227234eef7ee72876f13b7fec65198c0..3c3a786614c412e1e91b8b8d31b78cd9f3bd2b2c 100644
33
--- a/qunit/qunit.js
44
+++ b/qunit/qunit.js
55
@@ -8,6 +8,10 @@
@@ -8,12 +8,12 @@ index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed60
88
'use strict';
99
+ function getKeys(obj) {
1010
+ if (!obj) { return []; }
11-
+ return Object.keys(obj).concat(getKeys(Object.getPrototypeOf(obj)));
11+
+ return Object.keys(obj).concat(getKeys(Object.getPrototypeOf(obj)));
1212
+ }
1313

14-
function _typeof(obj) {
15-
"@babel/helpers - typeof";
16-
@@ -1003,10 +1007,7 @@
14+
function _arrayLikeToArray(r, a) {
15+
(null == a || a > r.length) && (a = r.length);
16+
@@ -1049,10 +1053,7 @@
1717
return '[object Object]';
1818
}
1919
dump.up();
@@ -25,7 +25,7 @@ index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed60
2525

2626
// Some properties are not always enumerable on Error objects.
2727
var nonEnumerableProperties = ['message', 'name'];
28-
@@ -5647,6 +5648,9 @@
28+
@@ -7041,6 +7042,9 @@
2929
appendToolbar(beginDetails);
3030
}
3131
function appendTest(name, testId, moduleName) {
@@ -35,7 +35,7 @@ index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed60
3535
var tests = id('qunit-tests');
3636
if (!tests) {
3737
return;
38-
@@ -5831,6 +5835,13 @@
38+
@@ -7229,6 +7233,13 @@
3939
assertList.appendChild(assertLi);
4040
});
4141
QUnit.testDone(function (details) {
@@ -49,7 +49,7 @@ index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed60
4949
var tests = id('qunit-tests');
5050
var testItem = id('qunit-test-output-' + details.testId);
5151
if (!tests || !testItem) {
52-
@@ -5849,13 +5860,10 @@
52+
@@ -7247,13 +7258,10 @@
5353
var good = details.passed;
5454
var bad = details.failed;
5555

@@ -63,11 +63,11 @@ index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed60
6363
if (config.collapse) {
6464
if (!collapseNext) {
6565
// Skip collapsing the first failing test
66-
@@ -5871,7 +5879,6 @@
66+
@@ -7269,7 +7277,6 @@
6767
var testTitle = testItem.firstChild;
6868
var testCounts = bad ? "<b class='failed'>" + bad + '</b>, ' + "<b class='passed'>" + good + '</b>, ' : '';
6969
testTitle.innerHTML += " <b class='counts'>(" + testCounts + details.assertions.length + ')</b>';
7070
- stats.completed++;
7171
if (details.skipped) {
7272
testItem.className = 'skipped';
73-
var skipped = document.createElement('em');
73+
var skipped = document.createElement('em');

0 commit comments

Comments
 (0)