{"commit":{"revision":"c7e735f625450d11438a87bb6ff6af15b3958a8f","authorName":"Jan Kassens","authorEmail":"jkassens@meta.com","authoredAt":"2024-01-25T16:02:13-05:00","shortRevision":"c7e735f625","subject":"Convert ReactLegacyContextDisabled-test.internal to createRoot (#28093)"},"body":"Convert ReactLegacyContextDisabled-test.internal to createRoot","parents":["991b72a39209012b05384a8f9a60a4a22d5dbb29"],"files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactLegacyContextDisabled-test.internal.js"}],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactLegacyContextDisabled-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactLegacyContextDisabled-test.internal.js\nindex bd712074ce..b73e25f2e1 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactLegacyContextDisabled-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactLegacyContextDisabled-test.internal.js\n@@ -10,19 +10,21 @@\n 'use strict';\n \n let React;\n-let ReactDOM;\n+let ReactDOMClient;\n let ReactDOMServer;\n let ReactFeatureFlags;\n+let act;\n \n describe('ReactLegacyContextDisabled', () => {\n beforeEach(() => {\n jest.resetModules();\n \n React = require('react');\n- ReactDOM = require('react-dom');\n+ ReactDOMClient = require('react-dom\/client');\n ReactDOMServer = require('react-dom\/server');\n ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n ReactFeatureFlags.disableLegacyContext = true;\n+ act = require('internal-test-utils').act;\n });\n \n function formatValue(val) {\n@@ -38,7 +40,7 @@ describe('ReactLegacyContextDisabled', () => {\n return JSON.stringify(val);\n }\n \n- it('warns for legacy context', () => {\n+ it('warns for legacy context', async () => {\n class LegacyProvider extends React.Component {\n static childContextTypes = {\n foo() {},\n@@ -81,17 +83,19 @@ describe('ReactLegacyContextDisabled', () => {\n }\n \n const container = document.createElement('div');\n- expect(() => {\n- ReactDOM.render(\n- \n- \n- \n- \n- \n- <\/span>\n- <\/LegacyProvider>,\n- container,\n- );\n+ const root = ReactDOMClient.createRoot(container);\n+ await expect(async () => {\n+ await act(() => {\n+ root.render(\n+ \n+ \n+ \n+ \n+ \n+ <\/span>\n+ <\/LegacyProvider>,\n+ );\n+ });\n }).toErrorDev([\n 'LegacyProvider uses the legacy childContextTypes API which is no longer supported. ' +\n 'Use React.createContext() instead.',\n@@ -104,19 +108,20 @@ describe('ReactLegacyContextDisabled', () => {\n expect(lifecycleContextLog).toEqual([]);\n \n \/\/ Test update path.\n- ReactDOM.render(\n- \n- \n- \n- \n- \n- <\/span>\n- <\/LegacyProvider>,\n- container,\n- );\n+ await act(() => {\n+ root.render(\n+ \n+ \n+ \n+ \n+ \n+ <\/span>\n+ <\/LegacyProvider>,\n+ );\n+ });\n expect(container.textContent).toBe('{}undefinedundefined');\n expect(lifecycleContextLog).toEqual([{}, {}, {}]);\n- ReactDOM.unmountComponentAtNode(container);\n+ root.unmount();\n \n \/\/ test server path.\n let text;\n@@ -143,7 +148,7 @@ describe('ReactLegacyContextDisabled', () => {\n expect(lifecycleContextLog).toEqual([{}, {}, {}]);\n });\n \n- it('renders a tree with modern context', () => {\n+ it('renders a tree with modern context', async () => {\n const Ctx = React.createContext();\n \n class Provider extends React.Component {\n@@ -185,44 +190,48 @@ describe('ReactLegacyContextDisabled', () => {\n }\n \n const container = document.createElement('div');\n- ReactDOM.render(\n- \n- \n- \n- \n- \n- <\/span>\n- <\/Provider>,\n- container,\n- );\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render(\n+ \n+ \n+ \n+ \n+ \n+ <\/span>\n+ <\/Provider>,\n+ );\n+ });\n expect(container.textContent).toBe('aaa');\n expect(lifecycleContextLog).toEqual([]);\n \n \/\/ Test update path\n- ReactDOM.render(\n- \n- \n- \n- \n- \n- <\/span>\n- <\/Provider>,\n- container,\n- );\n+ await act(() => {\n+ root.render(\n+ \n+ \n+ \n+ \n+ \n+ <\/span>\n+ <\/Provider>,\n+ );\n+ });\n expect(container.textContent).toBe('aaa');\n expect(lifecycleContextLog).toEqual(['a', 'a', 'a']);\n lifecycleContextLog.length = 0;\n \n- ReactDOM.render(\n- \n- \n- \n- \n- \n- <\/span>\n- <\/Provider>,\n- container,\n- );\n+ await act(() => {\n+ root.render(\n+ \n+ \n+ \n+ \n+ \n+ <\/span>\n+ <\/Provider>,\n+ );\n+ });\n expect(container.textContent).toBe('bbb');\n if (gate(flags => flags.enableLazyContextPropagation)) {\n \/\/ In the lazy propagation implementation, we don't check if context\n@@ -233,6 +242,6 @@ describe('ReactLegacyContextDisabled', () => {\n \/\/ changed, so we skipped sCU.\n expect(lifecycleContextLog).toEqual(['b', 'b']);\n }\n- ReactDOM.unmountComponentAtNode(container);\n+ root.unmount();\n });\n });\n"}

dillon1000/react

Files changed