{"parents":["b8ae89f38288bfae37dff54fa1ec4bf3b4555ed5"],"patch":"diff --git a\/.eslintrc.js b\/.eslintrc.js\nindex b5205817a4..13746fb3c6 100644\n--- a\/.eslintrc.js\n+++ b\/.eslintrc.js\n@@ -434,7 +434,6 @@ module.exports = {\n es6: true,\n node: true,\n jest: true,\n- jasmine: true,\n },\n \n globals: {\ndiff --git a\/package.json b\/package.json\nindex b10894522b..a5df2c31b4 100644\n--- a\/package.json\n+++ b\/package.json\n@@ -69,12 +69,10 @@\n \"gzip-size\": \"^5.1.1\",\n \"hermes-eslint\": \"^0.9.0\",\n \"hermes-parser\": \"^0.9.0\",\n- \"jasmine-check\": \"^1.0.0-rc.0\",\n \"jest\": \"^29.4.1\",\n \"jest-cli\": \"^29.4.1\",\n \"jest-diff\": \"^29.4.1\",\n \"jest-environment-jsdom\": \"^29.4.1\",\n- \"jest-jasmine2\": \"^29.4.1\",\n \"jest-snapshot-serializer-raw\": \"^1.1.0\",\n \"minimatch\": \"^3.0.4\",\n \"minimist\": \"^1.2.3\",\ndiff --git a\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js b\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\nindex 02d95592a1..d7cec67f5b 100644\n--- a\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\n+++ b\/packages\/react-client\/src\/__tests__\/ReactFlight-test.js\n@@ -91,6 +91,10 @@ describe('ReactFlight', () => {\n };\n });\n \n+ afterEach(() => {\n+ jest.restoreAllMocks();\n+ });\n+\n function clientReference(value) {\n return Object.defineProperties(\n function () {\n@@ -240,7 +244,7 @@ describe('ReactFlight', () => {\n ReactNoop.render(rootModel);\n });\n expect(ReactNoop).toMatchRenderedOutput('Loading...');\n- spyOnDevAndProd(console, 'error');\n+ spyOnDevAndProd(console, 'error').mockImplementation(() => {});\n await load();\n expect(console.error).toHaveBeenCalledTimes(1);\n });\n@@ -322,7 +326,7 @@ describe('ReactFlight', () => {\n ReactNoop.render(rootModel);\n });\n expect(ReactNoop).toMatchRenderedOutput('Loading...');\n- spyOnDevAndProd(console, 'error');\n+ spyOnDevAndProd(console, 'error').mockImplementation(() => {});\n await load();\n expect(console.error).toHaveBeenCalledTimes(1);\n });\ndiff --git a\/packages\/react-devtools-extensions\/flow-typed\/jest.js b\/packages\/react-devtools-extensions\/flow-typed\/jest.js\nindex 3cad1447b1..5ed9124279 100644\n--- a\/packages\/react-devtools-extensions\/flow-typed\/jest.js\n+++ b\/packages\/react-devtools-extensions\/flow-typed\/jest.js\n@@ -1172,28 +1172,5 @@ declare var expect: {\n },\n };\n \n-\/\/ TODO handle return type\n-\/\/ https:\/\/jasmine.github.io\/2.4\/introduction.html#section-Spies\n-declare function spyOn(value: mixed, method: string): Object;\n-\n \/** Holds all functions related to manipulating test runner *\/\n declare var jest: JestObjectType;\n-\n-\/**\n- * The global Jasmine object, this is generally not exposed as the public API,\n- * using features inside here could break in later versions of Jest.\n- *\/\n-declare var jasmine: {\n- DEFAULT_TIMEOUT_INTERVAL: number,\n- any(value: mixed): JestAsymmetricEqualityType,\n- anything(): any,\n- arrayContaining(value: Array): Array,\n- clock(): JestClockType,\n- createSpy(name: string): JestSpyType,\n- createSpyObj(\n- baseName: string,\n- methodNames: Array\n- ): {[methodName: string]: JestSpyType},\n- objectContaining(value: Object): Object,\n- stringMatching(value: string): string,\n-};\ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/TimelineProfiler-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/TimelineProfiler-test.js\nindex 27188c5f41..72f112cf5a 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/TimelineProfiler-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/TimelineProfiler-test.js\n@@ -47,6 +47,10 @@ describe('Timeline profiler', () => {\n store = global.store;\n });\n \n+ afterEach(() => {\n+ jest.restoreAllMocks();\n+ });\n+\n describe('User Timing API', () => {\n let clearedMarks;\n let featureDetectionMarkName = null;\n@@ -517,7 +521,7 @@ describe('Timeline profiler', () => {\n clearPendingMarks();\n \n let errorMessage;\n- spyOn(console, 'error').and.callFake(message => {\n+ jest.spyOn(console, 'error').mockImplementation(message => {\n errorMessage = message;\n });\n \n@@ -571,7 +575,7 @@ describe('Timeline profiler', () => {\n clearPendingMarks();\n \n let errorMessage;\n- spyOn(console, 'error').and.callFake(message => {\n+ jest.spyOn(console, 'error').mockImplementation(message => {\n errorMessage = message;\n });\n \n@@ -740,7 +744,7 @@ describe('Timeline profiler', () => {\n });\n \n it('should mark sync render that throws', async () => {\n- spyOn(console, 'error');\n+ jest.spyOn(console, 'error').mockImplementation(() => {});\n \n class ErrorBoundary extends React.Component {\n state = {error: null};\n@@ -802,7 +806,7 @@ describe('Timeline profiler', () => {\n });\n \n it('should mark concurrent render that throws', async () => {\n- spyOn(console, 'error');\n+ jest.spyOn(console, 'error').mockImplementation(() => {});\n \n class ErrorBoundary extends React.Component {\n state = {error: null};\n@@ -1697,7 +1701,7 @@ describe('Timeline profiler', () => {\n renderRootHelper();\n \n let errorMessage;\n- spyOn(console, 'error').and.callFake(message => {\n+ jest.spyOn(console, 'error').mockImplementation(message => {\n errorMessage = message;\n });\n \n@@ -1766,7 +1770,7 @@ describe('Timeline profiler', () => {\n renderRootHelper();\n \n let errorMessage;\n- spyOn(console, 'error').and.callFake(message => {\n+ jest.spyOn(console, 'error').mockImplementation(message => {\n errorMessage = message;\n });\n \n@@ -1993,7 +1997,7 @@ describe('Timeline profiler', () => {\n });\n \n it('should mark sync render that throws', async () => {\n- spyOn(console, 'error');\n+ jest.spyOn(console, 'error').mockImplementation(() => {});\n \n class ErrorBoundary extends React.Component {\n state = {error: null};\n@@ -2088,7 +2092,7 @@ describe('Timeline profiler', () => {\n });\n \n it('should mark concurrent render that throws', async () => {\n- spyOn(console, 'error');\n+ jest.spyOn(console, 'error').mockImplementation(() => {});\n \n class ErrorBoundary extends React.Component {\n state = {error: null};\ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/bridge-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/bridge-test.js\nindex 67c1615c2b..d38c0fe66a 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/bridge-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/bridge-test.js\n@@ -38,7 +38,7 @@ describe('Bridge', () => {\n expect(wall.send).toHaveBeenCalledWith('shutdown');\n \n \/\/ Verify that the Bridge doesn't send messages after shutdown.\n- spyOn(console, 'warn');\n+ jest.spyOn(console, 'warn').mockImplementation(() => {});\n wall.send.mockClear();\n bridge.send('should not send');\n jest.runAllTimers();\ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\nindex 3a5a82bf28..6e86f42a74 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js\n@@ -2121,7 +2121,7 @@ describe('InspectedElement', () => {\n });\n \n it('should gracefully surface backend errors on the frontend rather than timing out', async () => {\n- spyOn(console, 'error');\n+ jest.spyOn(console, 'error').mockImplementation(() => {});\n \n let shouldThrow = false;\n \n@@ -2738,7 +2738,7 @@ describe('InspectedElement', () => {\n \n it('inspecting nested renderers should not throw', async () => {\n \/\/ Ignoring react art warnings\n- spyOn(console, 'error');\n+ jest.spyOn(console, 'error').mockImplementation(() => {});\n const ReactArt = require('react-art');\n const ArtSVGMode = require('art\/modes\/svg');\n const ARTCurrentMode = require('art\/modes\/current');\ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/legacy\/inspectElement-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/legacy\/inspectElement-test.js\nindex c6f748a30e..ba8064bc3c 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/legacy\/inspectElement-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/legacy\/inspectElement-test.js\n@@ -760,7 +760,7 @@ describe('InspectedElementContext', () => {\n const rendererID = ((store.getRendererIDForElement(id): any): number);\n \n const logSpy = jest.fn();\n- spyOn(console, 'log').and.callFake(logSpy);\n+ jest.spyOn(console, 'log').mockImplementation(logSpy);\n \n \/\/ Should store the whole value (not just the hydrated parts)\n backendAPI.storeAsGlobal({\ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js\nindex ff4964927c..1464912034 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js\n@@ -1135,7 +1135,7 @@ describe('Timeline profiler', () => {\n );\n const invalidUserTimingData = createUserTimingData(invalidMarks);\n \n- const error = spyOn(console, 'error');\n+ const error = jest.spyOn(console, 'error').mockImplementation(() => {});\n preprocessData([\n ...createBoilerplateEntries(),\n ...invalidUserTimingData,\n@@ -1153,7 +1153,7 @@ describe('Timeline profiler', () => {\n );\n const invalidUserTimingData = createUserTimingData(invalidMarks);\n \n- const error = spyOn(console, 'error');\n+ const error = jest.spyOn(console, 'error').mockImplementation(() => {});\n preprocessData([\n ...createBoilerplateEntries(),\n ...invalidUserTimingData,\n@@ -1748,7 +1748,7 @@ describe('Timeline profiler', () => {\n describe('errors thrown while rendering', () => {\n \/\/ @reactVersion >= 18.0\n it('shoult parse Errors thrown during render', async () => {\n- spyOn(console, 'error');\n+ jest.spyOn(console, 'error');\n \n class ErrorBoundary extends React.Component {\n state = {error: null};\ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/profilerStore-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/profilerStore-test.js\nindex 4c6b0ad954..fcc4de34ea 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/profilerStore-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/profilerStore-test.js\n@@ -73,7 +73,7 @@ describe('ProfilerStore', () => {\n const fauxProfilingData = {\n dataForRoots: new Map(),\n };\n- spyOn(console, 'warn');\n+ jest.spyOn(console, 'warn').mockImplementation(() => {});\n store.profilerStore.profilingData = fauxProfilingData;\n expect(store.profilerStore.profilingData).not.toBe(fauxProfilingData);\n expect(console.warn).toHaveBeenCalledTimes(1);\ndiff --git a\/packages\/react-devtools-shared\/src\/__tests__\/setupTests.js b\/packages\/react-devtools-shared\/src\/__tests__\/setupTests.js\nindex 9d68da1dba..9a21dfa4a7 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/setupTests.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/setupTests.js\n@@ -32,8 +32,7 @@ if (compactConsole) {\n global.console = new CustomConsole(process.stdout, process.stderr, formatter);\n }\n \n-const env = jasmine.getEnv();\n-env.beforeEach(() => {\n+beforeEach(() => {\n global.mockClipboardCopy = jest.fn();\n \n \/\/ Test environment doesn't support document methods like execCommand()\n@@ -169,7 +168,7 @@ env.beforeEach(() => {\n }\n global.fetch = mockFetch;\n });\n-env.afterEach(() => {\n+afterEach(() => {\n delete global.__REACT_DEVTOOLS_GLOBAL_HOOK__;\n \n \/\/ It's important to reset modules between test runs;\ndiff --git a\/packages\/react-dom\/src\/__tests__\/InvalidEventListeners-test.js b\/packages\/react-dom\/src\/__tests__\/InvalidEventListeners-test.js\nindex aeeed4bceb..c5df3e1196 100644\n--- a\/packages\/react-dom\/src\/__tests__\/InvalidEventListeners-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/InvalidEventListeners-test.js\n@@ -65,7 +65,7 @@ describe('InvalidEventListeners', () => {\n \n if (!__DEV__) {\n expect(console.error).toHaveBeenCalledTimes(1);\n- expect(console.error.calls.argsFor(0)[0]).toEqual(\n+ expect(console.error.mock.calls[0][0]).toEqual(\n expect.objectContaining({\n detail: expect.objectContaining({\n message:\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js\nindex b474103f97..e0fe178d2f 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js\n@@ -24,6 +24,10 @@ describe('ReactDOMComponent', () => {\n ReactTestUtils = require('react-dom\/test-utils');\n });\n \n+ afterEach(() => {\n+ jest.restoreAllMocks();\n+ });\n+\n describe('updateDOM', () => {\n it('should handle className', () => {\n const container = document.createElement('div');\n@@ -1239,7 +1243,7 @@ describe('ReactDOMComponent', () => {\n \n if (__DEV__) {\n expect(console.log).toHaveBeenCalledTimes(1);\n- expect(console.log.calls.argsFor(0)[0]).toContain('onError called');\n+ expect(console.log.mock.calls[0][0]).toContain('onError called');\n }\n });\n \n@@ -1464,7 +1468,7 @@ describe('ReactDOMComponent', () => {\n \n it('should support custom elements which extend native elements', () => {\n const container = document.createElement('div');\n- spyOnDevAndProd(document, 'createElement').and.callThrough();\n+ spyOnDevAndProd(document, 'createElement');\n ReactDOM.render(

, container);\n expect(document.createElement).toHaveBeenCalledWith('div', {\n is: 'custom-div',\n@@ -1496,8 +1500,8 @@ describe('ReactDOMComponent', () => {\n \n if (__DEV__) {\n expect(console.log).toHaveBeenCalledTimes(2);\n- expect(console.log.calls.argsFor(0)[0]).toContain('onError called');\n- expect(console.log.calls.argsFor(1)[0]).toContain('onLoad called');\n+ expect(console.log.mock.calls[0][0]).toContain('onError called');\n+ expect(console.log.mock.calls[1][0]).toContain('onLoad called');\n }\n });\n \ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMConsoleErrorReporting-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMConsoleErrorReporting-test.js\nindex 7e1a06b9de..03c4f97c49 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMConsoleErrorReporting-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMConsoleErrorReporting-test.js\n@@ -49,6 +49,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n afterEach(() => {\n document.body.removeChild(container);\n window.removeEventListener('error', windowOnError);\n+ jest.restoreAllMocks();\n });\n \n describe('ReactDOMClient.createRoot', () => {\n@@ -95,7 +96,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported because we're in a browser click event:\n expect.objectContaining({\n@@ -125,7 +126,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported because we're in a browser click event:\n expect.objectContaining({\n@@ -140,14 +141,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n root.render();\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([]);\n+ expect(console.error.mock.calls).toEqual([]);\n }\n });\n \n@@ -181,7 +182,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported due to the guarded callback:\n expect.objectContaining({\n@@ -212,7 +213,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -224,14 +225,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n root.render();\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([]);\n+ expect(console.error.mock.calls).toEqual([]);\n }\n });\n \n@@ -267,7 +268,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by jsdom due to the guarded callback:\n expect.objectContaining({\n@@ -298,7 +299,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -310,14 +311,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n root.render();\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([]);\n+ expect(console.error.mock.calls).toEqual([]);\n }\n });\n \n@@ -347,7 +348,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported due to the guarded callback:\n expect.objectContaining({\n@@ -368,7 +369,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -380,14 +381,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n root.render();\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([]);\n+ expect(console.error.mock.calls).toEqual([]);\n }\n });\n \n@@ -419,7 +420,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by jsdom due to the guarded callback:\n expect.objectContaining({\n@@ -440,7 +441,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -452,14 +453,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n root.render();\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([]);\n+ expect(console.error.mock.calls).toEqual([]);\n }\n });\n \n@@ -489,7 +490,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported due to the guarded callback:\n expect.objectContaining({\n@@ -510,7 +511,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -522,14 +523,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n root.render();\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([]);\n+ expect(console.error.mock.calls).toEqual([]);\n }\n });\n \n@@ -561,7 +562,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by jsdom due to the guarded callback:\n expect.objectContaining({\n@@ -582,7 +583,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -594,14 +595,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n root.render();\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([]);\n+ expect(console.error.mock.calls).toEqual([]);\n }\n });\n });\n@@ -649,7 +650,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n [\n \/\/ Reported because we're in a browser click event:\n@@ -680,7 +681,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported because we're in a browser click event:\n expect.objectContaining({\n@@ -695,14 +696,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n ReactDOM.render(, container);\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n ]);\n }\n@@ -730,7 +731,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n [\n \/\/ Reported due to the guarded callback:\n@@ -752,7 +753,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -764,14 +765,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n ReactDOM.render(, container);\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n ]);\n }\n@@ -802,7 +803,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n [\n \/\/ Reported by jsdom due to the guarded callback:\n@@ -824,7 +825,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -836,14 +837,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n ReactDOM.render(, container);\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n ]);\n }\n@@ -874,7 +875,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n [\n \/\/ Reported due to the guarded callback:\n@@ -896,7 +897,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -908,14 +909,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n ReactDOM.render(, container);\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n ]);\n }\n@@ -949,7 +950,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n [\n \/\/ Reported by jsdom due to the guarded callback:\n@@ -971,7 +972,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -983,14 +984,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n ReactDOM.render(, container);\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n ]);\n }\n@@ -1021,7 +1022,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n [\n \/\/ Reported due to the guarded callback:\n@@ -1043,7 +1044,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -1055,14 +1056,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n ReactDOM.render(, container);\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n ]);\n }\n@@ -1096,7 +1097,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n }),\n ],\n ]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n [\n \/\/ Reported by jsdom due to the guarded callback:\n@@ -1118,7 +1119,7 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \/\/ The top-level error was caught with try\/catch, and there's no guarded callback,\n \/\/ so in production we don't see an error event.\n expect(windowOnError.mock.calls).toEqual([]);\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [\n \/\/ Reported by React with no extra message:\n expect.objectContaining({\n@@ -1130,14 +1131,14 @@ describe('ReactDOMConsoleErrorReporting', () => {\n \n \/\/ Check next render doesn't throw.\n windowOnError.mockReset();\n- console.error.calls.reset();\n+ console.error.mockReset();\n act(() => {\n ReactDOM.render(, container);\n });\n expect(container.textContent).toBe('OK');\n expect(windowOnError.mock.calls).toEqual([]);\n if (__DEV__) {\n- expect(console.error.calls.all().map(c => c.args)).toEqual([\n+ expect(console.error.mock.calls).toEqual([\n [expect.stringContaining('ReactDOM.render is no longer supported')],\n ]);\n }\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFiber-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFiber-test.js\nindex b342cc9461..865337e8b5 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFiber-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFiber-test.js\n@@ -24,6 +24,7 @@ describe('ReactDOMFiber', () => {\n afterEach(() => {\n document.body.removeChild(container);\n container = null;\n+ jest.restoreAllMocks();\n });\n \n it('should render strings as children', () => {\n@@ -1154,11 +1155,11 @@ describe('ReactDOMFiber', () => {\n expect(ops).toEqual(['A']);\n \n if (__DEV__) {\n- expect(console.error.calls.count()).toBe(2);\n- expect(console.error.calls.argsFor(0)[0]).toMatch(\n+ expect(console.error).toHaveBeenCalledTimes(2);\n+ expect(console.error.mock.calls[0][0]).toMatch(\n 'ReactDOM.render is no longer supported in React 18',\n );\n- expect(console.error.calls.argsFor(1)[0]).toMatch(\n+ expect(console.error.mock.calls[1][0]).toMatch(\n 'ReactDOM.render is no longer supported in React 18',\n );\n }\n@@ -1257,7 +1258,7 @@ describe('ReactDOMFiber', () => {\n let actualDocument;\n let textNode;\n \n- spyOnDevAndProd(iframeContainer, 'appendChild').and.callFake(node => {\n+ spyOnDevAndProd(iframeContainer, 'appendChild').mockImplementation(node => {\n actualDocument = node.ownerDocument;\n textNode = node;\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzShellHydration-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzShellHydration-test.js\nindex 6d770d571b..a6580d58d9 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzShellHydration-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMFizzShellHydration-test.js\n@@ -63,6 +63,10 @@ describe('ReactDOMFizzShellHydration', () => {\n });\n });\n \n+ afterEach(() => {\n+ jest.restoreAllMocks();\n+ });\n+\n async function serverAct(callback) {\n await callback();\n \/\/ Await one turn around the event loop.\n@@ -286,7 +290,7 @@ describe('ReactDOMFizzShellHydration', () => {\n });\n \n test('TODO: A large component stack causes SSR to stack overflow', async () => {\n- spyOnDevAndProd(console, 'error');\n+ spyOnDevAndProd(console, 'error').mockImplementation(() => {});\n \n function NestedComponent({depth}: {depth: number}) {\n if (depth <= 0) {\n@@ -302,7 +306,7 @@ describe('ReactDOMFizzShellHydration', () => {\n );\n });\n expect(console.error).toHaveBeenCalledTimes(1);\n- expect(console.error.calls.argsFor(0)[0].toString()).toBe(\n+ expect(console.error.mock.calls[0][0].toString()).toBe(\n 'RangeError: Maximum call stack size exceeded',\n );\n });\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMInput-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMInput-test.js\nindex d75c4ded9e..7fe9bb1728 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMInput-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMInput-test.js\n@@ -48,6 +48,7 @@ describe('ReactDOMInput', () => {\n \n afterEach(() => {\n document.body.removeChild(container);\n+ jest.restoreAllMocks();\n });\n \n it('should warn for controlled value of 0 with missing onChange', () => {\n@@ -1670,7 +1671,9 @@ describe('ReactDOMInput', () => {\n it('sets type, step, min, max before value always', () => {\n const log = [];\n const originalCreateElement = document.createElement;\n- spyOnDevAndProd(document, 'createElement').and.callFake(function (type) {\n+ spyOnDevAndProd(document, 'createElement').mockImplementation(function (\n+ type,\n+ ) {\n const el = originalCreateElement.apply(this, arguments);\n let value = '';\n \n@@ -1684,7 +1687,7 @@ describe('ReactDOMInput', () => {\n log.push('set property value');\n },\n });\n- spyOnDevAndProd(el, 'setAttribute').and.callFake(function (name) {\n+ spyOnDevAndProd(el, 'setAttribute').mockImplementation(function (name) {\n log.push('set attribute ' + name);\n });\n }\n@@ -1743,7 +1746,9 @@ describe('ReactDOMInput', () => {\n \n const log = [];\n const originalCreateElement = document.createElement;\n- spyOnDevAndProd(document, 'createElement').and.callFake(function (type) {\n+ spyOnDevAndProd(document, 'createElement').mockImplementation(function (\n+ type,\n+ ) {\n const el = originalCreateElement.apply(this, arguments);\n const getDefaultValue = Object.getOwnPropertyDescriptor(\n HTMLInputElement.prototype,\n@@ -1780,7 +1785,10 @@ describe('ReactDOMInput', () => {\n setValue.call(this, val);\n },\n });\n- spyOnDevAndProd(el, 'setAttribute').and.callFake(function (name, val) {\n+ spyOnDevAndProd(el, 'setAttribute').mockImplementation(function (\n+ name,\n+ val,\n+ ) {\n log.push(`node.setAttribute(${strify(name)}, ${strify(val)})`);\n });\n }\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMTextarea-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMTextarea-test.js\nindex 7dcb706993..c926224afb 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMTextarea-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMTextarea-test.js\n@@ -42,6 +42,10 @@ describe('ReactDOMTextarea', () => {\n };\n });\n \n+ afterEach(() => {\n+ jest.restoreAllMocks();\n+ });\n+\n it('should allow setting `defaultValue`', () => {\n const container = document.createElement('div');\n const node = renderTextarea(

, container);\n@@ -133,7 +137,9 @@ describe('ReactDOMTextarea', () => {\n \n     let counter = 0;\n     const originalCreateElement = document.createElement;\n-    spyOnDevAndProd(document, 'createElement').and.callFake(function (type) {\n+    spyOnDevAndProd(document, 'createElement').mockImplementation(function (\n+      type,\n+    ) {\n       const el = originalCreateElement.apply(this, arguments);\n       let value = '';\n       if (type === 'textarea') {\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactErrorBoundaries-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactErrorBoundaries-test.internal.js\nindex 1ad187b7be..3b90370c7f 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactErrorBoundaries-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactErrorBoundaries-test.internal.js\n@@ -796,10 +796,10 @@ describe('ReactErrorBoundaries', () => {\n     );\n     if (__DEV__) {\n       expect(console.error).toHaveBeenCalledTimes(2);\n-      expect(console.error.calls.argsFor(0)[0]).toContain(\n+      expect(console.error.mock.calls[0][0]).toContain(\n         'ReactDOM.render is no longer supported',\n       );\n-      expect(console.error.calls.argsFor(1)[0]).toContain(\n+      expect(console.error.mock.calls[1][0]).toContain(\n         'The above error occurred in the <BrokenRender> component:',\n       );\n     }\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactLegacyErrorBoundaries-test.internal.js b\/packages\/react-dom\/src\/__tests__\/ReactLegacyErrorBoundaries-test.internal.js\nindex 6d588e3dc6..f833ed39ed 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactLegacyErrorBoundaries-test.internal.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactLegacyErrorBoundaries-test.internal.js\n@@ -584,6 +584,10 @@ describe('ReactLegacyErrorBoundaries', () => {\n     };\n   });\n \n+  afterEach(() => {\n+    jest.restoreAllMocks();\n+  });\n+\n   it('does not swallow exceptions on mounting without boundaries', () => {\n     let container = document.createElement('div');\n     expect(() => {\n@@ -677,10 +681,10 @@ describe('ReactLegacyErrorBoundaries', () => {\n     );\n     if (__DEV__) {\n       expect(console.error).toHaveBeenCalledTimes(2);\n-      expect(console.error.calls.argsFor(0)[0]).toContain(\n+      expect(console.error.mock.calls[0][0]).toContain(\n         'ReactDOM.render is no longer supported',\n       );\n-      expect(console.error.calls.argsFor(1)[0]).toContain(\n+      expect(console.error.mock.calls[1][0]).toContain(\n         'The above error occurred in the <BrokenRender> component:',\n       );\n     }\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactLegacyRootWarnings-test.js b\/packages\/react-dom\/src\/__tests__\/ReactLegacyRootWarnings-test.js\nindex f8d039124f..9504de2c0a 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactLegacyRootWarnings-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactLegacyRootWarnings-test.js\n@@ -9,6 +9,10 @@ describe('ReactDOMRoot', () => {\n     ReactDOM = require('react-dom');\n   });\n \n+  afterEach(() => {\n+    jest.restoreAllMocks();\n+  });\n+\n   test('deprecation warning for ReactDOM.render', () => {\n     spyOnDev(console, 'error');\n \n@@ -16,7 +20,7 @@ describe('ReactDOMRoot', () => {\n     expect(container.textContent).toEqual('Hi');\n     if (__DEV__) {\n       expect(console.error).toHaveBeenCalledTimes(1);\n-      expect(console.error.calls.argsFor(0)[0]).toContain(\n+      expect(console.error.mock.calls[0][0]).toContain(\n         'ReactDOM.render is no longer supported',\n       );\n     }\n@@ -30,7 +34,7 @@ describe('ReactDOMRoot', () => {\n     expect(container.textContent).toEqual('Hi');\n     if (__DEV__) {\n       expect(console.error).toHaveBeenCalledTimes(1);\n-      expect(console.error.calls.argsFor(0)[0]).toContain(\n+      expect(console.error.mock.calls[0][0]).toContain(\n         'ReactDOM.hydrate is no longer supported',\n       );\n     }\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactTestUtils-test.js b\/packages\/react-dom\/src\/__tests__\/ReactTestUtils-test.js\nindex e993b14190..88ede731ed 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactTestUtils-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactTestUtils-test.js\n@@ -333,7 +333,7 @@ describe('ReactTestUtils', () => {\n           e.persist();\n         },\n       };\n-      spyOnDevAndProd(obj, 'handler').and.callThrough();\n+      spyOnDevAndProd(obj, 'handler');\n       const container = document.createElement('div');\n       const node = ReactDOM.render(\n         <input type=\"text\" onChange={obj.handler} \/>,\n@@ -369,7 +369,7 @@ describe('ReactTestUtils', () => {\n           e.persist();\n         },\n       };\n-      spyOnDevAndProd(obj, 'handler').and.callThrough();\n+      spyOnDevAndProd(obj, 'handler');\n       const container = document.createElement('div');\n       const instance = ReactDOM.render(\n         <SomeComponent handleChange={obj.handler} \/>,\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js b\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\nindex a65d387394..3cd2e5712f 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js\n@@ -28,6 +28,10 @@ function sleep(period) {\n }\n \n describe('ReactTestUtils.act()', () => {\n+  afterEach(() => {\n+    jest.restoreAllMocks();\n+  });\n+\n   \/\/ first we run all the tests with concurrent mode\n   if (__EXPERIMENTAL__) {\n     let concurrentRoot = null;\n@@ -488,13 +492,13 @@ function runActTests(label, render, unmount, rerender) {\n \n       \/\/ @gate __DEV__\n       it('warns if you do not await an act call', async () => {\n-        spyOnDevAndProd(console, 'error');\n+        spyOnDevAndProd(console, 'error').mockImplementation(() => {});\n         act(async () => {});\n         \/\/ it's annoying that we have to wait a tick before this warning comes in\n         await sleep(0);\n         if (__DEV__) {\n-          expect(console.error.calls.count()).toEqual(1);\n-          expect(console.error.calls.argsFor(0)[0]).toMatch(\n+          expect(console.error).toHaveBeenCalledTimes(1);\n+          expect(console.error.mock.calls[0][0]).toMatch(\n             'You called act(async () => ...) without await.',\n           );\n         }\n@@ -502,7 +506,7 @@ function runActTests(label, render, unmount, rerender) {\n \n       \/\/ @gate __DEV__\n       it('warns if you try to interleave multiple act calls', async () => {\n-        spyOnDevAndProd(console, 'error');\n+        spyOnDevAndProd(console, 'error').mockImplementation(() => {});\n \n         await Promise.all([\n           act(async () => {\n@@ -516,10 +520,10 @@ function runActTests(label, render, unmount, rerender) {\n         await sleep(150);\n         if (__DEV__) {\n           expect(console.error).toHaveBeenCalledTimes(2);\n-          expect(console.error.calls.argsFor(0)[0]).toMatch(\n+          expect(console.error.mock.calls[0][0]).toMatch(\n             'You seem to have overlapping act() calls',\n           );\n-          expect(console.error.calls.argsFor(1)[0]).toMatch(\n+          expect(console.error.mock.calls[1][0]).toMatch(\n             'You seem to have overlapping act() calls',\n           );\n         }\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js b\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\nindex af5dff0155..9da24ed44f 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js\n@@ -1706,7 +1706,7 @@ describe('ReactUpdates', () => {\n \n   it('prevents infinite update loop triggered by synchronous updates in useEffect', () => {\n     \/\/ Ignore flushSync warning\n-    spyOnDev(console, 'error');\n+    spyOnDev(console, 'error').mockImplementation(() => {});\n \n     function NonTerminating() {\n       const [step, setStep] = React.useState(0);\ndiff --git a\/packages\/react-dom\/src\/__tests__\/utils\/ReactDOMServerIntegrationTestUtils.js b\/packages\/react-dom\/src\/__tests__\/utils\/ReactDOMServerIntegrationTestUtils.js\nindex f4d321ffc1..5aa5cad248 100644\n--- a\/packages\/react-dom\/src\/__tests__\/utils\/ReactDOMServerIntegrationTestUtils.js\n+++ b\/packages\/react-dom\/src\/__tests__\/utils\/ReactDOMServerIntegrationTestUtils.js\n@@ -67,19 +67,23 @@ module.exports = function (initModules) {\n   \/\/ performs fn asynchronously and expects count errors logged to console.error.\n   \/\/ will fail the test if the count of errors logged is not equal to count.\n   async function expectErrors(fn, count) {\n-    if (console.error.calls && console.error.calls.reset) {\n-      console.error.calls.reset();\n+    if (console.error.mockClear) {\n+      console.error.mockClear();\n     } else {\n       \/\/ TODO: Rewrite tests that use this helper to enumerate expected errors.\n       \/\/ This will enable the helper to use the .toErrorDev() matcher instead of spying.\n-      spyOnDev(console, 'error');\n+      spyOnDev(console, 'error').mockImplementation(() => {});\n     }\n \n     const result = await fn();\n-    if (console.error.calls && console.error.calls.count() !== 0) {\n+    if (\n+      console.error.mock &&\n+      console.error.mock.calls &&\n+      console.error.mock.calls.length !== 0\n+    ) {\n       const filteredWarnings = [];\n-      for (let i = 0; i < console.error.calls.count(); i++) {\n-        const args = console.error.calls.argsFor(i);\n+      for (let i = 0; i < console.error.mock.calls.length; i++) {\n+        const args = console.error.mock.calls[i];\n         const [format, ...rest] = args;\n         if (!shouldIgnoreConsoleError(format, rest)) {\n           filteredWarnings.push(args);\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/DebugTracing-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/DebugTracing-test.internal.js\nindex 0d4cf546c6..5c84c79b7b 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/DebugTracing-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/DebugTracing-test.internal.js\n@@ -33,14 +33,14 @@ describe('DebugTracing', () => {\n \n     const groups = [];\n \n-    spyOnDevAndProd(console, 'log').and.callFake(message => {\n+    spyOnDevAndProd(console, 'log').mockImplementation(message => {\n       logs.push(`log: ${message.replace(\/%c\/g, '')}`);\n     });\n-    spyOnDevAndProd(console, 'group').and.callFake(message => {\n+    spyOnDevAndProd(console, 'group').mockImplementation(message => {\n       logs.push(`group: ${message.replace(\/%c\/g, '')}`);\n       groups.push(message);\n     });\n-    spyOnDevAndProd(console, 'groupEnd').and.callFake(() => {\n+    spyOnDevAndProd(console, 'groupEnd').mockImplementation(() => {\n       const message = groups.pop();\n       logs.push(`groupEnd: ${message.replace(\/%c\/g, '')}`);\n     });\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactHooks-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactHooks-test.internal.js\nindex ebf4a25446..7dc6221d6c 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactHooks-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactHooks-test.internal.js\n@@ -1724,7 +1724,7 @@ describe('ReactHooks', () => {\n   \/\/ Regression test for #14674\n   it('does not swallow original error when updating another component in render phase', async () => {\n     const {useState} = React;\n-    spyOnDev(console, 'error');\n+    spyOnDev(console, 'error').mockImplementation(() => {});\n \n     let _setState;\n     function A() {\n@@ -1754,7 +1754,7 @@ describe('ReactHooks', () => {\n \n     if (__DEV__) {\n       expect(console.error).toHaveBeenCalledTimes(2);\n-      expect(console.error.calls.argsFor(0)[0]).toContain(\n+      expect(console.error.mock.calls[0][0]).toContain(\n         'Warning: Cannot update a component (`%s`) while rendering ' +\n           'a different component (`%s`).',\n       );\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js\nindex 37869121ba..a5c273b25c 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js\n@@ -29,6 +29,10 @@ describe('ReactIncrementalErrorHandling', () => {\n     act = require('jest-react').act;\n   });\n \n+  afterEach(() => {\n+    jest.restoreAllMocks();\n+  });\n+\n   function normalizeCodeLocInfo(str) {\n     return (\n       str &&\n@@ -1520,8 +1524,8 @@ describe('ReactIncrementalErrorHandling', () => {\n   });\n \n   it('error boundaries capture non-errors', () => {\n-    spyOnProd(console, 'error');\n-    spyOnDev(console, 'error');\n+    spyOnProd(console, 'error').mockImplementation(() => {});\n+    spyOnDev(console, 'error').mockImplementation(() => {});\n \n     class ErrorBoundary extends React.Component {\n       state = {error: null};\n@@ -1583,12 +1587,12 @@ describe('ReactIncrementalErrorHandling', () => {\n \n     if (__DEV__) {\n       expect(console.error).toHaveBeenCalledTimes(1);\n-      expect(console.error.calls.argsFor(0)[0]).toContain(\n+      expect(console.error.mock.calls[0][0]).toContain(\n         'The above error occurred in the <BadRender> component:',\n       );\n     } else {\n       expect(console.error).toHaveBeenCalledTimes(1);\n-      expect(console.error.calls.argsFor(0)[0]).toBe(notAnError);\n+      expect(console.error.mock.calls[0][0]).toBe(notAnError);\n     }\n   });\n \n@@ -1950,7 +1954,7 @@ describe('ReactIncrementalErrorHandling', () => {\n     \/\/ point to prevent an infinite loop in the case where there is (by\n     \/\/ accident) a render phase triggered from userspace.\n \n-    spyOnDev(console, 'error');\n+    spyOnDev(console, 'error').mockImplementation(() => {});\n \n     let numberOfThrows = 0;\n \n@@ -1990,10 +1994,10 @@ describe('ReactIncrementalErrorHandling', () => {\n \n     if (__DEV__) {\n       expect(console.error).toHaveBeenCalledTimes(2);\n-      expect(console.error.calls.argsFor(0)[0]).toContain(\n+      expect(console.error.mock.calls[0][0]).toContain(\n         'Cannot update a component (`%s`) while rendering a different component',\n       );\n-      expect(console.error.calls.argsFor(1)[0]).toContain(\n+      expect(console.error.mock.calls[1][0]).toContain(\n         'The above error occurred in the <App> component',\n       );\n     }\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactIsomorphicAct-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactIsomorphicAct-test.js\nindex 3d10f079b0..0d1d24ccbd 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactIsomorphicAct-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactIsomorphicAct-test.js\n@@ -34,6 +34,10 @@ describe('isomorphic act()', () => {\n     global.IS_REACT_ACT_ENVIRONMENT = true;\n   });\n \n+  afterEach(() => {\n+    jest.restoreAllMocks();\n+  });\n+\n   \/\/ @gate __DEV__\n   test('bypasses queueMicrotask', async () => {\n     const root = ReactNoop.createRoot();\n@@ -208,7 +212,7 @@ describe('isomorphic act()', () => {\n       return use(promise);\n     }\n \n-    spyOnDev(console, 'error');\n+    spyOnDev(console, 'error').mockImplementation(() => {});\n     const root = ReactNoop.createRoot();\n     act(() => {\n       startTransition(() => {\n@@ -229,8 +233,8 @@ describe('isomorphic act()', () => {\n     await null;\n     await null;\n \n-    expect(console.error.calls.count()).toBe(1);\n-    expect(console.error.calls.argsFor(0)[0]).toContain(\n+    expect(console.error).toHaveBeenCalledTimes(1);\n+    expect(console.error.mock.calls[0][0]).toContain(\n       'Warning: A component suspended inside an `act` scope, but the `act` ' +\n         'call was not awaited. When testing React components that ' +\n         'depend on asynchronous data, you must await the result:\\n\\n' +\n@@ -260,7 +264,7 @@ describe('isomorphic act()', () => {\n       return 'Async';\n     }\n \n-    spyOnDev(console, 'error');\n+    spyOnDev(console, 'error').mockImplementation(() => {});\n     const root = ReactNoop.createRoot();\n     act(() => {\n       startTransition(() => {\n@@ -282,7 +286,7 @@ describe('isomorphic act()', () => {\n     await null;\n     await null;\n \n-    expect(console.error.calls.count()).toBe(0);\n+    expect(console.error).toHaveBeenCalledTimes(0);\n \n     \/\/ Finish loading the data\n     await act(async () => {\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactLazy-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactLazy-test.internal.js\nindex f0760fa7e7..5f389b7f74 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactLazy-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactLazy-test.internal.js\n@@ -161,7 +161,7 @@ describe('ReactLazy', () => {\n   });\n \n   it('does not support arbitrary promises, only module objects', async () => {\n-    spyOnDev(console, 'error');\n+    spyOnDev(console, 'error').mockImplementation(() => {});\n \n     const LazyText = lazy(async () => Text);\n \n@@ -181,7 +181,7 @@ describe('ReactLazy', () => {\n     expect(Scheduler).toFlushAndThrow('Element type is invalid');\n     if (__DEV__) {\n       expect(console.error).toHaveBeenCalledTimes(3);\n-      expect(console.error.calls.argsFor(0)[0]).toContain(\n+      expect(console.error.mock.calls[0][0]).toContain(\n         'Expected the result of a dynamic import() call',\n       );\n     }\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js\nindex 25da1d13a6..6f995d1643 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js\n@@ -26,6 +26,10 @@ describe('ReactNewContext', () => {\n     gen = require('random-seed');\n   });\n \n+  afterEach(() => {\n+    jest.restoreAllMocks();\n+  });\n+\n   function Text(props) {\n     Scheduler.unstable_yieldValue(props.text);\n     return <span prop={props.text} \/>;\n@@ -860,7 +864,7 @@ describe('ReactNewContext', () => {\n     });\n \n     it('warns if multiple renderers concurrently render the same context', () => {\n-      spyOnDev(console, 'error');\n+      spyOnDev(console, 'error').mockImplementation(() => {});\n       const Context = React.createContext(0);\n \n       function Foo(props) {\n@@ -898,7 +902,7 @@ describe('ReactNewContext', () => {\n       expect(Scheduler).toFlushAndYield(['Foo', 'Foo']);\n \n       if (__DEV__) {\n-        expect(console.error.calls.argsFor(0)[0]).toContain(\n+        expect(console.error.mock.calls[0][0]).toContain(\n           'Detected multiple renderers concurrently rendering the same ' +\n             'context provider. This is currently unsupported',\n         );\n@@ -1047,12 +1051,12 @@ describe('ReactNewContext', () => {\n \n   describe('Context.Consumer', () => {\n     it('warns if child is not a function', () => {\n-      spyOnDev(console, 'error');\n+      spyOnDev(console, 'error').mockImplementation(() => {});\n       const Context = React.createContext(0);\n       ReactNoop.render(<Context.Consumer \/>);\n       expect(Scheduler).toFlushAndThrow('is not a function');\n       if (__DEV__) {\n-        expect(console.error.calls.argsFor(0)[0]).toContain(\n+        expect(console.error.mock.calls[0][0]).toContain(\n           'A context consumer was rendered with multiple children, or a child ' +\n             \"that isn't a function\",\n         );\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactThenable-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactThenable-test.js\nindex 965d69b7c2..eae80546ba 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactThenable-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactThenable-test.js\n@@ -505,7 +505,7 @@ describe('ReactThenable', () => {\n       }\n     }\n \n-    spyOnDev(console, 'error');\n+    spyOnDev(console, 'error').mockImplementation(() => {});\n     function App() {\n       return (\n         <Suspense fallback={<Text text=\"Loading...\" \/>}>\n@@ -522,8 +522,8 @@ describe('ReactThenable', () => {\n     });\n \n     if (__DEV__) {\n-      expect(console.error.calls.count()).toBe(1);\n-      expect(console.error.calls.argsFor(0)[0]).toContain(\n+      expect(console.error).toHaveBeenCalledTimes(1);\n+      expect(console.error.mock.calls[0][0]).toContain(\n         'Warning: `use` was called from inside a try\/catch block. This is not ' +\n           'allowed and can lead to unexpected behavior. To handle errors ' +\n           'triggered by `use`, wrap your component in a error boundary.',\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/useMutableSource-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/useMutableSource-test.internal.js\nindex c4ca0ae1de..27046562c9 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/useMutableSource-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/useMutableSource-test.internal.js\n@@ -1904,7 +1904,7 @@ describe('useMutableSource', () => {\n           \/\/ Get a new copy of ReactNoop.\n           loadModules();\n \n-          spyOnDev(console, 'error');\n+          spyOnDev(console, 'error').mockImplementation(() => {});\n \n           \/\/ Use the mutablesource again but with a different renderer.\n           ReactNoop.render(\n@@ -1917,7 +1917,7 @@ describe('useMutableSource', () => {\n           );\n           expect(Scheduler).toFlushAndYieldThrough(['c:one']);\n \n-          expect(console.error.calls.argsFor(0)[0]).toContain(\n+          expect(console.error.mock.calls[0][0]).toContain(\n             'Detected multiple renderers concurrently rendering the ' +\n               'same mutable source. This is currently unsupported.',\n           );\n@@ -1985,7 +1985,7 @@ describe('useMutableSource', () => {\n           \/\/ Get a new copy of ReactNoop.\n           loadModules();\n \n-          spyOnDev(console, 'error');\n+          spyOnDev(console, 'error').mockImplementation(() => {});\n \n           \/\/ Mutate before the new render reads from the source.\n           source.value = 'two';\n@@ -2001,7 +2001,7 @@ describe('useMutableSource', () => {\n           );\n           expect(Scheduler).toFlushAndYieldThrough(['c:two']);\n \n-          expect(console.error.calls.argsFor(0)[0]).toContain(\n+          expect(console.error.mock.calls[0][0]).toContain(\n             'Detected multiple renderers concurrently rendering the ' +\n               'same mutable source. This is currently unsupported.',\n           );\ndiff --git a\/packages\/react\/src\/__tests__\/ReactClassEquivalence-test.js b\/packages\/react\/src\/__tests__\/ReactClassEquivalence-test.js\nindex 912da27446..fa3d696e6a 100644\n--- a\/packages\/react\/src\/__tests__\/ReactClassEquivalence-test.js\n+++ b\/packages\/react\/src\/__tests__\/ReactClassEquivalence-test.js\n@@ -29,21 +29,28 @@ function runJest(testFile) {\n   const cwd = process.cwd();\n   const extension = process.platform === 'win32' ? '.cmd' : '';\n   const command = process.env.npm_lifecycle_event;\n+  const defaultReporter = '--reporters=default';\n+  const equivalenceReporter =\n+    '--reporters=<rootDir>\/scripts\/jest\/spec-equivalence-reporter\/equivalenceReporter.js';\n   if (!command.startsWith('test')) {\n     throw new Error(\n       'Expected this test to run as a result of one of test commands.',\n     );\n   }\n-  const result = spawnSync('yarn' + extension, [command, testFile], {\n-    cwd,\n-    env: Object.assign({}, process.env, {\n-      REACT_CLASS_EQUIVALENCE_TEST: 'true',\n-      \/\/ Remove these so that the test file is not filtered out by the mechanism\n-      \/\/ we use to parallelize tests in CI\n-      CIRCLE_NODE_TOTAL: '',\n-      CIRCLE_NODE_INDEX: '',\n-    }),\n-  });\n+  const result = spawnSync(\n+    'yarn' + extension,\n+    [command, testFile, defaultReporter, equivalenceReporter],\n+    {\n+      cwd,\n+      env: Object.assign({}, process.env, {\n+        REACT_CLASS_EQUIVALENCE_TEST: 'true',\n+        \/\/ Remove these so that the test file is not filtered out by the mechanism\n+        \/\/ we use to parallelize tests in CI\n+        CIRCLE_NODE_TOTAL: '',\n+        CIRCLE_NODE_INDEX: '',\n+      }),\n+    },\n+  );\n \n   if (result.error) {\n     throw result.error;\ndiff --git a\/packages\/react\/src\/__tests__\/ReactStrictMode-test.js b\/packages\/react\/src\/__tests__\/ReactStrictMode-test.js\nindex 16491c2533..61d53a7318 100644\n--- a\/packages\/react\/src\/__tests__\/ReactStrictMode-test.js\n+++ b\/packages\/react\/src\/__tests__\/ReactStrictMode-test.js\n@@ -982,6 +982,10 @@ describe('context legacy', () => {\n     PropTypes = require('prop-types');\n   });\n \n+  afterEach(() => {\n+    jest.restoreAllMocks();\n+  });\n+\n   it('should warn if the legacy context API have been used in strict mode', () => {\n     class LegacyContextProvider extends React.Component {\n       getChildContext() {\ndiff --git a\/packages\/scheduler\/src\/__tests__\/SchedulerProfiling-test.js b\/packages\/scheduler\/src\/__tests__\/SchedulerProfiling-test.js\nindex e00881014a..b8eb5d1594 100644\n--- a\/packages\/scheduler\/src\/__tests__\/SchedulerProfiling-test.js\n+++ b\/packages\/scheduler\/src\/__tests__\/SchedulerProfiling-test.js\n@@ -481,14 +481,14 @@ Task 1 [Normal]              │                    █████████\n   it('automatically stops profiling and warns if event log gets too big', async () => {\n     Scheduler.unstable_Profiling.startLoggingProfilingEvents();\n \n-    spyOnDevAndProd(console, 'error');\n+    spyOnDevAndProd(console, 'error').mockImplementation(() => {});\n \n     \/\/ Increase infinite loop guard limit\n     const originalMaxIterations = global.__MAX_ITERATIONS__;\n     global.__MAX_ITERATIONS__ = 120000;\n \n     let taskId = 1;\n-    while (console.error.calls.count() === 0) {\n+    while (console.error.mock.calls.length === 0) {\n       taskId++;\n       const task = scheduleCallback(NormalPriority, () => {});\n       cancelCallback(task);\n@@ -496,7 +496,7 @@ Task 1 [Normal]              │                    █████████\n     }\n \n     expect(console.error).toHaveBeenCalledTimes(1);\n-    expect(console.error.calls.argsFor(0)[0]).toBe(\n+    expect(console.error.mock.calls[0][0]).toBe(\n       \"Scheduler Profiling: Event log exceeded maximum size. Don't forget \" +\n         'to call `stopLoggingProfilingEvents()`.',\n     );\ndiff --git a\/packages\/shared\/__tests__\/describeComponentFrame-test.js b\/packages\/shared\/__tests__\/describeComponentFrame-test.js\nindex 85cbd5637f..6a8166893f 100644\n--- a\/packages\/shared\/__tests__\/describeComponentFrame-test.js\n+++ b\/packages\/shared\/__tests__\/describeComponentFrame-test.js\n@@ -97,12 +97,14 @@ describe('Component stack trace displaying', () => {\n     });\n     if (__DEV__) {\n       let i = 0;\n-      expect(console.error.calls.count()).toBe(Object.keys(fileNames).length);\n+      expect(console.error).toHaveBeenCalledTimes(\n+        Object.keys(fileNames).length,\n+      );\n       for (const fileName in fileNames) {\n         if (!fileNames.hasOwnProperty(fileName)) {\n           continue;\n         }\n-        const args = console.error.calls.argsFor(i);\n+        const args = console.error.mock.calls[i];\n         const stack = args[args.length - 1];\n         const expected = fileNames[fileName];\n         expect(stack).toContain(`at ${expected}:`);\ndiff --git a\/scripts\/jest\/config.base.js b\/scripts\/jest\/config.base.js\nindex 96c60761b0..871995b067 100644\n--- a\/scripts\/jest\/config.base.js\n+++ b\/scripts\/jest\/config.base.js\n@@ -30,5 +30,5 @@ module.exports = {\n \n   testEnvironment: 'jsdom',\n \n-  testRunner: 'jasmine2',\n+  testRunner: 'jest-circus\/runner',\n };\ndiff --git a\/scripts\/jest\/setupTests.js b\/scripts\/jest\/setupTests.js\nindex 425c14fced..159e8565a6 100644\n--- a\/scripts\/jest\/setupTests.js\n+++ b\/scripts\/jest\/setupTests.js\n@@ -10,16 +10,11 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {\n   \/\/ require that instead.\n   require('.\/spec-equivalence-reporter\/setupTests.js');\n } else {\n-  const env = jasmine.getEnv();\n   const errorMap = require('..\/error-codes\/codes.json');\n \n-  \/\/ TODO: Stop using spyOn in all the test since that seem deprecated.\n-  \/\/ This is a legacy upgrade path strategy from:\n-  \/\/ https:\/\/github.com\/facebook\/jest\/blob\/v20.0.4\/packages\/jest-matchers\/src\/spyMatchers.js#L160\n-  const isSpy = spy => spy.calls && typeof spy.calls.count === 'function';\n-\n-  const spyOn = global.spyOn;\n-  const noop = function () {};\n+  \/\/ By default, jest.spyOn also calls the spied method.\n+  const spyOn = jest.spyOn;\n+  const noop = jest.fn;\n \n   \/\/ Spying on console methods in production builds can mask errors.\n   \/\/ This is why we added an explicit spyOnDev() helper.\n@@ -55,10 +50,10 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {\n   \/\/ global variable. The global lets us detect an infinite loop even if\n   \/\/ the actual error object ends up being caught and ignored. An infinite\n   \/\/ loop must always fail the test!\n-  env.beforeEach(() => {\n+  beforeEach(() => {\n     global.infiniteLoopError = null;\n   });\n-  env.afterEach(() => {\n+  afterEach(() => {\n     const error = global.infiniteLoopError;\n     global.infiniteLoopError = null;\n     if (error) {\n@@ -97,7 +92,10 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {\n     expectedMatcher,\n     unexpectedConsoleCallStacks\n   ) => {\n-    if (console[methodName] !== mockMethod && !isSpy(console[methodName])) {\n+    if (\n+      console[methodName] !== mockMethod &&\n+      !jest.isMockFunction(console[methodName])\n+    ) {\n       throw new Error(\n         `Test did not tear down console.${methodName} mock properly.`\n       );\n@@ -157,8 +155,8 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {\n     unexpectedWarnCallStacks.length = 0;\n   };\n \n-  env.beforeEach(resetAllUnexpectedConsoleCalls);\n-  env.afterEach(flushAllUnexpectedConsoleCalls);\n+  beforeEach(resetAllUnexpectedConsoleCalls);\n+  afterEach(flushAllUnexpectedConsoleCalls);\n \n   if (process.env.NODE_ENV === 'production') {\n     \/\/ In production, we strip error messages and turn them into codes.\n@@ -309,6 +307,4 @@ if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {\n     const flags = getTestFlags();\n     return fn(flags);\n   };\n-\n-  require('jasmine-check').install();\n }\ndiff --git a\/scripts\/jest\/spec-equivalence-reporter\/equivalenceReporter.js b\/scripts\/jest\/spec-equivalence-reporter\/equivalenceReporter.js\nnew file mode 100644\nindex 0000000000..63da3737d2\n--- \/dev\/null\n+++ b\/scripts\/jest\/spec-equivalence-reporter\/equivalenceReporter.js\n@@ -0,0 +1,20 @@\n+\/*!\n+ * Copyright (c) Meta Platforms, Inc. and affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\/\n+\n+'use strict';\n+\n+class EquivalenceReporter {\n+  onTestCaseResult(test, testCaseResult) {\n+    console.log(\n+      `EQUIVALENCE: ${testCaseResult.title}, ` +\n+        `status: ${testCaseResult.status}, ` +\n+        `numExpectations: ${testCaseResult.numPassingAsserts}`\n+    );\n+  }\n+}\n+\n+module.exports = EquivalenceReporter;\ndiff --git a\/scripts\/jest\/spec-equivalence-reporter\/setupTests.js b\/scripts\/jest\/spec-equivalence-reporter\/setupTests.js\nindex 6065c8073b..487e0d3003 100644\n--- a\/scripts\/jest\/spec-equivalence-reporter\/setupTests.js\n+++ b\/scripts\/jest\/spec-equivalence-reporter\/setupTests.js\n@@ -7,16 +7,7 @@\n \n 'use strict';\n \n-const expect = global.expect;\n-\n-let numExpectations = 0;\n-\n-global.expect = function () {\n-  numExpectations += 1;\n-  return expect.apply(this, arguments);\n-};\n-\n-const spyOn = global.spyOn;\n+const spyOn = jest.spyOn;\n \n \/\/ Spying on console methods in production builds can mask errors.\n \/\/ This is why we added an explicit spyOnDev() helper.\n@@ -50,15 +41,3 @@ expect.extend({\n   ...require('..\/matchers\/toThrow'),\n   ...require('..\/matchers\/toWarnDev'),\n });\n-\n-beforeEach(() => (numExpectations = 0));\n-\n-jasmine.currentEnv_.addReporter({\n-  specDone: spec => {\n-    console.log(\n-      `EQUIVALENCE: ${spec.description}, ` +\n-        `status: ${spec.status}, ` +\n-        `numExpectations: ${numExpectations}`\n-    );\n-  },\n-});\ndiff --git a\/scripts\/jest\/typescript\/jest.d.ts b\/scripts\/jest\/typescript\/jest.d.ts\nindex ca68247fb9..43aa392287 100644\n--- a\/scripts\/jest\/typescript\/jest.d.ts\n+++ b\/scripts\/jest\/typescript\/jest.d.ts\n@@ -1,4 +1,3 @@\n-declare var jasmine: any;\n declare var __DEV__: boolean;\n declare var __TEST__: boolean;\n declare var __EXTENSION__: boolean;\n@@ -71,9 +70,5 @@ interface MockFunction {\n   mockReturnValueOnce(value: any): MockFunction\n }\n \n-\/\/ Allow importing jasmine-check\n-declare module 'jasmine-check' {\n-  export function install(global?: any): void;\n-}\n declare var check: any;\n declare var gen: any;\ndiff --git a\/yarn.lock b\/yarn.lock\nindex ae3c1d47f3..58ef74f348 100644\n--- a\/yarn.lock\n+++ b\/yarn.lock\n@@ -10277,13 +10277,6 @@ isurl@^1.0.0-alpha5:\n     has-to-string-tag-x \"^1.2.0\"\n     is-object \"^1.0.1\"\n \n-jasmine-check@^1.0.0-rc.0:\n-  version \"1.0.0-rc.0\"\n-  resolved \"https:\/\/registry.yarnpkg.com\/jasmine-check\/-\/jasmine-check-1.0.0-rc.0.tgz#117728c150078ecf211986c5f164275b71e937a4\"\n-  integrity sha512-V11aKvbAAEN34vVMRQVqylq3j8kw1Hmkf8JOVLYPcVpQX1jZ5pQPTYwbSnjMEjuRp5XQnI0qOqd2yosJoH7Vzw==\n-  dependencies:\n-    testcheck \"^1.0.0-rc\"\n-\n jed@1.1.1:\n   version \"1.1.1\"\n   resolved \"https:\/\/registry.yarnpkg.com\/jed\/-\/jed-1.1.1.tgz#7a549bbd9ffe1585b0cd0a191e203055bee574b4\"\n@@ -10469,29 +10462,6 @@ jest-haste-map@^29.4.1:\n   optionalDependencies:\n     fsevents \"^2.3.2\"\n \n-jest-jasmine2@^29.4.1:\n-  version \"29.4.1\"\n-  resolved \"https:\/\/registry.yarnpkg.com\/jest-jasmine2\/-\/jest-jasmine2-29.4.1.tgz#67fbf2a729889ea390a8aa70ba3582e9d6c32603\"\n-  integrity sha512-fuwfsso6Kc7eGjNCWfWQgW4lcJwdkbfnVx6KQSw2a6a2VBOcxUSn\/q8lAwblvJc6hYB7XhGfSVLDw2mvjYDZ0A==\n-  dependencies:\n-    \"@jest\/environment\" \"^29.4.1\"\n-    \"@jest\/expect\" \"^29.4.1\"\n-    \"@jest\/source-map\" \"^29.2.0\"\n-    \"@jest\/test-result\" \"^29.4.1\"\n-    \"@jest\/types\" \"^29.4.1\"\n-    \"@types\/node\" \"*\"\n-    chalk \"^4.0.0\"\n-    co \"^4.6.0\"\n-    is-generator-fn \"^2.0.0\"\n-    jest-each \"^29.4.1\"\n-    jest-matcher-utils \"^29.4.1\"\n-    jest-message-util \"^29.4.1\"\n-    jest-runtime \"^29.4.1\"\n-    jest-snapshot \"^29.4.1\"\n-    jest-util \"^29.4.1\"\n-    p-limit \"^3.1.0\"\n-    pretty-format \"^29.4.1\"\n-\n jest-leak-detector@^29.4.1:\n   version \"29.4.1\"\n   resolved \"https:\/\/registry.yarnpkg.com\/jest-leak-detector\/-\/jest-leak-detector-29.4.1.tgz#632186c546e084da2b490b7496fee1a1c9929637\"\n@@ -16039,11 +16009,6 @@ test-exclude@^6.0.0:\n     glob \"^7.1.4\"\n     minimatch \"^3.0.4\"\n \n-testcheck@^1.0.0-rc:\n-  version \"1.0.0-rc.2\"\n-  resolved \"https:\/\/registry.yarnpkg.com\/testcheck\/-\/testcheck-1.0.0-rc.2.tgz#11356a25b84575efe0b0857451e85b5fa74ee4e4\"\n-  integrity sha512-lY0PM4ypOuf3WenJkx\/C8+LeLPucHnnRAOtHRQkm8K6pG170tYw0xmxyVjrejJ2bpHWHn5EUkoC+qhnhFAUcvg==\n-\n text-table@^0.2.0:\n   version \"0.2.0\"\n   resolved \"https:\/\/registry.yarnpkg.com\/text-table\/-\/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4\"\n","commit":{"authorEmail":"ymqyit@gmail.com","shortRevision":"71cace4d32","revision":"71cace4d3267e4527964db51ccaf5eab7234f37f","authoredAt":"2023-02-11T02:39:14+08:00","authorName":"Ming Ye","subject":"Migrate testRunner from jasmine2 to jest-circus (#26144)"},"body":"## Summary\r\n\r\nIn jest v27, jest-circus as default test runner\r\n(https:\/\/github.com\/facebook\/jest\/pull\/10686)\r\n\r\n## How did you test this change?\r\n\r\nci green","files":[{"status":"M","path":".eslintrc.js"},{"status":"M","path":"package.json"},{"status":"M","path":"packages\/react-client\/src\/__tests__\/ReactFlight-test.js"},{"status":"M","path":"packages\/react-devtools-extensions\/flow-typed\/jest.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/TimelineProfiler-test.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/bridge-test.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/inspectedElement-test.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/legacy\/inspectElement-test.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/preprocessData-test.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/profilerStore-test.js"},{"status":"M","path":"packages\/react-devtools-shared\/src\/__tests__\/setupTests.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/InvalidEventListeners-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMComponent-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMConsoleErrorReporting-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMFiber-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMFizzShellHydration-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMInput-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactDOMTextarea-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactErrorBoundaries-test.internal.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactLegacyErrorBoundaries-test.internal.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactLegacyRootWarnings-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactTestUtils-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactTestUtilsAct-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactUpdates-test.js"},{"status":"M","path":"packages\/react-dom\/src\/__tests__\/utils\/ReactDOMServerIntegrationTestUtils.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/DebugTracing-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactHooks-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactIncrementalErrorHandling-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactIsomorphicAct-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactLazy-test.internal.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactThenable-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/useMutableSource-test.internal.js"},{"status":"M","path":"packages\/react\/src\/__tests__\/ReactClassEquivalence-test.js"},{"status":"M","path":"packages\/react\/src\/__tests__\/ReactStrictMode-test.js"},{"status":"M","path":"packages\/scheduler\/src\/__tests__\/SchedulerProfiling-test.js"},{"status":"M","path":"packages\/shared\/__tests__\/describeComponentFrame-test.js"},{"status":"M","path":"scripts\/jest\/config.base.js"},{"status":"M","path":"scripts\/jest\/setupTests.js"},{"status":"A","path":"scripts\/jest\/spec-equivalence-reporter\/equivalenceReporter.js"},{"status":"M","path":"scripts\/jest\/spec-equivalence-reporter\/setupTests.js"},{"status":"M","path":"scripts\/jest\/typescript\/jest.d.ts"},{"status":"M","path":"yarn.lock"}]}</article></body></html>

dillon1000/react

Files changed