Use @fetch-mock/jest

And remove fetch overload from classes.
wallabag · Oct 25, 2024 · 61071d1 · 61071d1
1 parent 6167624
commit 61071d1
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 70 deletions.
diff --git a/functions/classes/ExtensionHandler.js b/functions/classes/ExtensionHandler.js
@@ -3,8 +3,8 @@ import parse from 'diffparser'
 import { Handler } from './Handler'
 
 export class ExtensionHandler extends Handler {
-  constructor(githubToken, namespace, fetch = null) {
-    super(githubToken, fetch)
+  constructor(githubToken, namespace) {
+    super(githubToken)
 
     this.namespace = namespace
   }

diff --git a/functions/classes/Handler.js b/functions/classes/Handler.js
@@ -1,17 +1,11 @@
 import { Octokit } from '@octokit/rest'
 
 export class Handler {
-  constructor(githubToken, fetch = null) {
+  constructor(githubToken) {
     const options = {
       auth: githubToken,
     }
 
-    if (fetch) {
-      options.request = {
-        fetch,
-      }
-    }
-
     this.githubClient = new Octokit(options)
   }
 

diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "@babel/core": "^7.25.9",
     "@babel/eslint-parser": "^7.25.9",
     "@babel/preset-env": "^7.25.9",
+    "@fetch-mock/jest": "^0.2.0",
     "babel-loader": "^9.2.1",
     "babel-plugin-source-map-support": "^2.2.0",
     "eslint": "^8.57.1",
@@ -22,7 +23,6 @@
     "eslint-plugin-jsx-a11y": "^6.10.1",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.37.2",
-    "fetch-mock": "^12.0.0",
     "jest": "^29.7.0",
     "nock": "^13.5.4",
     "node-fetch": "2",

diff --git a/tests/extension.spec.js b/tests/extension.spec.js
@@ -1,5 +1,5 @@
 import nock from 'nock'
-import fetchMock from 'fetch-mock'
+import fetchMock from '@fetch-mock/jest'
 import { ExtensionHandler } from '../functions/classes/ExtensionHandler'
 import { handler } from '../functions/extension'
 
@@ -124,12 +124,7 @@ describe('Validating extension', () => {
   })
 
   test('file extension is not txt', async () => {
-    const mock = fetchMock
-      .sandbox()
-      .mock(
-        'https://api.github.com/repos/foo/bar/statuses/ee55a1223ce20c3e7cb776349cb7f8efb7b88511',
-        200
-      )
+    fetchMock.mockGlobal().route('*', 200)
 
     nock('http://git.hub').get('/diff').replyWithFile(200, `${__dirname}/fixtures/no_txt.diff`)
 
@@ -151,7 +146,7 @@ describe('Validating extension', () => {
       },
     }
 
-    const extension = new ExtensionHandler('GH_TOKEN', 'Test config', mock)
+    const extension = new ExtensionHandler('GH_TOKEN', 'Test config')
     await extension.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)
@@ -160,21 +155,20 @@ describe('Validating extension', () => {
       statusCode: 204,
     })
 
-    const lastOptions = JSON.parse(mock.lastOptions().body)
-    expect(lastOptions).toStrictEqual({
-      context: 'Test config - File extension check',
-      description: 'Fail: "theatlantic.com" has not a txt extension',
-      state: 'failure',
-    })
+    expect(fetch).toHaveFetched(
+      'https://api.github.com/repos/foo/bar/statuses/ee55a1223ce20c3e7cb776349cb7f8efb7b88511',
+      {
+        body: {
+          context: 'Test config - File extension check',
+          description: 'Fail: "theatlantic.com" has not a txt extension',
+          state: 'failure',
+        },
+      }
+    )
   })
 
   test('at least one file extension is not txt', async () => {
-    const mock = fetchMock
-      .sandbox()
-      .mock(
-        'https://api.github.com/repos/foo/bar/statuses/ee55a1223ce20c3e7cb776349cb7f8efb7b88511',
-        200
-      )
+    fetchMock.mockGlobal().route('*', 200)
 
     nock('http://git.hub')
       .get('/diff')
@@ -198,7 +192,7 @@ describe('Validating extension', () => {
       },
     }
 
-    const extension = new ExtensionHandler('GH_TOKEN', 'Test config', mock)
+    const extension = new ExtensionHandler('GH_TOKEN', 'Test config')
     await extension.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)
@@ -207,21 +201,20 @@ describe('Validating extension', () => {
       statusCode: 204,
     })
 
-    const lastOptions = JSON.parse(mock.lastOptions().body)
-    expect(lastOptions).toStrictEqual({
-      context: 'Test config - File extension check',
-      description: 'Fail: "wow.gamona.de" has not a txt extension',
-      state: 'failure',
-    })
+    expect(fetch).toHaveFetched(
+      'https://api.github.com/repos/foo/bar/statuses/ee55a1223ce20c3e7cb776349cb7f8efb7b88511',
+      {
+        body: {
+          context: 'Test config - File extension check',
+          description: 'Fail: "wow.gamona.de" has not a txt extension',
+          state: 'failure',
+        },
+      }
+    )
   })
 
   test('one deleted file', async () => {
-    const mock = fetchMock
-      .sandbox()
-      .mock(
-        'https://api.github.com/repos/foo/bar/statuses/ee55a1223ce20c3e7cb776349cb7f8efb7b88511',
-        200
-      )
+    fetchMock.mockGlobal().route('*', 200)
 
     nock('http://git.hub')
       .get('/diff')
@@ -245,7 +238,7 @@ describe('Validating extension', () => {
       },
     }
 
-    const extension = new ExtensionHandler('GH_TOKEN', 'Test config', mock)
+    const extension = new ExtensionHandler('GH_TOKEN', 'Test config')
     await extension.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)
@@ -254,21 +247,20 @@ describe('Validating extension', () => {
       statusCode: 204,
     })
 
-    const lastOptions = JSON.parse(mock.lastOptions().body)
-    expect(lastOptions).toStrictEqual({
-      context: 'Test config - File extension check',
-      description: 'passed',
-      state: 'success',
-    })
+    expect(fetch).toHaveFetched(
+      'https://api.github.com/repos/foo/bar/statuses/ee55a1223ce20c3e7cb776349cb7f8efb7b88511',
+      {
+        body: {
+          context: 'Test config - File extension check',
+          description: 'passed',
+          state: 'success',
+        },
+      }
+    )
   })
 
   test('file extension is ok', async () => {
-    const mock = fetchMock
-      .sandbox()
-      .mock(
-        'https://api.github.com/repos/foo/bar/statuses/ee55a1223ce20c3e7cb776349cb7f8efb7b88511',
-        200
-      )
+    fetchMock.mockGlobal().route('*', 200)
 
     nock('http://git.hub').get('/diff').replyWithFile(200, `${__dirname}/fixtures/with_a.txt.diff`)
 
@@ -290,7 +282,7 @@ describe('Validating extension', () => {
       },
     }
 
-    const extension = new ExtensionHandler('GH_TOKEN', 'Test config', mock)
+    const extension = new ExtensionHandler('GH_TOKEN', 'Test config')
     await extension.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)
@@ -299,11 +291,15 @@ describe('Validating extension', () => {
       statusCode: 204,
     })
 
-    const lastOptions = JSON.parse(mock.lastOptions().body)
-    expect(lastOptions).toStrictEqual({
-      context: 'Test config - File extension check',
-      description: 'passed',
-      state: 'success',
-    })
+    expect(fetch).toHaveFetched(
+      'https://api.github.com/repos/foo/bar/statuses/ee55a1223ce20c3e7cb776349cb7f8efb7b88511',
+      {
+        body: {
+          context: 'Test config - File extension check',
+          description: 'passed',
+          state: 'success',
+        },
+      }
+    )
   })
 })
