{"parents":["13aae52aea07b59b17aebaf65fd83d1c67c6ecb4"],"body":"","patch":"diff --git a\/packages\/react-dom\/src\/client\/__tests__\/trustedTypes-test.internal.js b\/packages\/react-dom\/src\/client\/__tests__\/trustedTypes-test.internal.js\nindex 777ef41756..599084b637 100644\n--- a\/packages\/react-dom\/src\/client\/__tests__\/trustedTypes-test.internal.js\n+++ b\/packages\/react-dom\/src\/client\/__tests__\/trustedTypes-test.internal.js\n@@ -11,8 +11,9 @@\n \n describe('when Trusted Types are available in global object', () => {\n let React;\n- let ReactDOM;\n+ let ReactDOMClient;\n let ReactFeatureFlags;\n+ let act;\n let container;\n let ttObject1;\n let ttObject2;\n@@ -34,7 +35,8 @@ describe('when Trusted Types are available in global object', () => {\n ReactFeatureFlags = require('shared\/ReactFeatureFlags');\n ReactFeatureFlags.enableTrustedTypesIntegration = true;\n React = require('react');\n- ReactDOM = require('react-dom');\n+ ReactDOMClient = require('react-dom\/client');\n+ act = require('internal-test-utils').act;\n ttObject1 = {\n toString() {\n return 'Hi<\/b>';\n@@ -53,7 +55,7 @@ describe('when Trusted Types are available in global object', () => {\n delete window.trustedTypes;\n });\n \n- it('should not stringify trusted values for dangerouslySetInnerHTML', () => {\n+ it('should not stringify trusted values for dangerouslySetInnerHTML', async () => {\n const innerHTMLDescriptor = Object.getOwnPropertyDescriptor(\n Element.prototype,\n 'innerHTML',\n@@ -69,20 +71,21 @@ describe('when Trusted Types are available in global object', () => {\n return innerHTMLDescriptor.set.apply(this, arguments);\n },\n });\n- ReactDOM.render(\n-
,\n- container,\n- );\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render(
);\n+ });\n+\n expect(container.innerHTML).toBe('
Hi<\/b><\/div>');\n expect(innerHTMLCalls.length).toBe(1);\n \/\/ Ensure it didn't get stringified when passed to a DOM sink:\n expect(innerHTMLCalls[0]).toBe(ttObject1);\n \n innerHTMLCalls.length = 0;\n- ReactDOM.render(\n-
,\n- container,\n- );\n+ await act(() => {\n+ root.render(
);\n+ });\n+\n expect(container.innerHTML).toBe('
Bye<\/b><\/div>');\n expect(innerHTMLCalls.length).toBe(1);\n \/\/ Ensure it didn't get stringified when passed to a DOM sink:\n@@ -96,7 +99,7 @@ describe('when Trusted Types are available in global object', () => {\n }\n });\n \n- it('should not stringify trusted values for setAttribute (unknown attribute)', () => {\n+ it('should not stringify trusted values for setAttribute (unknown attribute)', async () => {\n const setAttribute = Element.prototype.setAttribute;\n try {\n const setAttributeCalls = [];\n@@ -104,7 +107,11 @@ describe('when Trusted Types are available in global object', () => {\n setAttributeCalls.push([this, name.toLowerCase(), value]);\n return setAttribute.apply(this, arguments);\n };\n- ReactDOM.render(
, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render(
);\n+ });\n+\n expect(container.innerHTML).toBe('
Hi<\/b>\"><\/div>');\n expect(setAttributeCalls.length).toBe(1);\n expect(setAttributeCalls[0][0]).toBe(container.firstChild);\n@@ -113,7 +120,10 @@ describe('when Trusted Types are available in global object', () => {\n expect(setAttributeCalls[0][2]).toBe(ttObject1);\n \n setAttributeCalls.length = 0;\n- ReactDOM.render(
, container);\n+ await act(() => {\n+ root.render(
);\n+ });\n+\n expect(setAttributeCalls.length).toBe(1);\n expect(setAttributeCalls[0][0]).toBe(container.firstChild);\n expect(setAttributeCalls[0][1]).toBe('data-foo');\n@@ -124,7 +134,7 @@ describe('when Trusted Types are available in global object', () => {\n }\n });\n \n- it('should not stringify trusted values for setAttribute (known attribute)', () => {\n+ it('should not stringify trusted values for setAttribute (known attribute)', async () => {\n const setAttribute = Element.prototype.setAttribute;\n try {\n const setAttributeCalls = [];\n@@ -132,7 +142,11 @@ describe('when Trusted Types are available in global object', () => {\n setAttributeCalls.push([this, name.toLowerCase(), value]);\n return setAttribute.apply(this, arguments);\n };\n- ReactDOM.render(
, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render(
);\n+ });\n+\n expect(container.innerHTML).toBe('
Hi<\/b>\"><\/div>');\n expect(setAttributeCalls.length).toBe(1);\n expect(setAttributeCalls[0][0]).toBe(container.firstChild);\n@@ -141,7 +155,10 @@ describe('when Trusted Types are available in global object', () => {\n expect(setAttributeCalls[0][2]).toBe(ttObject1);\n \n setAttributeCalls.length = 0;\n- ReactDOM.render(
, container);\n+ await act(() => {\n+ root.render(
);\n+ });\n+\n expect(setAttributeCalls.length).toBe(1);\n expect(setAttributeCalls[0][0]).toBe(container.firstChild);\n expect(setAttributeCalls[0][1]).toBe('class');\n@@ -152,7 +169,7 @@ describe('when Trusted Types are available in global object', () => {\n }\n });\n \n- it('should not stringify trusted values for setAttributeNS', () => {\n+ it('should not stringify trusted values for setAttributeNS', async () => {\n const setAttributeNS = Element.prototype.setAttributeNS;\n try {\n const setAttributeNSCalls = [];\n@@ -160,7 +177,11 @@ describe('when Trusted Types are available in global object', () => {\n setAttributeNSCalls.push([this, ns, name, value]);\n return setAttributeNS.apply(this, arguments);\n };\n- ReactDOM.render(, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render();\n+ });\n+\n expect(container.innerHTML).toBe('

dillon1000/react

Files changed