{"parents":["c4e9ed3fefcd744b48e9cce39df0f52cbc014e1a"],"commit":{"revision":"02946228e1af3744878d964a58ea7cd55b563468","authoredAt":"2024-02-02T09:15:33+01:00","shortRevision":"02946228e1","authorEmail":"silbermann.sebastian@gmail.com","subject":"Convert createReactClassIntegration to createRoot (#28196)","authorName":"Sebastian Silbermann"},"body":"","files":[{"status":"M","path":"packages\/react\/src\/__tests__\/createReactClassIntegration-test.js"}],"patch":"diff --git a\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.js b\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.js\nindex dff9042a1b..dfba4146f4 100644\n--- a\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.js\n+++ b\/packages\/react\/src\/__tests__\/createReactClassIntegration-test.js\n@@ -14,7 +14,6 @@ let act;\n let PropTypes;\n let React;\n let ReactDOMClient;\n-let ReactTestUtils;\n let createReactClass;\n \n describe('create-react-class-integration', () => {\n@@ -24,7 +23,6 @@ describe('create-react-class-integration', () => {\n PropTypes = require('prop-types');\n React = require('react');\n ReactDOMClient = require('react-dom\/client');\n- ReactTestUtils = require('react-dom\/test-utils');\n createReactClass = require('create-react-class\/factory')(\n React.Component,\n React.isValidElement,\n@@ -231,7 +229,7 @@ describe('create-react-class-integration', () => {\n ]);\n });\n \n- it('should support statics', () => {\n+ it('should support statics', async () => {\n const Component = createReactClass({\n statics: {\n abc: 'def',\n@@ -247,8 +245,13 @@ describe('create-react-class-integration', () => {\n return ;\n },\n });\n- let instance = ;\n- instance = ReactTestUtils.renderIntoDocument(instance);\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ let instance;\n+ await act(() => {\n+ root.render( (instance = current)} \/>);\n+ });\n+\n expect(instance.constructor.abc).toBe('def');\n expect(Component.abc).toBe('def');\n expect(instance.constructor.def).toBe(0);\n@@ -261,7 +264,7 @@ describe('create-react-class-integration', () => {\n expect(Component.pqr()).toBe(Component);\n });\n \n- it('should work with object getInitialState() return values', () => {\n+ it('should work with object getInitialState() return values', async () => {\n const Component = createReactClass({\n getInitialState: function () {\n return {\n@@ -272,12 +275,17 @@ describe('create-react-class-integration', () => {\n return ;\n },\n });\n- let instance = ;\n- instance = ReactTestUtils.renderIntoDocument(instance);\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ let instance;\n+ await act(() => {\n+ root.render( (instance = current)} \/>);\n+ });\n+\n expect(instance.state.occupation).toEqual('clown');\n });\n \n- it('should work with getDerivedStateFromProps() return values', () => {\n+ it('should work with getDerivedStateFromProps() return values', async () => {\n const Component = createReactClass({\n getInitialState() {\n return {};\n@@ -289,8 +297,12 @@ describe('create-react-class-integration', () => {\n Component.getDerivedStateFromProps = () => {\n return {occupation: 'clown'};\n };\n- let instance = ;\n- instance = ReactTestUtils.renderIntoDocument(instance);\n+ let instance;\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render( (instance = current)} \/>);\n+ });\n expect(instance.state.occupation).toEqual('clown');\n });\n \n@@ -328,8 +340,9 @@ describe('create-react-class-integration', () => {\n expect(container.firstChild.className).toBe('foo');\n });\n \n- it('should throw with non-object getInitialState() return values', () => {\n- [['an array'], 'a string', 1234].forEach(function (state) {\n+ it('should throw with non-object getInitialState() return values', async () => {\n+ \/\/ eslint-disable-next-line no-for-of-loops\/no-for-of-loops\n+ for (const state of [['an array'], 'a string', 1234]) {\n const Component = createReactClass({\n getInitialState: function () {\n return state;\n@@ -338,16 +351,19 @@ describe('create-react-class-integration', () => {\n return ;\n },\n });\n- let instance = ;\n- expect(function () {\n- instance = ReactTestUtils.renderIntoDocument(instance);\n- }).toThrowError(\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ await expect(\n+ act(() => {\n+ root.render();\n+ }),\n+ ).rejects.toThrowError(\n 'Component.getInitialState(): must return an object or null',\n );\n- });\n+ }\n });\n \n- it('should work with a null getInitialState() return value', () => {\n+ it('should work with a null getInitialState() return value', async () => {\n const Component = createReactClass({\n getInitialState: function () {\n return null;\n@@ -356,9 +372,13 @@ describe('create-react-class-integration', () => {\n return ;\n },\n });\n- expect(() =>\n- ReactTestUtils.renderIntoDocument(),\n- ).not.toThrow();\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ await expect(\n+ act(() => {\n+ root.render();\n+ }),\n+ ).resolves.not.toThrow();\n });\n \n it('should throw when using legacy factories', () => {\n@@ -375,7 +395,7 @@ describe('create-react-class-integration', () => {\n );\n });\n \n- it('replaceState and callback works', () => {\n+ it('replaceState and callback works', async () => {\n const ops = [];\n const Component = createReactClass({\n getInitialState() {\n@@ -387,10 +407,19 @@ describe('create-react-class-integration', () => {\n },\n });\n \n- const instance = ReactTestUtils.renderIntoDocument();\n- instance.replaceState({step: 1}, () => {\n- ops.push('Callback: ' + instance.state.step);\n+ const container = document.createElement('div');\n+ const root = ReactDOMClient.createRoot(container);\n+ let instance;\n+ await act(() => {\n+ root.render( (instance = current)} \/>);\n+ });\n+\n+ await act(() => {\n+ instance.replaceState({step: 1}, () => {\n+ ops.push('Callback: ' + instance.state.step);\n+ });\n });\n+\n expect(ops).toEqual(['Render: 0', 'Render: 1', 'Callback: 1']);\n });\n \n"}

dillon1000/react

Files changed