diff --git a/tests/weblate.spec.js b/tests/weblate.spec.js
@@ -1,4 +1,4 @@
-import fetchMock from 'fetch-mock'
+import fetchMock from '@fetch-mock/jest'
 import { WeblateHandler } from '../functions/classes/WeblateHandler'
 import { handler } from '../functions/weblate'
 
@@ -123,9 +123,7 @@ describe('Apply label', () => {
   })
 
   test('PR is ok', async () => {
-    const mock = fetchMock
-      .sandbox()
-      .mock('https://api.github.com/repos/foo/bar/issues/42/labels', 200)
+    fetchMock.mockGlobal().route('*', 200)
 
     const callback = jest.fn()
     const githubEvent = {
@@ -147,7 +145,7 @@ describe('Apply label', () => {
       },
     }
 
-    const weblate = new WeblateHandler('GH_TOKEN', mock)
+    const weblate = new WeblateHandler('GH_TOKEN')
     await weblate.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)
@@ -156,6 +154,8 @@ describe('Apply label', () => {
       statusCode: 204,
     })
 
-    expect(mock.lastOptions().body).toBe('{"labels":["Translations"]}')
+    expect(fetch).toHaveFetched('https://api.github.com/repos/foo/bar/issues/42/labels', {
+      body: { labels: ['Translations'] },
+    })
   })
 })
diff --git a/yarn.lock b/yarn.lock
@@ -1445,6 +1445,13 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.1.tgz#de633db3ec2ef6a3c89e2f19038063e8a122e2c2"
   integrity sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==
 
+"@fetch-mock/jest@^0.2.0":
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/@fetch-mock/jest/-/jest-0.2.0.tgz#70fae50fd7886c313b0186c9d18165a80e080109"
+  integrity sha512-4oKbWKklbk7inBuK2YRtdjiJFG47N0VzkzTI9TOzY0g3q92605bwtcJXnAZ13gr4C0L0O/Bt24EIt0+aNDSd1Q==
+  dependencies:
+    fetch-mock "12.0.0"
+
 "@hapi/accept@^6.0.1":
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-6.0.3.tgz#eef0800a4f89cd969da8e5d0311dc877c37279ab"
@@ -4307,7 +4314,7 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
-fetch-mock@^12.0.0:
+fetch-mock@12.0.0:
   version "12.0.0"
   resolved "https://registry.yarnpkg.com/fetch-mock/-/fetch-mock-12.0.0.tgz#d531e0c58aa3ecc04fa225fc4b624d070563dbc8"
   integrity sha512-JSsjzoRN4rYqHa2/+8ushJGDsK9HGNTdBZo6Hrpu3KFN7Y03nRCt2VJ2WG4OUvyTUukOQ4TQIfjcFcEkMPGZ0Q==