Skip to content

Commit 6e390b4

Browse files
committed
[test] Cleanup stack assertions in tests mixing React Server and Client
1 parent 3016ff8 commit 6e390b4

File tree

3 files changed

+18
-37
lines changed

3 files changed

+18
-37
lines changed

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2820,15 +2820,16 @@ describe('ReactFlightDOMBrowser', () => {
28202820
},
28212821
});
28222822

2823+
const app = ReactServer.createElement(
2824+
ReactServer.Fragment,
2825+
null,
2826+
ReactServer.createElement(Paragraph, null, 'foo'),
2827+
ReactServer.createElement(Paragraph, null, 'bar'),
2828+
);
28232829
const stream = await serverAct(() =>
28242830
ReactServerDOMServer.renderToReadableStream(
28252831
{
2826-
root: ReactServer.createElement(
2827-
ReactServer.Fragment,
2828-
null,
2829-
ReactServer.createElement(Paragraph, null, 'foo'),
2830-
ReactServer.createElement(Paragraph, null, 'bar'),
2831-
),
2832+
root: app,
28322833
},
28332834
webpackMap,
28342835
{
@@ -2900,27 +2901,11 @@ describe('ReactFlightDOMBrowser', () => {
29002901
"name": "Paragraph",
29012902
"props": {},
29022903
"stack": [
2903-
[
2904-
"",
2905-
"/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js",
2906-
2829,
2907-
27,
2908-
2823,
2909-
34,
2910-
],
2911-
[
2912-
"serverAct",
2913-
"/packages/internal-test-utils/internalAct.js",
2914-
270,
2915-
19,
2916-
231,
2917-
1,
2918-
],
29192904
[
29202905
"Object.<anonymous>",
29212906
"/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js",
2922-
2823,
2923-
18,
2907+
2826,
2908+
19,
29242909
2810,
29252910
89,
29262911
],

packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,11 +1216,7 @@ describe('ReactFlightDOMNode', () => {
12161216
const data1 = await getDynamicData1();
12171217
const data2 = await getDynamicData2();
12181218

1219-
return (
1220-
<p>
1221-
{data1} {data2}
1222-
</p>
1223-
);
1219+
return ReactServer.createElement('p', null, data1, ' ', data2);
12241220
}
12251221

12261222
function App() {
@@ -1350,8 +1346,8 @@ describe('ReactFlightDOMNode', () => {
13501346
: '\n') +
13511347
' in body\n' +
13521348
' in html\n' +
1353-
' in App (file://ReactFlightDOMNode-test.js:1233:25)\n' +
1354-
' in ClientRoot (ReactFlightDOMNode-test.js:1308:16)',
1349+
' in App (file://ReactFlightDOMNode-test.js:1229:25)\n' +
1350+
' in ClientRoot (ReactFlightDOMNode-test.js:1304:16)',
13551351
);
13561352
} else {
13571353
expect(
@@ -1371,15 +1367,15 @@ describe('ReactFlightDOMNode', () => {
13711367
).toBe(
13721368
'\n' +
13731369
' in Dynamic (file://ReactFlightDOMNode-test.js:1216:27)\n' +
1374-
' in App (file://ReactFlightDOMNode-test.js:1233:25)',
1370+
' in App (file://ReactFlightDOMNode-test.js:1229:25)',
13751371
);
13761372
} else {
13771373
expect(
13781374
normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
13791375
).toBe(
13801376
'' +
13811377
'\n' +
1382-
' in App (file://ReactFlightDOMNode-test.js:1233:25)',
1378+
' in App (file://ReactFlightDOMNode-test.js:1229:25)',
13831379
);
13841380
}
13851381
} else {

packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3155,7 +3155,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
31553155
}
31563156

31573157
const stream = ReactServerDOMServer.renderToPipeableStream(
3158-
<Component />,
3158+
ReactServer.createElement(Component),
31593159
{},
31603160
);
31613161

@@ -3192,7 +3192,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
31923192
"Object.<anonymous>",
31933193
"/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js",
31943194
3158,
3195-
40,
3195+
19,
31963196
3146,
31973197
36,
31983198
],
@@ -3216,7 +3216,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
32163216
"Object.<anonymous>",
32173217
"/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js",
32183218
3158,
3219-
40,
3219+
19,
32203220
3146,
32213221
36,
32223222
],
@@ -3248,7 +3248,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
32483248
"Object.<anonymous>",
32493249
"/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js",
32503250
3158,
3251-
40,
3251+
19,
32523252
3146,
32533253
36,
32543254
],

0 commit comments

Comments
 (0)