Replace @fetch-mock/jest with plain fetch-mock

package.json

@@ -115,7 +115,6 @@
     "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
     "@eslint/js": "^9.34.0",
-    "@fetch-mock/jest": "^0.2.16",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.8.0",
     "@testing-library/react": "^16.3.0",
@@ -158,6 +157,7 @@
     "eslint-plugin-testing-library": "^7.6.6",
     "espree": "^10.4.0",
     "fake-indexeddb": "^6.1.0",
+    "fetch-mock": "^12.5.3",
     "file-loader": "^6.2.0",
     "glob": "^11.0.3",
     "globals": "^16.3.0",
@@ -207,7 +207,7 @@
       "tsx"
     ],
     "transformIgnorePatterns": [
-      "/node_modules/(?!(query-string|decode-uri-component|iongraph-web|split-on-first|filter-obj|@fetch-mock/jest|fetch-mock)/)"
+      "/node_modules/(?!(query-string|decode-uri-component|iongraph-web|split-on-first|filter-obj|fetch-mock)/)"
     ],
     "moduleNameMapper": {
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|ftl)$": "<rootDir>/src/test/fixtures/mocks/file-mock.ts",

src/test/components/AppLocalizationProvider.test.tsx

@@ -161,17 +161,23 @@ describe('AppLocalizationProvider', () => {
 
     expect(await screen.findByText(translatedText('de'))).toBeInTheDocument();
     expect(document.documentElement).toHaveAttribute('lang', 'de');
-    expect(window.fetch).toHaveFetched('/locales/de/app.ftl', {
-      // @ts-expect-error fetch-mock's TypeScript types for toHaveFetched don't know about `credentials`, not sure why
-      credentials: 'include',
-      mode: 'no-cors',
-    });
-    expect(window.fetch).toHaveFetched('/locales/en-US/app.ftl', {
-      // @ts-expect-error fetch-mock's TypeScript types for toHaveFetched don't know about `credentials`, not sure why
-      credentials: 'include',
-      mode: 'no-cors',
-    });
-    expect(window.fetch).toHaveFetchedTimes(2);
+    expect(
+      window.fetchMock.callHistory.lastCall('/locales/de/app.ftl')?.options
+    ).toEqual(
+      expect.objectContaining({
+        credentials: 'include',
+        mode: 'no-cors',
+      })
+    );
+    expect(
+      window.fetchMock.callHistory.lastCall('/locales/en-US/app.ftl')?.options
+    ).toEqual(
+      expect.objectContaining({
+        credentials: 'include',
+        mode: 'no-cors',
+      })
+    );
+    expect(window.fetchMock.callHistory.callLogs.length).toBe(2);
   });
 
   it('falls back properly on en-US if the primary locale lacks a string', async () => {
@@ -193,16 +199,22 @@ describe('AppLocalizationProvider', () => {
       await screen.findByText(translatedText('en-US'))
     ).toBeInTheDocument();
     expect(document.documentElement).toHaveAttribute('lang', 'de');
-    expect(window.fetch).toHaveFetched('/locales/de/app.ftl', {
-      // @ts-expect-error fetch-mock's TypeScript types for toHaveFetched don't know about `credentials`, not sure why
-      credentials: 'include',
-      mode: 'no-cors',
-    });
-    expect(window.fetch).toHaveFetched('/locales/en-US/app.ftl', {
-      // @ts-expect-error fetch-mock's TypeScript types for toHaveFetched don't know about `credentials`, not sure why
-      credentials: 'include',
-      mode: 'no-cors',
-    });
-    expect(window.fetch).toHaveFetchedTimes(2);
+    expect(
+      window.fetchMock.callHistory.lastCall('/locales/de/app.ftl')?.options
+    ).toEqual(
+      expect.objectContaining({
+        credentials: 'include',
+        mode: 'no-cors',
+      })
+    );
+    expect(
+      window.fetchMock.callHistory.lastCall('/locales/en-US/app.ftl')?.options
+    ).toEqual(
+      expect.objectContaining({
+        credentials: 'include',
+        mode: 'no-cors',
+      })
+    );
+    expect(window.fetchMock.callHistory.callLogs.length).toBe(2);
   });
 });

