Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump testing deps #9709

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-typescript": "^5.3.0",
"webpack": "5.94.0",
"qunit": "2.19.4",
"qunit": "2.24.1",
"ember-compatibility-helpers": "^1.2.7",
"testem": "~3.11.0"
"testem": "~3.15.2"
},
"peerDependencyRules": {
"ignoreMissing": [
Expand All @@ -176,11 +176,11 @@
},
"allowNonAppliedPatches": true,
"patchedDependencies": {
"qunit@2.19.4": "patches/qunit@2.19.4.patch",
"testem@3.11.0": "patches/testem@3.11.0.patch",
"@ember/test-helpers@3.3.0": "patches/@ember__test-helpers@3.3.0.patch",
"@ember/test-helpers@4.0.4": "patches/@ember__test-helpers@4.0.4.patch",
"@ember/test-helpers@5.1.0": "patches/@ember__test-helpers@5.1.0.patch"
"@ember/test-helpers@5.1.0": "patches/@ember__test-helpers@5.1.0.patch",
"qunit@2.24.1": "patches/qunit@2.24.1.patch",
"testem@3.15.2": "patches/testem@3.15.2.patch"
}
}
}
2 changes: 1 addition & 1 deletion packages/-ember-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"eslint": "^9.12.0",
"vite": "^5.4.14",
"typescript": "^5.7.2",
"qunit": "^2.18.0"
"qunit": "^2.24.1"
},
"engines": {
"node": ">= 18.20.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/codemods/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@types/jscodeshift": "0.11.11",
"@warp-drive/internal-config": "workspace:*",
"eslint": "^9.12.0",
"qunit": "^2.20.1"
"qunit": "^2.24.1"
},
"engines": {
"node": ">= 18.20.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/diagnostic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ index 2fbga6a55..c9537dd37 100644
--- a/package.json
+++ b/package.json
@@ -23,5 +23,5 @@
- "qunit": "2.20.0",
- "qunit": "2.24.1",
+ "@warp-drive/diagnostic": "latest",
```

Expand Down
7 changes: 3 additions & 4 deletions packages/unpublished-test-infra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
},
"peerDependencies": {
"ember-source": "3.28.12 || ^4.0.4 || ^5.0.0 || ^6.0.0",
"qunit": "^2.20.1",
"testem": "^3.12.0",
"qunit": "^2.24.1",
"testem": "^3.15.2",
"@ember-data/store": "workspace:*",
"@warp-drive/diagnostic": "workspace:*",
"@warp-drive/core-types": "workspace:*",
Expand All @@ -64,7 +64,6 @@
"dependencies": {
"@embroider/macros": "^1.16.10",
"chalk": "^4.1.2",
"qunit": "^2.20.1",
"semver": "^7.6.3",
"@warp-drive/build-config": "workspace:*"
},
Expand All @@ -87,7 +86,7 @@
"ember-source": "~5.12.0",
"typescript": "^5.7.2",
"vite": "^5.4.14",
"qunit": "^2.20.1"
"qunit": "^2.24.1"
},
"engines": {
"node": ">= 18.20.4"
Expand Down
14 changes: 14 additions & 0 deletions patches/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
# Patch Overview

## @ember/test-helpers

We patch in order to support concurrently running tests.

## @ember/test-helpers @3.3.0

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

It should be the same as the 4.x patch.

## qunit

We patch in order to support disabling the DOM reporter for memory leak investigations.

We patch in order to fix keysOf detection for modern javascript constructs like Proxy.

## testem

We patch in order to keep better track of launchers and to provide more complete information to reporters when a test begins running.
20 changes: 10 additions & 10 deletions patches/qunit@2.19.4.patch → patches/qunit@2.24.1.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/qunit/qunit.js b/qunit/qunit.js
index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed602862a772 100644
index 460e0e58227234eef7ee72876f13b7fec65198c0..3c3a786614c412e1e91b8b8d31b78cd9f3bd2b2c 100644
--- a/qunit/qunit.js
+++ b/qunit/qunit.js
@@ -8,6 +8,10 @@
Expand All @@ -8,12 +8,12 @@ index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed60
'use strict';
+ function getKeys(obj) {
+ if (!obj) { return []; }
+ return Object.keys(obj).concat(getKeys(Object.getPrototypeOf(obj)));
+ return Object.keys(obj).concat(getKeys(Object.getPrototypeOf(obj)));
+ }

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

// Some properties are not always enumerable on Error objects.
var nonEnumerableProperties = ['message', 'name'];
@@ -5647,6 +5648,9 @@
@@ -7041,6 +7042,9 @@
appendToolbar(beginDetails);
}
function appendTest(name, testId, moduleName) {
Expand All @@ -35,7 +35,7 @@ index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed60
var tests = id('qunit-tests');
if (!tests) {
return;
@@ -5831,6 +5835,13 @@
@@ -7229,6 +7233,13 @@
assertList.appendChild(assertLi);
});
QUnit.testDone(function (details) {
Expand All @@ -49,7 +49,7 @@ index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed60
var tests = id('qunit-tests');
var testItem = id('qunit-test-output-' + details.testId);
if (!tests || !testItem) {
@@ -5849,13 +5860,10 @@
@@ -7247,13 +7258,10 @@
var good = details.passed;
var bad = details.failed;

Expand All @@ -63,11 +63,11 @@ index 5e48b79303e8bfe33ba60a9407c2d67879a07841..649cd30f59991f1870570d6ec831ed60
if (config.collapse) {
if (!collapseNext) {
// Skip collapsing the first failing test
@@ -5871,7 +5879,6 @@
@@ -7269,7 +7277,6 @@
var testTitle = testItem.firstChild;
var testCounts = bad ? "<b class='failed'>" + bad + '</b>, ' + "<b class='passed'>" + good + '</b>, ' : '';
testTitle.innerHTML += " <b class='counts'>(" + testCounts + details.assertions.length + ')</b>';
- stats.completed++;
if (details.skipped) {
testItem.className = 'skipped';
var skipped = document.createElement('em');
var skipped = document.createElement('em');
File renamed without changes.
Loading
Loading