{"commit":{"revision":"e2b93afc604f857f7b59788920533ff7d1c72563","authorName":"Matt Carroll","authorEmail":"7158882+mattcarrollcode@users.noreply.github.com","authoredAt":"2024-01-26T16:30:02-08:00","shortRevision":"e2b93afc60","subject":"Convert renderSubtreeIntoContainer-test.js to createRoot (#28114)"},"body":"Co-authored-by: Ricky ","parents":["407faf5a69955f23f3549cff77b1a37199daa95f"],"files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/renderSubtreeIntoContainer-test.js"}],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/renderSubtreeIntoContainer-test.js b\/packages\/react-dom\/src\/__tests__\/renderSubtreeIntoContainer-test.js\nindex 49993b556e..4848fdebfd 100644\n--- a\/packages\/react-dom\/src\/__tests__\/renderSubtreeIntoContainer-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/renderSubtreeIntoContainer-test.js\n@@ -12,7 +12,9 @@\n const React = require('react');\n const PropTypes = require('prop-types');\n const ReactDOM = require('react-dom');\n+const ReactDOMClient = require('react-dom\/client');\n const ReactTestUtils = require('react-dom\/test-utils');\n+const act = require('internal-test-utils').act;\n const renderSubtreeIntoContainer =\n require('react-dom').unstable_renderSubtreeIntoContainer;\n \n@@ -101,7 +103,7 @@ describe('renderSubtreeIntoContainer', () => {\n });\n \n \/\/ @gate !disableLegacyContext\n- it('should update context if it changes due to setState', () => {\n+ it('should update context if it changes due to setState', async () => {\n const container = document.createElement('div');\n document.body.appendChild(container);\n const portal = document.createElement('div');\n@@ -154,15 +156,22 @@ describe('renderSubtreeIntoContainer', () => {\n );\n }\n }\n+ const root = ReactDOMClient.createRoot(container);\n+ const parentRef = React.createRef();\n+ await act(async () => {\n+ root.render();\n+ });\n+ const instance = parentRef.current;\n \n- const instance = ReactDOM.render(, container);\n expect(portal.firstChild.innerHTML).toBe('initial-initial');\n- instance.setState({bar: 'changed'});\n+ await act(async () => {\n+ instance.setState({bar: 'changed'});\n+ });\n expect(portal.firstChild.innerHTML).toBe('changed-changed');\n });\n \n \/\/ @gate !disableLegacyContext\n- it('should update context if it changes due to re-render', () => {\n+ it('should update context if it changes due to re-render', async () => {\n const container = document.createElement('div');\n document.body.appendChild(container);\n const portal = document.createElement('div');\n@@ -212,13 +221,18 @@ describe('renderSubtreeIntoContainer', () => {\n }\n }\n \n- ReactDOM.render(, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(async () => {\n+ root.render();\n+ });\n expect(portal.firstChild.innerHTML).toBe('initial-initial');\n- ReactDOM.render(, container);\n+ await act(async () => {\n+ root.render();\n+ });\n expect(portal.firstChild.innerHTML).toBe('changed-changed');\n });\n \n- it('should render portal with non-context-provider parent', () => {\n+ it('should render portal with non-context-provider parent', async () => {\n const container = document.createElement('div');\n document.body.appendChild(container);\n const portal = document.createElement('div');\n@@ -237,12 +251,15 @@ describe('renderSubtreeIntoContainer', () => {\n }\n }\n \n- ReactDOM.render(, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(async () => {\n+ root.render();\n+ });\n expect(portal.firstChild.innerHTML).toBe('hello');\n });\n \n \/\/ @gate !disableLegacyContext\n- it('should get context through non-context-provider parent', () => {\n+ it('should get context through non-context-provider parent', async () => {\n const container = document.createElement('div');\n document.body.appendChild(container);\n const portal = document.createElement('div');\n@@ -281,12 +298,15 @@ describe('renderSubtreeIntoContainer', () => {\n }\n }\n \n- ReactDOM.render(, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(async () => {\n+ root.render();\n+ });\n expect(portal.textContent).toBe('foo');\n });\n \n \/\/ @gate !disableLegacyContext\n- it('should get context through middle non-context-provider layer', () => {\n+ it('should get context through middle non-context-provider layer', async () => {\n const container = document.createElement('div');\n document.body.appendChild(container);\n const portal1 = document.createElement('div');\n@@ -333,11 +353,14 @@ describe('renderSubtreeIntoContainer', () => {\n }\n }\n \n- ReactDOM.render(, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(async () => {\n+ root.render();\n+ });\n expect(portal2.textContent).toBe('foo');\n });\n \n- it('fails gracefully when mixing React 15 and 16', () => {\n+ it('legacy test: fails gracefully when mixing React 15 and 16', () => {\n class C extends React.Component {\n render() {\n return

;\n"}

dillon1000/react

Files changed