src/test/setup.ts

@@ -9,7 +9,7 @@ import '@testing-library/jest-dom';
 import 'jest-extended';
 
 // This installs jest matchers as a side effect as well.
-import fetchMock from '@fetch-mock/jest';
+import fetchMock from 'fetch-mock';
 import crypto from 'crypto';
 
 import { NodeWorker, __shutdownWorkers } from './fixtures/node-worker';
@@ -48,7 +48,8 @@ afterEach(() => {
   jest.useRealTimers();
 
   // Do the same with fetch mocks
-  fetchMock.mockReset();
+  fetchMock.removeRoutes();
+  fetchMock.clearHistory();
 });
 
 expect.extend({

src/test/store/receive-profile.test.ts

@@ -813,8 +813,11 @@ describe('actions/receive-profile', function () {
         expect.any(String)
       );
 
-      expect(window.fetch).toHaveFetched(
-        'https://symbolication.services.mozilla.com/symbolicate/v5',
+      expect(
+        window.fetchMock.callHistory.lastCall(
+          'https://symbolication.services.mozilla.com/symbolicate/v5'
+        )?.options
+      ).toEqual(
         expect.objectContaining({
           body: expect.stringMatching(/memoryMap.*firefox/),
         })
@@ -828,8 +831,11 @@ describe('actions/receive-profile', function () {
         await createBrowserConnection('Firefox/123.0');
       await dispatch(retrieveProfileFromBrowser(browserConnectionStatus));
 
-      expect(window.fetch).toHaveFetched(
-        'https://symbolication.services.mozilla.com/symbolicate/v5',
+      expect(
+        window.fetchMock.callHistory.lastCall(
+          'https://symbolication.services.mozilla.com/symbolicate/v5'
+        )?.options
+      ).toEqual(
         expect.objectContaining({
           body: expect.stringMatching(/memoryMap.*firefox/),
         })
@@ -917,8 +923,11 @@ describe('actions/receive-profile', function () {
       const store = blankStore();
       await store.dispatch(retrieveProfileFromStore('FAKEHASH'));
 
-      expect(window.fetch).toHaveLastFetched(
-        'https://symbolication.services.mozilla.com/symbolicate/v5',
+      expect(
+        window.fetchMock.callHistory.lastCall(
+          'https://symbolication.services.mozilla.com/symbolicate/v5'
+        )?.options
+      ).toEqual(
         expect.objectContaining({
           body: expect.stringMatching(/memoryMap.*libxul/),
         })
@@ -1414,8 +1423,11 @@ describe('actions/receive-profile', function () {
         payload: profile,
       });
 
-      expect(window.fetch).toHaveFetched(
-        'https://symbolication.services.mozilla.com/symbolicate/v5',
+      expect(
+        window.fetchMock.callHistory.lastCall(
+          'https://symbolication.services.mozilla.com/symbolicate/v5'
+        )?.options
+      ).toEqual(
         expect.objectContaining({
           body: expect.stringMatching(/memoryMap.*firefox/),
         })

src/test/unit/profile-store.test.ts

@@ -228,6 +228,8 @@ describe('profile deletion', () => {
       profileToken: PROFILE_TOKEN,
       jwtToken: JWT_TOKEN,
     });
-    expect(window.fetch).toHaveFetched(endpointUrl, expect.anything());
+    expect(
+      window.fetchMock.callHistory.lastCall(endpointUrl)
+    ).not.toBeUndefined();
   });
 });

src/test/unit/shorten-url.test.ts

@@ -65,9 +65,11 @@ describe('shortenUrl', () => {
     const shortUrl = await shortenUrl(longUrl);
 
     expect(shortUrl).toBe(expectedShortUrl);
-    // @ts-expect-error TODO: fetch-mock's TypeScript types for toHaveFetched do
-    //                  not recognize the body property, not sure why
-    expect(window.fetch).toHaveFetched({ body: { longUrl } });
+    expect(window.fetchMock.callHistory.lastCall()?.options).toEqual(
+      expect.objectContaining({
+        body: JSON.stringify({ longUrl }),
+      })
+    );
   });
 
   it('changes the requested url if is not the main URL', async () => {
@@ -84,9 +86,11 @@ describe('shortenUrl', () => {
 
     const shortUrl = await shortenUrl(longUrl);
     expect(shortUrl).toBe(expectedShortUrl);
-    // @ts-expect-error TODO: fetch-mock's TypeScript types for toHaveFetched do
-    //                  not recognize the body property, not sure why
-    expect(window.fetch).toHaveFetched({ body: { longUrl: expectedLongUrl } });
+    expect(window.fetchMock.callHistory.lastCall()?.options).toEqual(
+      expect.objectContaining({
+        body: JSON.stringify({ longUrl: expectedLongUrl }),
+      })
+    );
   });
 });
 
@@ -110,9 +114,11 @@ describe('expandUrl', () => {
 
     const longUrl = await expandUrl(shortUrl);
     expect(longUrl).toBe(returnedLongUrl);
-    // @ts-expect-error TODO: fetch-mock's TypeScript types for toHaveFetched do
-    //                  not recognize the body property, not sure why
-    expect(window.fetch).toHaveFetched({ body: { shortUrl } });
+    expect(window.fetchMock.callHistory.lastCall()?.options).toEqual(
+      expect.objectContaining({
+        body: JSON.stringify({ shortUrl }),
+      })
+    );
   });
 
   it('forwards errors', async () => {

src/types/globals/Window.d.ts

@@ -4,7 +4,7 @@
 
 import type { SymbolTableAsTuple } from '../../profile-logic/symbol-store-db';
 import type { GoogleAnalytics } from '../../utils/analytics';
-import type FetchMockJest from '@fetch-mock/jest';
+import type FetchMock from 'fetch-mock';
 
 declare global {
   // Because this type isn't an existing Global type, but still it's useful to
@@ -36,6 +36,6 @@ declare global {
     persistTooltips?: boolean;
 
     // Test-only
-    fetchMock: typeof FetchMockJest;
+    fetchMock: typeof FetchMock;
   }
 }

yarn.lock

@@ -1279,13 +1279,6 @@
     "@eslint/core" "^0.15.2"
     levn "^0.4.1"
 
-"@fetch-mock/jest@^0.2.16":
-  version "0.2.16"
-  resolved "https://registry.yarnpkg.com/@fetch-mock/jest/-/jest-0.2.16.tgz#8c556edbb539101c156e2c115a95a4e33f03ce44"
-  integrity sha512-i/fuyWSxR5b5FowhmqJL4SPt7GuV2j7NnM/KnPK7fwucEUNuVGTrUXam8I4lXKNiBSYYpHsyExem5n/WmQMwjA==
-  dependencies:
-    fetch-mock "^12.5.3"
-
 "@firefox-devtools/react-contextmenu@^5.2.3":
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/@firefox-devtools/react-contextmenu/-/react-contextmenu-5.2.3.tgz#84fe061597a896ab66917914b8b975c40bd730e9"
@@ -11324,7 +11317,16 @@ string-length@^4.0.2:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -11446,7 +11448,7 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11460,6 +11462,13 @@ strip-ansi@^0.3.0:
   dependencies:
     ansi-regex "^0.2.1"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -12975,7 +12984,16 @@ workbox-window@7.3.0, workbox-window@^7.3.0:
     "@types/trusted-types" "^2.0.2"
     workbox-core "7.3.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==