Skip to content

Commit aebd925

Browse files
committed
Upgrade jest and jsdom
This brings: - jest* up from 29.4.2 -> 29.7.0 - jsdom up from 20.0.0 -> 22.1.0 While the latest version of jest-dom-environment still wants `jsdom@^20.0.0`, it can safely use at least up to `[email protected]`. See jestjs/jest#13825 (comment) for details. Upgrading to latest versions lets us improve some WheelEvent tests and will make it possible to test a much simpler FormData construction approach (see #29018)
1 parent e7d213d commit aebd925

File tree

4 files changed

+979
-912
lines changed

4 files changed

+979
-912
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
"flags": "node ./scripts/flags/flags.js"
138138
},
139139
"resolutions": {
140-
"react-is": "npm:react-is"
140+
"react-is": "npm:react-is",
141+
"jsdom": "22.1.0"
141142
}
142143
}

packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4357,7 +4357,7 @@ describe('ReactDOMFizzServer', () => {
43574357
pipe(writable);
43584358
});
43594359
expect(window.getComputedStyle(document.body).backgroundColor).toMatch(
4360-
'blue',
4360+
'rgb(0, 0, 255)',
43614361
);
43624362
});
43634363

@@ -4386,7 +4386,7 @@ describe('ReactDOMFizzServer', () => {
43864386
pipe(writable);
43874387
});
43884388
expect(window.getComputedStyle(document.body).backgroundColor).toMatch(
4389-
'red',
4389+
'rgb(255, 0, 0)',
43904390
);
43914391
});
43924392
});

packages/react-dom/src/events/__tests__/SyntheticWheelEvent-test.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,8 @@ describe('SyntheticWheelEvent', () => {
6565
root.render(<div onWheel={onWheel} />);
6666
});
6767

68-
let event = new MouseEvent('wheel', {
68+
let event = new WheelEvent('wheel', {
6969
bubbles: true,
70-
});
71-
// jsdom doesn't support these so we add them manually.
72-
Object.assign(event, {
7370
deltaX: 10,
7471
deltaY: -50,
7572
});
@@ -78,7 +75,7 @@ describe('SyntheticWheelEvent', () => {
7875
event = new MouseEvent('wheel', {
7976
bubbles: true,
8077
});
81-
// jsdom doesn't support these so we add them manually.
78+
// jsdom doesn't support these legacy Webkit properties so we add them manually.
8279
Object.assign(event, {
8380
wheelDeltaX: -10,
8481
wheelDeltaY: 50,
@@ -106,15 +103,15 @@ describe('SyntheticWheelEvent', () => {
106103
});
107104

108105
container.firstChild.dispatchEvent(
109-
new MouseEvent('wheel', {
106+
new WheelEvent('wheel', {
110107
bubbles: true,
111108
deltaX: 10,
112109
deltaY: -50,
113110
}),
114111
);
115112

116113
container.firstChild.dispatchEvent(
117-
new MouseEvent('wheel', {
114+
new WheelEvent('wheel', {
118115
bubbles: true,
119116
deltaX: 10,
120117
deltaY: -50,

0 commit comments

Comments
 (0)