{"parents":["9aef5d225b489ceeba753c5c86b236259baf816c"],"files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationUntrustedURL-test.js"}],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationUntrustedURL-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationUntrustedURL-test.js\nindex ef232d7661..121ffe93ad 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationUntrustedURL-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationUntrustedURL-test.js\n@@ -16,8 +16,10 @@ const ReactDOMServerIntegrationUtils = require('.\/utils\/ReactDOMServerIntegratio\n \n let React;\n let ReactDOM;\n+let ReactDOMClient;\n let ReactDOMServer;\n let ReactTestUtils;\n+let act;\n \n const EXPECTED_SAFE_URL =\n \"javascript:throw new Error('React has blocked a javascript: URL as a security precaution.')\";\n@@ -34,8 +36,10 @@ describe('ReactDOMServerIntegration - Untrusted URLs', () => {\n jest.resetModules();\n React = require('react');\n ReactDOM = require('react-dom');\n+ ReactDOMClient = require('react-dom\/client');\n ReactDOMServer = require('react-dom\/server');\n ReactTestUtils = require('react-dom\/test-utils');\n+ act = require('internal-test-utils').act;\n \n \/\/ Make them available to the helpers.\n return {\n@@ -167,11 +171,16 @@ describe('ReactDOMServerIntegration - Untrusted URLs', () => {\n },\n );\n \n- it('rejects a javascript protocol href if it is added during an update', () => {\n+ it('rejects a javascript protocol href if it is added during an update', async () => {\n const container = document.createElement('div');\n- ReactDOM.render(click me<\/a>, container);\n- expect(() => {\n- ReactDOM.render(click me<\/a>, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(async () => {\n+ root.render(click me<\/a>);\n+ });\n+ await expect(async () => {\n+ await act(() => {\n+ root.render(click me<\/a>);\n+ });\n }).toErrorDev(\n 'Warning: A future version of React will block javascript: URLs as a security precaution. ' +\n 'Use event handlers instead if you can. If you need to generate unsafe HTML try using ' +\n@@ -196,8 +205,10 @@ describe('ReactDOMServerIntegration - Untrusted URLs - disableJavaScriptURLs', (\n \n React = require('react');\n ReactDOM = require('react-dom');\n+ ReactDOMClient = require('react-dom\/client');\n ReactDOMServer = require('react-dom\/server');\n ReactTestUtils = require('react-dom\/test-utils');\n+ act = require('internal-test-utils').act;\n \n \/\/ Make them available to the helpers.\n return {\n@@ -325,11 +336,16 @@ describe('ReactDOMServerIntegration - Untrusted URLs - disableJavaScriptURLs', (\n },\n );\n \n- it('rejects a javascript protocol href if it is added during an update', () => {\n+ it('rejects a javascript protocol href if it is added during an update', async () => {\n const container = document.createElement('div');\n- ReactDOM.render(click me<\/a>, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(() => {\n+ root.render(click me<\/a>);\n+ });\n expect(container.firstChild.href).toBe('http:\/\/thisisfine\/');\n- ReactDOM.render(click me<\/a>, container);\n+ await act(() => {\n+ root.render(click me<\/a>);\n+ });\n expect(container.firstChild.href).toBe(EXPECTED_SAFE_URL);\n });\n \n@@ -369,15 +385,22 @@ describe('ReactDOMServerIntegration - Untrusted URLs - disableJavaScriptURLs', (\n expect(e.href).toBe('https:\/\/reactjs.org\/');\n });\n \n- it('rejects a javascript protocol href if it is added during an update twice', () => {\n+ it('rejects a javascript protocol href if it is added during an update twice', async () => {\n const container = document.createElement('div');\n- ReactDOM.render(click me<\/a>, container);\n+ const root = ReactDOMClient.createRoot(container);\n+ await act(async () => {\n+ root.render(click me<\/a>);\n+ });\n expect(container.firstChild.href).toBe('http:\/\/thisisfine\/');\n- ReactDOM.render(click me<\/a>, container);\n+ await act(async () => {\n+ root.render(click me<\/a>);\n+ });\n expect(container.firstChild.href).toBe(EXPECTED_SAFE_URL);\n \/\/ The second update ensures that a global flag hasn't been added to the regex\n \/\/ which would fail to match the second time it is called.\n- ReactDOM.render(click me<\/a>, container);\n+ await act(async () => {\n+ root.render(click me<\/a>);\n+ });\n expect(container.firstChild.href).toBe(EXPECTED_SAFE_URL);\n });\n });\n","commit":{"shortRevision":"7c79dafb71","authoredAt":"2024-01-26T12:18:14-08:00","subject":"Convert ReactDOMServerIntegrationUntrustedURL-test.js to createRoot (#28105)","authorName":"Matt Carroll","revision":"7c79dafb71cab8808749e3284eab3c623e9c2360","authorEmail":"7158882+mattcarrollcode@users.noreply.github.com"},"body":""}

dillon1000/react

Files changed