Merge pull request #971 from 20minutes/dependabot/npm_and_yarn/fetch-…

…mock-12.0.0 Bump fetch-mock from 11.1.5 to 12.0.0
20minutes · Oct 25, 2024 · 8c6c412 · 8c6c412
2 parents 1c56698 + 6e29624
commit 8c6c412
Show file tree

Hide file tree

Showing 10 changed files with 240 additions and 227 deletions.
diff --git a/functions/classes/FixupHandler.js b/functions/classes/FixupHandler.js
@@ -1,8 +1,8 @@
 import { Handler } from './Handler'
 
 export class FixupHandler 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
@@ -2,31 +2,16 @@ import { Octokit } from '@octokit/rest'
 import { graphql } from '@octokit/graphql'
 
 export class Handler {
-  constructor(githubToken, fetch = null) {
-    const options = {
+  constructor(githubToken) {
+    this.githubClient = new Octokit({
       auth: githubToken,
-    }
-
-    if (fetch) {
-      options.request = {
-        fetch,
-      }
-    }
-
-    this.githubClient = new Octokit(options)
+    })
 
-    const graphqlOptions = {
+    this.graphql = graphql.defaults({
       headers: {
         authorization: `token ${githubToken}`,
       },
-    }
-
-    if (fetch) {
-      graphqlOptions.request = {
-        fetch,
-      }
-    }
-    this.graphql = graphql.defaults(graphqlOptions)
+    })
   }
 
   // eslint-disable-next-line class-methods-use-this

diff --git a/functions/classes/LabelHandler.js b/functions/classes/LabelHandler.js
@@ -1,8 +1,8 @@
 import { Handler } from './Handler'
 
 export class LabelHandler extends Handler {
-  constructor(githubToken, namespace = '', blockLabels = '', fetch = null) {
-    super(githubToken, fetch)
+  constructor(githubToken, namespace = '', blockLabels = '') {
+    super(githubToken)
 
     this.namespace = namespace
     this.blockLabels = blockLabels

diff --git a/functions/classes/SpecificationHandler.js b/functions/classes/SpecificationHandler.js
@@ -1,8 +1,8 @@
 import { Handler } from './Handler'
 
 export class SpecificationHandler extends Handler {
-  constructor(githubToken, namespace = '', titleLength = 8, bodyLength = 8, fetch = null) {
-    super(githubToken, fetch)
+  constructor(githubToken, namespace = '', titleLength = 8, bodyLength = 8) {
+    super(githubToken)
 
     this.namespace = namespace
     this.titleLength = titleLength

diff --git a/package.json b/package.json
@@ -13,6 +13,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",
@@ -23,7 +24,6 @@
     "eslint-plugin-jsx-a11y": "^6.10.1",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.37.2",
-    "fetch-mock": "^11.1.5",
     "jest": "^29.7.0",
     "node-fetch": "2",
     "prettier": "^3.3.3",

diff --git a/tests/auto-merge.spec.js b/tests/auto-merge.spec.js
@@ -1,4 +1,4 @@
-import fetchMock from 'fetch-mock'
+import fetchMock from '@fetch-mock/jest'
 import { AutomergeHandler } from '../functions/classes/AutomergeHandler'
 import { handler } from '../functions/auto-merge'
 
@@ -112,7 +112,7 @@ describe('Validating GitHub event', () => {
 
 describe('Auto merge', () => {
   test('got a PR approved & merged', async () => {
-    const mock = fetchMock.sandbox().mock('https://api.github.com/graphql', 200)
+    fetchMock.mockGlobal().route('*', 200)
 
     const callback = jest.fn()
     const githubEvent = {
@@ -139,7 +139,7 @@ describe('Auto merge', () => {
       },
     }
 
-    const autoMerge = new AutomergeHandler('GH_TOKEN', mock)
+    const autoMerge = new AutomergeHandler('GH_TOKEN')
     await autoMerge.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)
@@ -148,19 +148,20 @@ describe('Auto merge', () => {
       statusCode: 204,
     })
 
-    const calls = mock.calls()
-    const firstBody = JSON.parse(calls[0][1].body)
+    const calls = fetch.fetchMock.callHistory.calls()
+
+    const firstBody = JSON.parse(calls[0].options.body)
     expect(firstBody.query).toEqual(expect.stringContaining('addPullRequestReview'))
     expect(firstBody.query).toEqual(expect.stringContaining('event: APPROVE'))
     expect(firstBody.variables.pullRequestId).toBe('PR_kwDOHDoTgM5BdXq1')
 
-    const secondBody = JSON.parse(calls[1][1].body)
+    const secondBody = JSON.parse(calls[1].options.body)
     expect(secondBody.query).toEqual(expect.stringContaining('enablePullRequestAutoMerge'))
     expect(secondBody.variables.pullRequestId).toBe('PR_kwDOHDoTgM5BdXq1')
   })
 
   test('got a PR approved & merged with one deps in grouped deps', async () => {
-    const mock = fetchMock.sandbox().mock('https://api.github.com/graphql', 200)
+    fetchMock.mockGlobal().route('*', 200)
 
     const callback = jest.fn()
     const githubEvent = {
@@ -187,7 +188,7 @@ describe('Auto merge', () => {
       },
     }
 
-    const autoMerge = new AutomergeHandler('GH_TOKEN', mock)
+    const autoMerge = new AutomergeHandler('GH_TOKEN')
     await autoMerge.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)
@@ -196,19 +197,20 @@ describe('Auto merge', () => {
       statusCode: 204,
     })
 
-    const calls = mock.calls()
-    const firstBody = JSON.parse(calls[0][1].body)
+    const calls = fetch.fetchMock.callHistory.calls()
+
+    const firstBody = JSON.parse(calls[0].options.body)
     expect(firstBody.query).toEqual(expect.stringContaining('addPullRequestReview'))
     expect(firstBody.query).toEqual(expect.stringContaining('event: APPROVE'))
     expect(firstBody.variables.pullRequestId).toBe('PR_kwDOHDoTgM5BdXq1')
 
-    const secondBody = JSON.parse(calls[1][1].body)
+    const secondBody = JSON.parse(calls[1].options.body)
     expect(secondBody.query).toEqual(expect.stringContaining('enablePullRequestAutoMerge'))
     expect(secondBody.variables.pullRequestId).toBe('PR_kwDOHDoTgM5BdXq1')
   })
 
   test('got a PR approved & merged from grouped deps', async () => {
-    const mock = fetchMock.sandbox().mock('https://api.github.com/graphql', 200)
+    fetchMock.mockGlobal().route('*', 200)
 
     const callback = jest.fn()
     const githubEvent = {
@@ -335,7 +337,7 @@ You can trigger Dependabot actions by commenting on this PR:
       },
     }
 
-    const autoMerge = new AutomergeHandler('GH_TOKEN', mock)
+    const autoMerge = new AutomergeHandler('GH_TOKEN')
     await autoMerge.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)
@@ -344,13 +346,14 @@ You can trigger Dependabot actions by commenting on this PR:
       statusCode: 204,
     })
 
-    const calls = mock.calls()
-    const firstBody = JSON.parse(calls[0][1].body)
+    const calls = fetch.fetchMock.callHistory.calls()
+
+    const firstBody = JSON.parse(calls[0].options.body)
     expect(firstBody.query).toEqual(expect.stringContaining('addPullRequestReview'))
     expect(firstBody.query).toEqual(expect.stringContaining('event: APPROVE'))
     expect(firstBody.variables.pullRequestId).toBe('PR_kwDOHDoTgM5BdXq1')
 
-    const secondBody = JSON.parse(calls[1][1].body)
+    const secondBody = JSON.parse(calls[1].options.body)
     expect(secondBody.query).toEqual(expect.stringContaining('enablePullRequestAutoMerge'))
     expect(secondBody.variables.pullRequestId).toBe('PR_kwDOHDoTgM5BdXq1')
   })
@@ -604,7 +607,7 @@ Updates \`@storybook/addon-essentials\` from 6.5.12 to 7.5.13`,
   })
 
   test('PR has already auto_merge enabled', async () => {
-    const mock = fetchMock.sandbox().mock('https://api.github.com/graphql', 200)
+    fetchMock.mockGlobal().route('*', 200)
 
     const callback = jest.fn()
     const githubEvent = {
@@ -631,7 +634,7 @@ Updates \`@storybook/addon-essentials\` from 6.5.12 to 7.5.13`,
       },
     }
 
-    const autoMerge = new AutomergeHandler('GH_TOKEN', mock)
+    const autoMerge = new AutomergeHandler('GH_TOKEN')
     await autoMerge.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)
@@ -640,15 +643,16 @@ Updates \`@storybook/addon-essentials\` from 6.5.12 to 7.5.13`,
       statusCode: 204,
     })
 
-    const calls = mock.calls()
-    const firstBody = JSON.parse(calls[0][1].body)
+    const calls = fetch.fetchMock.callHistory.calls()
+
+    const firstBody = JSON.parse(calls[0].options.body)
     expect(firstBody.query).toEqual(expect.stringContaining('addPullRequestReview'))
     expect(firstBody.query).toEqual(expect.stringContaining('event: APPROVE'))
     expect(firstBody.variables.pullRequestId).toBe('PR_kwDOHDoTgM5BdXq1')
   })
 
   test('PR is about a minor change from alpha versions', async () => {
-    const mock = fetchMock.sandbox().mock('https://api.github.com/graphql', 200)
+    fetchMock.mockGlobal().route('*', 200)
 
     const callback = jest.fn()
     const githubEvent = {
@@ -677,7 +681,7 @@ Updates \`@storybook/addon-essentials\` from 6.5.12 to 7.5.13`,
       },
     }
 
-    const autoMerge = new AutomergeHandler('GH_TOKEN', mock)
+    const autoMerge = new AutomergeHandler('GH_TOKEN')
     await autoMerge.handle(githubEvent, callback)
 
     expect(callback).toHaveBeenCalledTimes(1)
@@ -686,13 +690,14 @@ Updates \`@storybook/addon-essentials\` from 6.5.12 to 7.5.13`,
       statusCode: 204,
     })
 
-    const calls = mock.calls()
-    const firstBody = JSON.parse(calls[0][1].body)
+    const calls = fetch.fetchMock.callHistory.calls()
+
+    const firstBody = JSON.parse(calls[0].options.body)
     expect(firstBody.query).toEqual(expect.stringContaining('addPullRequestReview'))
     expect(firstBody.query).toEqual(expect.stringContaining('event: APPROVE'))
     expect(firstBody.variables.pullRequestId).toBe('PR_kwDOHDoTgM5BdXq1')
 
-    const secondBody = JSON.parse(calls[1][1].body)
+    const secondBody = JSON.parse(calls[1].options.body)
     expect(secondBody.query).toEqual(expect.stringContaining('enablePullRequestAutoMerge'))
     expect(secondBody.variables.pullRequestId).toBe('PR_kwDOHDoTgM5BdXq1')
   })