Use @jest/globals instead of global injection to test upcoming jest-mock-extended release

apps/web/app/api/auth.test.ts

@@ -1,6 +1,7 @@
 /** @jest-environment node */
 import { Scope } from '@gw2me/client';
 import { verifyScopes } from './auth';
+import { describe, expect, it } from '@jest/globals';
 
 describe('API authorization', () => {
   describe('verifyScopes', () => {

apps/web/app/api/token/token.test.ts

@@ -5,6 +5,7 @@ import { dbMock } from '@/lib/db.mock';
 import { Account, Application, Authorization } from '@gw2me/database';
 import { expiresAt } from '@/lib/date';
 import { Scope } from '@gw2me/client';
+import { describe, expect, it } from '@jest/globals';
 
 type MockAuthorization = Authorization & { application: Pick<Application, 'type' | 'clientSecret'>, accounts: Pick<Account, 'id'>[] };
 
@@ -25,7 +26,7 @@ const mockAuthorization: MockAuthorization = {
     clientSecret: 'client-secret',
     type: 'Public'
   },
-  accounts: []
+  accounts: [],
 };
 
 describe('/api/token', () => {

apps/web/jest.config.ts

@@ -17,11 +17,6 @@ const config: Config = {
 
   testEnvironment: 'jest-environment-jsdom',
 
-  // required for `jest-mock-extended`
-  // See https://github.com/marchaos/jest-mock-extended/issues/116
-  // TODO: replace with @jest/globals once that issue is fixed
-  injectGlobals: true,
-
   moduleNameMapper: {
     '^@/components/(.*)$': '<rootDir>/components/$1',
     '^@/lib/(.*)$': '<rootDir>/lib/$1',

apps/web/lib/db.mock.ts

@@ -1,18 +1,19 @@
 import { PrismaClient } from '@gw2me/database';
-import { mockDeep, mockReset, DeepMockProxy } from 'jest-mock-extended';
+import { mockDeep, mockReset } from 'jest-mock-extended';
+import { beforeEach, jest } from '@jest/globals';
 
-import { db } from './db';
+export const dbMock = mockDeep<PrismaClient>();
 
 jest.mock('./db', () => ({
   __esModule: true,
-  db: mockDeep<PrismaClient>(),
+  db: dbMock,
 }));
 
 beforeEach(() => {
   mockReset(dbMock);
   dbMock.$transaction.mockImplementation(
+    // @ts-expect-error any
     (arrayOrCallback) => typeof arrayOrCallback === 'function' ? arrayOrCallback(dbMock) : Promise.all(arrayOrCallback)
   );
 });
 
-export const dbMock = db as unknown as DeepMockProxy<PrismaClient>;

apps/web/lib/oauth/to-be-oauth2-error.jest.ts

@@ -1,5 +1,6 @@
 import type { MatcherFunction } from 'expect';
 import { OAuth2Error, OAuth2ErrorCode } from './error';
+import { expect } from '@jest/globals';
 
 const toBeOAuth2Error: MatcherFunction<[code?: OAuth2ErrorCode, description?: string]> = function (actual, code, description) {
   if(!(actual instanceof OAuth2Error)) {
@@ -32,16 +33,13 @@ const toThrowOAuth2Error: MatcherFunction<[code?: OAuth2ErrorCode, description?:
 
 expect.extend({ toBeOAuth2Error, toThrowOAuth2Error });
 
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace jest {
-    interface AsymmetricMatchers {
-      toBeOAuth2Error(code?: OAuth2ErrorCode, description?: string): void;
-      toThrowOAuth2Error(code?: OAuth2ErrorCode, description?: string): void;
-    }
-    interface Matchers<R> {
-      toBeOAuth2Error(code?: OAuth2ErrorCode, description?: string): R;
-      toThrowOAuth2Error(code?: OAuth2ErrorCode, description?: string): R;
-    }
+declare module 'expect' {
+  interface AsymmetricMatchers {
+    toBeOAuth2Error(code?: OAuth2ErrorCode, description?: string): void;
+    toThrowOAuth2Error(code?: OAuth2ErrorCode, description?: string): void;
+  }
+  interface Matchers<R> {
+    toBeOAuth2Error(code?: OAuth2ErrorCode, description?: string): R;
+    toThrowOAuth2Error(code?: OAuth2ErrorCode, description?: string): R;
   }
 }

apps/web/package.json

@@ -31,17 +31,17 @@
     "@gw2treasures/eslint-config": "0.0.4",
     "@gw2treasures/eslint-plugin-nextjs": "0.0.2",
     "@gw2treasures/tsconfig": "0.0.1",
+    "@jest/globals": "29.7.0",
     "@simplewebauthn/types": "10.0.0",
     "@testing-library/jest-dom": "6.5.0",
     "@testing-library/react": "16.0.1",
-    "@types/jest": "29.5.12",
     "@types/node": "20.16.5",
     "@types/react": "18.3.5",
     "eslint": "8.57.0",
     "eslint-config-next": "14.2.8",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
-    "jest-mock-extended": "3.0.7",
+    "jest-mock-extended": "https://github.com/macko911/jest-mock-extended.git#stop-using-jest-globals",
     "ts-node": "10.9.2",
     "typescript": "5.5.4"
   }