{"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactLegacyCompositeComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactLegacyCompositeComponent-test.js\nindex d1f5493e95..42908a693c 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactLegacyCompositeComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactLegacyCompositeComponent-test.js\n@@ -11,16 +11,18 @@\n \n let React;\n let ReactDOM;\n-let ReactTestUtils;\n+let ReactDOMClient;\n let PropTypes;\n+let act;\n \n describe('ReactLegacyCompositeComponent', () => {\n beforeEach(() => {\n jest.resetModules();\n React = require('react');\n ReactDOM = require('react-dom');\n- ReactTestUtils = require('react-dom\/test-utils');\n+ ReactDOMClient = require('react-dom\/client');\n PropTypes = require('prop-types');\n+ act = require('internal-test-utils').act;\n });\n \n it('should warn about `setState` in render in legacy mode', () => {\n@@ -70,7 +72,7 @@ describe('ReactLegacyCompositeComponent', () => {\n });\n \n \/\/ @gate !disableLegacyContext\n- it('should pass context to children when not owner', () => {\n+ it('should pass context to children when not owner', async () => {\n class Parent extends React.Component {\n render() {\n return (\n@@ -106,13 +108,17 @@ describe('ReactLegacyCompositeComponent', () => {\n return

{this.context.foo}<\/div>;\n }\n }\n-\n- const component = ReactTestUtils.renderIntoDocument();\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ let component;\n+ await act(() => {\n+ root.render( (component = current)} \/>);\n+ });\n expect(ReactDOM.findDOMNode(component).innerHTML).toBe('bar');\n });\n \n \/\/ @gate !disableLegacyContext\n- it('should pass context when re-rendered for static child', () => {\n+ it('should pass context when re-rendered for static child', async () => {\n let parentInstance = null;\n let childInstance = null;\n \n@@ -156,24 +162,31 @@ describe('ReactLegacyCompositeComponent', () => {\n }\n }\n \n- parentInstance = ReactTestUtils.renderIntoDocument(\n- \n- \n- \n- <\/Middle>\n- <\/Parent>,\n- );\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+\n+ await act(() => {\n+ root.render(\n+ (parentInstance = current)}>\n+ \n+ \n+ <\/Middle>\n+ <\/Parent>,\n+ );\n+ });\n \n expect(parentInstance.state.flag).toBe(false);\n expect(childInstance.context).toEqual({foo: 'bar', flag: false});\n \n- parentInstance.setState({flag: true});\n+ await act(() => {\n+ parentInstance.setState({flag: true});\n+ });\n expect(parentInstance.state.flag).toBe(true);\n expect(childInstance.context).toEqual({foo: 'bar', flag: true});\n });\n \n \/\/ @gate !disableLegacyContext\n- it('should pass context when re-rendered for static child within a composite component', () => {\n+ it('should pass context when re-rendered for static child within a composite component', async () => {\n class Parent extends React.Component {\n static childContextTypes = {\n flag: PropTypes.bool,\n@@ -217,20 +230,27 @@ describe('ReactLegacyCompositeComponent', () => {\n }\n }\n \n- const wrapper = ReactTestUtils.renderIntoDocument();\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ let wrapper;\n+ await act(() => {\n+ root.render( (wrapper = current)} \/>);\n+ });\n \n expect(wrapper.parentRef.current.state.flag).toEqual(true);\n expect(wrapper.childRef.current.context).toEqual({flag: true});\n \n \/\/ We update while is still a static prop relative to this update\n- wrapper.parentRef.current.setState({flag: false});\n+ await act(() => {\n+ wrapper.parentRef.current.setState({flag: false});\n+ });\n \n expect(wrapper.parentRef.current.state.flag).toEqual(false);\n expect(wrapper.childRef.current.context).toEqual({flag: false});\n });\n \n \/\/ @gate !disableLegacyContext\n- it('should pass context transitively', () => {\n+ it('should pass context transitively', async () => {\n let childInstance = null;\n let grandchildInstance = null;\n \n@@ -286,13 +306,18 @@ describe('ReactLegacyCompositeComponent', () => {\n }\n }\n \n- ReactTestUtils.renderIntoDocument();\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render();\n+ });\n+\n expect(childInstance.context).toEqual({foo: 'bar', depth: 0});\n expect(grandchildInstance.context).toEqual({foo: 'bar', depth: 1});\n });\n \n \/\/ @gate !disableLegacyContext\n- it('should pass context when re-rendered', () => {\n+ it('should pass context when re-rendered', async () => {\n let parentInstance = null;\n let childInstance = null;\n \n@@ -334,11 +359,16 @@ describe('ReactLegacyCompositeComponent', () => {\n }\n }\n \n- parentInstance = ReactTestUtils.renderIntoDocument();\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render( (parentInstance = current)} \/>);\n+ });\n+\n expect(childInstance).toBeNull();\n \n expect(parentInstance.state.flag).toBe(false);\n- ReactDOM.unstable_batchedUpdates(function () {\n+ await act(() => {\n parentInstance.setState({flag: true});\n });\n expect(parentInstance.state.flag).toBe(true);\n@@ -699,7 +729,7 @@ describe('ReactLegacyCompositeComponent', () => {\n );\n });\n \n- it('should replace state in legacy mode', () => {\n+ it('should replace state in legacy mode', async () => {\n class Moo extends React.Component {\n state = {x: 1};\n render() {\n@@ -707,15 +737,23 @@ describe('ReactLegacyCompositeComponent', () => {\n }\n }\n \n- const moo = ReactTestUtils.renderIntoDocument();\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ let moo;\n+ await act(() => {\n+ root.render( (moo = current)} \/>);\n+ });\n+\n \/\/ No longer a public API, but we can test that it works internally by\n \/\/ reaching into the updater.\n- moo.updater.enqueueReplaceState(moo, {y: 2});\n+ await act(() => {\n+ moo.updater.enqueueReplaceState(moo, {y: 2});\n+ });\n expect('x' in moo.state).toBe(false);\n expect(moo.state.y).toBe(2);\n });\n \n- it('should support objects with prototypes as state in legacy mode', () => {\n+ it('should support objects with prototypes as state in legacy mode', async () => {\n const NotActuallyImmutable = function (str) {\n this.str = str;\n };\n@@ -732,24 +770,34 @@ describe('ReactLegacyCompositeComponent', () => {\n }\n }\n \n- const moo = ReactTestUtils.renderIntoDocument();\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ let moo;\n+ await act(() => {\n+ root.render( (moo = current)} \/>);\n+ });\n+\n expect(moo.state.str).toBe('first');\n expect(moo.state.amIImmutable()).toBe(true);\n \n const secondState = new NotActuallyImmutable('second');\n- moo._replaceState(secondState);\n+ await act(() => {\n+ moo._replaceState(secondState);\n+ });\n expect(moo.state.str).toBe('second');\n expect(moo.state.amIImmutable()).toBe(true);\n expect(moo.state).toBe(secondState);\n \n- moo.setState({str: 'third'});\n+ await act(() => {\n+ moo.setState({str: 'third'});\n+ });\n expect(moo.state.str).toBe('third');\n \/\/ Here we lose the prototype.\n expect(moo.state.amIImmutable).toBe(undefined);\n \n \/\/ When more than one state update is enqueued, we have the same behavior\n const fifthState = new NotActuallyImmutable('fifth');\n- ReactDOM.unstable_batchedUpdates(function () {\n+ await act(() => {\n moo.setState({str: 'fourth'});\n moo._replaceState(fifthState);\n });\n@@ -757,7 +805,7 @@ describe('ReactLegacyCompositeComponent', () => {\n \n \/\/ When more than one state update is enqueued, we have the same behavior\n const sixthState = new NotActuallyImmutable('sixth');\n- ReactDOM.unstable_batchedUpdates(function () {\n+ await act(() => {\n moo._replaceState(sixthState);\n moo.setState({str: 'seventh'});\n });\n","commit":{"authoredAt":"2024-02-02T09:14:05+01:00","subject":"Remove usage of \/test-utils in ReactLegacyCompositeComponent (#28201)","shortRevision":"11aa263844","authorEmail":"silbermann.sebastian@gmail.com","authorName":"Sebastian Silbermann","revision":"11aa263844cc90b3677782c9b8bafa3fe22fd389"},"body":"","files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactLegacyCompositeComponent-test.js"}],"parents":["7f8798a3f2cba588c1b7e5b19d488bce3520f62a"]}

dillon1000/react

Files changed