Skip to content

Convert ReactDOMServerIntegrationLegacyContext to createRoot #28449

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
merged 1 commit into from
Feb 26, 2024
Merged

Convert ReactDOMServerIntegrationLegacyContext to createRoot #28449

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
19 changes: 13 additions & 6 deletions packages/react-dom/src/__tests__/ReactDOMServerIntegrationLegacyContext-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,30 @@ const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegratio

let PropTypes;
let React;
let ReactDOM;
let ReactDOMClient;
let ReactDOMServer;

function initModules() {
// Reset warning cache.
jest.resetModules();
PropTypes = require('prop-types');
React = require('react');
ReactDOM = require('react-dom');
ReactDOMClient = require('react-dom/client');
ReactDOMServer = require('react-dom/server');

// Make them available to the helpers.
return {
ReactDOM,
ReactDOMClient,
ReactDOMServer,
};
}

const {resetModules, itRenders, itThrowsWhenRendering} =
ReactDOMServerIntegrationUtils(initModules);
const {
resetModules,
itRenders,
itThrowsWhenRendering,
clientRenderOnBadMarkup,
} = ReactDOMServerIntegrationUtils(initModules);

describe('ReactDOMServerIntegration', () => {
beforeEach(() => {
Expand Down Expand Up @@ -272,7 +276,10 @@ describe('ReactDOMServerIntegration', () => {
return {foo: 'bar'};
}
}
const e = await render(<ForgetfulParent />, 1);
const e = await render(
<ForgetfulParent />,
render === clientRenderOnBadMarkup ? 4 : 1,
);
expect(e.textContent).toBe('nope');
},
);
Expand Down