Skip to content

[test] Cleanup stack assertions in tests mixing React Server and Client #35316

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.

Sign up for GitHub

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

Merged
eps1lon merged 1 commit into from
Dec 7, 2025
+19 −38
Merged

[test] Cleanup stack assertions in tests mixing React Server and Client #35316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 9 additions & 24 deletions packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2820,15 +2820,16 @@ describe('ReactFlightDOMBrowser', () => {
},
});

const app = ReactServer.createElement(
ReactServer.Fragment,
null,
ReactServer.createElement(Paragraph, null, 'foo'),
ReactServer.createElement(Paragraph, null, 'bar'),
);
const stream = await serverAct(() =>
ReactServerDOMServer.renderToReadableStream(
{
root: ReactServer.createElement(
ReactServer.Fragment,
null,
ReactServer.createElement(Paragraph, null, 'foo'),
ReactServer.createElement(Paragraph, null, 'bar'),
),
root: app,
},
webpackMap,
{
Expand Down Expand Up @@ -2900,27 +2901,11 @@ describe('ReactFlightDOMBrowser', () => {
"name": "Paragraph",
"props": {},
"stack": [
[
"",
"/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js",
2829,
27,
2823,
34,
],
[
"serverAct",
"/packages/internal-test-utils/internalAct.js",
270,
19,
231,
1,
],
[
"Object.<anonymous>",
"/packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMBrowser-test.js",
2823,
18,
2826,
19,
2810,
89,
],
Expand Down
16 changes: 6 additions & 10 deletions packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,11 +1216,7 @@ describe('ReactFlightDOMNode', () => {
const data1 = await getDynamicData1();
const data2 = await getDynamicData2();

return (
<p>
{data1} {data2}
</p>
);
return ReactServer.createElement('p', null, data1, ' ', data2);
}

function App() {
Expand Down Expand Up @@ -1350,8 +1346,8 @@ describe('ReactFlightDOMNode', () => {
: '\n') +
' in body\n' +
' in html\n' +
' in App (file://ReactFlightDOMNode-test.js:1233:25)\n' +
' in ClientRoot (ReactFlightDOMNode-test.js:1308:16)',
' in App (file://ReactFlightDOMNode-test.js:1229:25)\n' +
' in ClientRoot (ReactFlightDOMNode-test.js:1304:16)',
);
} else {
expect(
Expand All @@ -1360,7 +1356,7 @@ describe('ReactFlightDOMNode', () => {
'\n' +
' in body\n' +
' in html\n' +
' in ClientRoot (ReactFlightDOMNode-test.js:1308:16)',
' in ClientRoot (ReactFlightDOMNode-test.js:1304:16)',
);
}

Expand All @@ -1371,15 +1367,15 @@ describe('ReactFlightDOMNode', () => {
).toBe(
'\n' +
' in Dynamic (file://ReactFlightDOMNode-test.js:1216:27)\n' +
' in App (file://ReactFlightDOMNode-test.js:1233:25)',
' in App (file://ReactFlightDOMNode-test.js:1229:25)',
);
} else {
expect(
normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
).toBe(
'' +
'\n' +
' in App (file://ReactFlightDOMNode-test.js:1233:25)',
' in App (file://ReactFlightDOMNode-test.js:1229:25)',
);
}
} else {
Expand Down
8 changes: 4 additions & 4 deletions packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3155,7 +3155,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
}

const stream = ReactServerDOMServer.renderToPipeableStream(
<Component />,
ReactServer.createElement(Component),
{},
);

Expand Down Expand Up @@ -3192,7 +3192,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"Object.<anonymous>",
"/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js",
3158,
40,
19,
3146,
36,
],
Expand All @@ -3216,7 +3216,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"Object.<anonymous>",
"/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js",
3158,
40,
19,
3146,
36,
],
Expand Down Expand Up @@ -3248,7 +3248,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"Object.<anonymous>",
"/packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js",
3158,
40,
19,
3146,
36,
],
Expand Down
Loading