Remove console-testing-library

package.json

@@ -53,9 +53,6 @@
     "ts-node": "^10.9.2",
     "typescript": "^5.5.4"
   },
-  "resolutions": {
-    "jest-snapshot": "29.3.1"
-  },
   "scripts": {
     "build": "yarn build:packages",
     "test": "yarn test:packages",

packages/toolkit/package.json

@@ -70,7 +70,6 @@
     "@typescript-eslint/eslint-plugin": "^6",
     "@typescript-eslint/parser": "^6",
     "axios": "^0.19.2",
-    "console-testing-library": "patch:console-testing-library@npm%3A0.6.1#~/.yarn/patches/console-testing-library-npm-0.6.1-4d9957d402.patch",
     "esbuild": "^0.23.0",
     "esbuild-extra": "^0.4.0",
     "eslint": "^7.25.0",

packages/toolkit/src/entities/tests/utils.spec.ts

@@ -1,66 +1,71 @@
-import { vi } from 'vitest'
+import { noop } from '@internal/listenerMiddleware/utils'
 import { AClockworkOrange } from './fixtures/book'
 
 describe('Entity utils', () => {
   describe(`selectIdValue()`, () => {
-    const OLD_ENV = process.env
+    const consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(noop)
 
     beforeEach(() => {
       vi.resetModules() // this is important - it clears the cache
-      process.env = { ...OLD_ENV, NODE_ENV: 'development' }
+      vi.stubEnv('NODE_ENV', 'development')
     })
 
     afterEach(() => {
-      process.env = OLD_ENV
-      vi.resetAllMocks()
+      consoleWarnSpy.mockClear()
+      vi.unstubAllEnvs()
+    })
+
+    afterAll(() => {
+      consoleWarnSpy.mockRestore()
     })
 
     it('should not warn when key does exist', async () => {
       const { selectIdValue } = await import('../utils')
-      const spy = vi.spyOn(console, 'warn')
 
       selectIdValue(AClockworkOrange, (book: any) => book.id)
-      expect(spy).not.toHaveBeenCalled()
+      expect(consoleWarnSpy).not.toHaveBeenCalled()
     })
 
     it('should warn when key does not exist in dev mode', async () => {
       const { selectIdValue } = await import('../utils')
-      const spy = vi.spyOn(console, 'warn')
+
+      expect(process.env.NODE_ENV).toBe('development')
 
       selectIdValue(AClockworkOrange, (book: any) => book.foo)
 
-      expect(spy).toHaveBeenCalled()
+      expect(consoleWarnSpy).toHaveBeenCalledOnce()
     })
 
     it('should warn when key is undefined in dev mode', async () => {
       const { selectIdValue } = await import('../utils')
-      const spy = vi.spyOn(console, 'warn')
+
+      expect(process.env.NODE_ENV).toBe('development')
 
       const undefinedAClockworkOrange = { ...AClockworkOrange, id: undefined }
       selectIdValue(undefinedAClockworkOrange, (book: any) => book.id)
 
-      expect(spy).toHaveBeenCalled()
+      expect(consoleWarnSpy).toHaveBeenCalledOnce()
     })
 
     it('should not warn when key does not exist in prod mode', async () => {
-      process.env.NODE_ENV = 'production'
+      vi.stubEnv('NODE_ENV', 'production')
+
       const { selectIdValue } = await import('../utils')
-      const spy = vi.spyOn(console, 'warn')
 
       selectIdValue(AClockworkOrange, (book: any) => book.foo)
 
-      expect(spy).not.toHaveBeenCalled()
+      expect(consoleWarnSpy).not.toHaveBeenCalled()
     })
 
     it('should not warn when key is undefined in prod mode', async () => {
-      process.env.NODE_ENV = 'production'
+      vi.stubEnv('NODE_ENV', 'production')
+
       const { selectIdValue } = await import('../utils')
-      const spy = vi.spyOn(console, 'warn')
 
       const undefinedAClockworkOrange = { ...AClockworkOrange, id: undefined }
       selectIdValue(undefinedAClockworkOrange, (book: any) => book.id)
 
-      expect(spy).not.toHaveBeenCalled()
+      expect(consoleWarnSpy).not.toHaveBeenCalled()
     })
   })
 })

packages/toolkit/src/listenerMiddleware/tests/effectScenarios.test.ts

@@ -1,16 +1,13 @@
+import { noop } from '@internal/listenerMiddleware/utils'
+import type { PayloadAction } from '@reduxjs/toolkit'
 import {
   configureStore,
   createAction,
+  createListenerMiddleware,
   createSlice,
   isAnyOf,
+  TaskAbortError,
 } from '@reduxjs/toolkit'
-import { vi } from 'vitest'
-
-import type { PayloadAction } from '@reduxjs/toolkit'
-
-import { createListenerMiddleware, TaskAbortError } from '../index'
-
-import type { TypedAddListener } from '../index'
 
 describe('Saga-style Effects Scenarios', () => {
   interface CounterState {
@@ -57,10 +54,7 @@ describe('Saga-style Effects Scenarios', () => {
     return new Promise((resolve) => setTimeout(resolve, ms))
   }
 
-  beforeAll(() => {
-    const noop = () => {}
-    vi.spyOn(console, 'error').mockImplementation(noop)
-  })
+  const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(noop)
 
   beforeEach(() => {
     listenerMiddleware = createListenerMiddleware<CounterState>()
@@ -72,6 +66,14 @@ describe('Saga-style Effects Scenarios', () => {
     })
   })
 
+  afterEach(() => {
+    consoleErrorSpy.mockClear()
+  })
+
+  afterAll(() => {
+    consoleErrorSpy.mockRestore()
+  })
+
   test('throttle', async () => {
     // Ignore incoming actions for a given period of time while processing a task.
     // Ref: https://redux-saga.js.org/docs/api#throttlems-pattern-saga-args

packages/toolkit/src/listenerMiddleware/tests/listenerMiddleware.test.ts

@@ -1,3 +1,21 @@
+import {
+  listenerCancelled,
+  listenerCompleted,
+} from '@internal/listenerMiddleware/exceptions'
+import type {
+  AbortSignalWithReason,
+  AddListenerOverloads,
+} from '@internal/listenerMiddleware/types'
+import { noop } from '@internal/listenerMiddleware/utils'
+import type {
+  Action,
+  ListenerEffect,
+  ListenerEffectAPI,
+  PayloadAction,
+  TypedRemoveListener,
+  TypedStartListening,
+  UnknownAction,
+} from '@reduxjs/toolkit'
 import {
   TaskAbortError,
   addListener,
@@ -10,28 +28,6 @@ import {
   removeListener,
 } from '@reduxjs/toolkit'
 import type { Mock } from 'vitest'
-import { vi } from 'vitest'
-
-import type {
-  Action,
-  ListenerEffect,
-  ListenerEffectAPI,
-  PayloadAction,
-  TypedAddListener,
-  TypedRemoveListener,
-  TypedStartListening,
-  UnknownAction,
-} from '@reduxjs/toolkit'
-
-import {
-  listenerCancelled,
-  listenerCompleted,
-} from '@internal/listenerMiddleware/exceptions'
-
-import type {
-  AbortSignalWithReason,
-  AddListenerOverloads,
-} from '@internal/listenerMiddleware/types'
 
 const middlewareApi = {
   getState: expect.any(Function),
@@ -51,8 +47,6 @@ const middlewareApi = {
   throwIfCancelled: expect.any(Function),
 }
 
-const noop = () => {}
-
 // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
 export interface Deferred<T> extends Promise<T> {
   resolve(value?: T | PromiseLike<T>): void
@@ -119,9 +113,7 @@ describe('createListenerMiddleware', () => {
   const testAction2 = createAction<string>('testAction2')
   const testAction3 = createAction<string>('testAction3')
 
-  beforeAll(() => {
-    vi.spyOn(console, 'error').mockImplementation(noop)
-  })
+  const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(noop)
 
   beforeEach(() => {
     listenerMiddleware = createListenerMiddleware()
@@ -136,6 +128,14 @@ describe('createListenerMiddleware', () => {
     })
   })
 
+  afterEach(() => {
+    consoleErrorSpy.mockClear()
+  })
+
+  afterAll(() => {
+    consoleErrorSpy.mockRestore()
+  })
+
   describe('Middleware setup', () => {
     test('Allows passing an extra argument on middleware creation', () => {
       const originalExtra = 42

packages/toolkit/src/query/tests/buildHooks.test.tsx

@@ -1,3 +1,4 @@
+import { noop } from '@internal/listenerMiddleware/utils'
 import type { SubscriptionOptions } from '@internal/query/core/apiState'
 import type { SubscriptionSelectors } from '@internal/query/core/buildMiddleware/types'
 import { server } from '@internal/query/tests/mocks/server'
@@ -32,7 +33,6 @@ import {
 import userEvent from '@testing-library/user-event'
 import { HttpResponse, http } from 'msw'
 import { useEffect, useState } from 'react'
-import type { MockInstance } from 'vitest'
 
 // Just setup a temporary in-memory counter for tests that `getIncrementedAmount`.
 // This can be used to test how many renders happen due to data changes or
@@ -967,14 +967,16 @@ describe('hooks tests', () => {
     })
 
     describe('Hook middleware requirements', () => {
-      let mock: MockInstance
+      const consoleErrorSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(noop)
 
-      beforeEach(() => {
-        mock = vi.spyOn(console, 'error').mockImplementation(() => {})
+      afterEach(() => {
+        consoleErrorSpy.mockClear()
       })
 
-      afterEach(() => {
-        mock.mockReset()
+      afterAll(() => {
+        consoleErrorSpy.mockRestore()
       })
 
       test('Throws error if middleware is not added to the store', async () => {