From f64c6bf9ac65f5522b7aaf29fe586844e8750e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?= =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?= =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?= Date: Mon, 27 Jan 2025 18:17:51 +0100 Subject: [PATCH] chore: Upgrade nock and delete nock related boilerplate code (no-changelog) (#12869) --- package.json | 2 +- .../__tests__/node-execute-functions.test.ts | 2 +- packages/nodes-base/jest.config.js | 1 + .../test/v2/node/base/getMany.test.ts | 11 ---- .../test/v2/node/base/getSchema.test.ts | 11 ---- .../test/v2/node/record/create.test.ts | 15 +---- .../test/v2/node/record/deleteRecord.test.ts | 15 ----- .../Airtable/test/v2/node/record/get.test.ts | 15 ----- .../test/v2/node/record/search.test.ts | 11 ---- .../test/v2/node/record/update.test.ts | 11 ---- .../test/AwsComprehend.node.test.ts | 4 -- .../test/AwsRekognition.node.test.ts | 4 -- .../nodes/Aws/S3/test/V1/AwsS3.node.test.ts | 5 -- .../nodes/Aws/S3/test/V2/AwsS3.node.test.ts | 5 -- .../nodes/Cron/test/Cron.node.test.ts | 4 -- .../test/v2/node/channel/create.test.ts | 11 ---- .../v2/node/channel/deleteChannel.test.ts | 11 ---- .../Discord/test/v2/node/channel/get.test.ts | 11 ---- .../test/v2/node/channel/getAll.test.ts | 11 ---- .../test/v2/node/channel/update.test.ts | 11 ---- .../test/v2/node/member/getAll.test.ts | 11 ---- .../test/v2/node/member/roleAdd.test.ts | 11 ---- .../test/v2/node/member/roleRemove.test.ts | 11 ---- .../v2/node/message/deleteMessage.test.ts | 11 ---- .../Discord/test/v2/node/message/get.test.ts | 11 ---- .../test/v2/node/message/getAll.test.ts | 11 ---- .../test/v2/node/message/react.test.ts | 11 ---- .../Discord/test/v2/node/message/send.test.ts | 11 ---- .../test/v2/node/webhook/sendLegacy.test.ts | 11 ---- .../nodes/Discord/test/v2/utils.test.ts | 4 -- .../nodes/EmailSend/v2/EmailSendV2.node.ts | 2 +- .../nodes/Gong/test/Gong.node.test.ts | 7 --- .../test/v2/node/executeQuery.test.ts | 11 ---- .../test/v2/node/insert.autoMapMode.test.ts | 11 ---- .../test/v2/node/insert.manualMode.test.ts | 11 ---- .../Google/Calendar/GoogleCalendar.node.ts | 4 +- .../Drive/test/v2/node/drive/create.test.ts | 11 ---- .../test/v2/node/drive/deleteDrive.test.ts | 11 ---- .../Drive/test/v2/node/drive/get.test.ts | 11 ---- .../Drive/test/v2/node/drive/list.test.ts | 10 --- .../Drive/test/v2/node/drive/update.test.ts | 11 ---- .../Drive/test/v2/node/file/copy.test.ts | 11 ---- .../test/v2/node/file/createFromText.test.ts | 11 ---- .../test/v2/node/file/deleteFile.test.ts | 11 ---- .../Drive/test/v2/node/file/download.test.ts | 11 ---- .../Drive/test/v2/node/file/move.test.ts | 10 --- .../Drive/test/v2/node/file/share.test.ts | 11 ---- .../Drive/test/v2/node/file/update.test.ts | 11 ---- .../Drive/test/v2/node/file/upload.test.ts | 11 ---- .../test/v2/node/fileFolder/search.test.ts | 10 --- .../Drive/test/v2/node/folder/create.test.ts | 11 ---- .../test/v2/node/folder/deleteFolder.test.ts | 11 ---- .../Drive/test/v2/node/folder/share.test.ts | 11 ---- .../Google/Gmail/test/GmailTrigger.test.ts | 6 -- .../Google/Gmail/test/v2/GmailV2.node.test.ts | 7 --- .../nodes/GraphQL/test/GraphQL.node.test.ts | 5 -- .../test/binaryData/HttpRequest.test.ts | 7 --- .../test/encoding/HttpRequest.test.ts | 7 --- .../test/encodingQuoted/HttpRequest.test.ts | 7 --- .../HttpRequest/test/node/HttpRequest.test.ts | 6 -- .../test/node/workflow.pagination.json | 20 +++--- .../ICalendar/test/node/ICalendar.test.ts | 1 - .../tests/v1/MailerLite.v1.workflow.test.ts | 6 -- .../tests/v2/MailerLite.v2.workflow.test.ts | 6 -- .../Entra/test/MicrosoftEntra.node.test.ts | 7 --- .../Excel/test/v2/node/table/addTable.test.ts | 11 ---- .../Excel/test/v2/node/table/append.test.ts | 11 ---- .../test/v2/node/table/convertToRange.test.ts | 11 ---- .../test/v2/node/table/deleteTable.test.ts | 11 ---- .../test/v2/node/table/getColumns.test.ts | 11 ---- .../Excel/test/v2/node/table/getRows.test.ts | 11 ---- .../Excel/test/v2/node/table/lookup.test.ts | 11 ---- .../v2/node/workbook/addWorksheet.test.ts | 11 ---- .../v2/node/workbook/deleteWorkbook.test.ts | 11 ---- .../test/v2/node/workbook/getAll.test.ts | 11 ---- .../test/v2/node/worksheet/append.test.ts | 11 ---- .../test/v2/node/worksheet/clear.test.ts | 11 ---- .../v2/node/worksheet/deleteWorksheet.test.ts | 11 ---- .../test/v2/node/worksheet/getAll.test.ts | 11 ---- .../test/v2/node/worksheet/readRows.test.ts | 11 ---- .../test/v2/node/worksheet/update.test.ts | 11 ---- .../test/v2/node/worksheet/upsert.test.ts | 11 ---- .../test/v2/node/calendar/create.test.ts | 11 ---- .../test/v2/node/calendar/delete.test.ts | 11 ---- .../Outlook/test/v2/node/calendar/get.test.ts | 11 ---- .../test/v2/node/calendar/getAll.test.ts | 11 ---- .../test/v2/node/calendar/update.test.ts | 11 ---- .../test/v2/node/contact/create.test.ts | 11 ---- .../test/v2/node/contact/update.test.ts | 11 ---- .../Outlook/test/v2/node/draft/create.test.ts | 11 ---- .../Outlook/test/v2/node/draft/send.test.ts | 11 ---- .../Outlook/test/v2/node/event/create.test.ts | 11 ---- .../test/v2/node/folder/create.test.ts | 11 ---- .../test/v2/node/folderMessage/getAll.test.ts | 11 ---- .../Outlook/test/v2/node/message/move.test.ts | 11 ---- .../test/v2/node/message/reply.test.ts | 11 ---- .../Outlook/test/v2/node/message/send.test.ts | 11 ---- .../Teams/test/v2/node/channel/create.test.ts | 11 ---- .../v2/node/channel/deleteChannel.test.ts | 11 ---- .../Teams/test/v2/node/channel/get.test.ts | 11 ---- .../Teams/test/v2/node/channel/getAll.test.ts | 11 ---- .../Teams/test/v2/node/channel/update.test.ts | 11 ---- .../v2/node/channelMessage/create.test.ts | 11 ---- .../v2/node/channelMessage/getAll.test.ts | 11 ---- .../test/v2/node/chatMessage/create.test.ts | 11 ---- .../test/v2/node/chatMessage/get.test.ts | 11 ---- .../test/v2/node/chatMessage/getAll.test.ts | 11 ---- .../Teams/test/v2/node/task/create.test.ts | 11 ---- .../test/v2/node/task/deleteTask.test.ts | 11 ---- .../Teams/test/v2/node/task/get.test.ts | 11 ---- .../Teams/test/v2/node/task/getAll.test.ts | 11 ---- .../Teams/test/v2/node/task/update.test.ts | 11 ---- .../nodes/MySql/test/v1/executeQuery.test.ts | 11 ---- .../nodes/N8n/test/node/N8n.test.ts | 7 --- .../Notion/test/node/v2/block/append.test.ts | 11 ---- .../Notion/test/node/v2/block/getAll.test.ts | 11 ---- .../Notion/test/node/v2/database/get.test.ts | 11 ---- .../test/node/v2/database/getAll.test.ts | 11 ---- .../test/node/v2/database/search.test.ts | 11 ---- .../test/node/v2/databasePage/create.test.ts | 11 ---- .../test/node/v2/databasePage/get.test.ts | 11 ---- .../test/node/v2/databasePage/getAll.test.ts | 11 ---- .../test/node/v2/databasePage/update.test.ts | 11 ---- .../Notion/test/node/v2/page/archive.test.ts | 11 ---- .../Notion/test/node/v2/page/create.test.ts | 11 ---- .../Notion/test/node/v2/page/search.test.ts | 11 ---- .../Notion/test/node/v2/user/get.test.ts | 11 ---- .../Notion/test/node/v2/user/getAll.test.ts | 11 ---- .../nodes/Npm/test/Npm.node.test.ts | 6 -- .../test/OpenWeatherMap.test.ts | 6 -- .../nodes/Oura/test/oura.node.test.ts | 6 -- .../nodes/PhilipsHue/test/workflow.test.ts | 6 -- .../QuickChart/test/QuickChart.node.test.ts | 5 -- .../RssFeedRead/test/node/RssFeedRead.test.ts | 7 --- .../test/v2/node/channel/archive.test.ts | 11 ---- .../Slack/test/v2/node/channel/create.test.ts | 11 ---- .../Slack/test/v2/node/channel/get.test.ts | 11 ---- .../Slack/test/v2/node/channel/getAll.test.ts | 11 ---- .../test/v2/node/channel/history.test.ts | 11 ---- .../Slack/test/v2/node/file/upload.test.ts | 11 ---- .../Slack/test/v2/node/message/delete.test.ts | 11 ---- .../test/v2/node/message/getPermalink.test.ts | 11 ---- .../Slack/test/v2/node/message/post.test.ts | 11 ---- .../Slack/test/v2/node/message/search.test.ts | 11 ---- .../Slack/test/v2/node/message/update.test.ts | 11 ---- .../test/v2/node/user/updateProfile.test.ts | 11 ---- .../__tests__/workflow/workflow.test.ts | 6 -- .../Telegram/tests/Workflow/workflow.test.ts | 6 -- .../TheHiveProject/test/transport.test.ts | 10 --- .../nodes/Twitter/test/Twitter.test.ts | 5 -- packages/nodes-base/test/globalSetup.ts | 5 ++ .../test/nodes/Airtable/Airtable.node.test.ts | 5 -- packages/nodes-base/test/nodes/Helpers.ts | 12 ---- pnpm-lock.yaml | 63 ++++++++++++++++--- 154 files changed, 75 insertions(+), 1483 deletions(-) create mode 100644 packages/nodes-base/test/globalSetup.ts diff --git a/package.json b/package.json index 90aa888e98a00..733a4cabc05f9 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "jest-mock": "^29.6.2", "jest-mock-extended": "^3.0.4", "lefthook": "^1.7.15", - "nock": "^13.3.2", + "nock": "^14.0.0", "nodemon": "^3.0.1", "npm-run-all2": "^7.0.2", "p-limit": "^3.1.0", diff --git a/packages/core/src/__tests__/node-execute-functions.test.ts b/packages/core/src/__tests__/node-execute-functions.test.ts index a1c41355e698b..0feedf0bd14fb 100644 --- a/packages/core/src/__tests__/node-execute-functions.test.ts +++ b/packages/core/src/__tests__/node-execute-functions.test.ts @@ -474,7 +474,7 @@ describe('NodeExecuteFunctions', () => { body: 'Not Found', headers: {}, statusCode: 404, - statusMessage: null, + statusMessage: 'Not Found', }); expect(hooks.executeHookFunctions).toHaveBeenCalledWith('nodeFetchedData', [ workflow.id, diff --git a/packages/nodes-base/jest.config.js b/packages/nodes-base/jest.config.js index 721030d49c85b..f602d20b5b952 100644 --- a/packages/nodes-base/jest.config.js +++ b/packages/nodes-base/jest.config.js @@ -5,6 +5,7 @@ process.env.TZ = 'UTC'; module.exports = { ...require('../../jest.config'), collectCoverageFrom: ['credentials/**/*.ts', 'nodes/**/*.ts', 'utils/**/*.ts'], + globalSetup: '/test/globalSetup.ts', setupFilesAfterEnv: [ 'jest-expect-message', 'n8n-workflow/test/setup.ts', diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts index d3c6a6662fc51..cb6b662dd4d45 100644 --- a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts +++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as getMany from '../../../../v2/actions/base/getMany.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction } from '../helpers'; @@ -33,15 +31,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('Test AirtableV2, base => getMany', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should return all bases', async () => { const nodeParameters = { resource: 'base', diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts index 4f6bda2a898a7..fe07bc7c93be0 100644 --- a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts +++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as getSchema from '../../../../v2/actions/base/getSchema.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('Test AirtableV2, base => getSchema', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should return all bases', async () => { const nodeParameters = { resource: 'base', diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts index 85f5d0db7eb33..3ca1da057693c 100644 --- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts +++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as create from '../../../../v2/actions/record/create.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction } from '../helpers'; @@ -15,18 +13,7 @@ jest.mock('../../../../v2/transport', () => { }); describe('Test AirtableV2, create operation', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - - afterEach(() => { - jest.restoreAllMocks(); - }); + beforeEach(() => jest.clearAllMocks()); it('should create a record, autoMapInputData', async () => { const nodeParameters = { diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts index 36e8e828e6141..bcf5ca94831a0 100644 --- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts +++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as deleteRecord from '../../../../v2/actions/record/deleteRecord.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction } from '../helpers'; @@ -15,19 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('Test AirtableV2, deleteRecord operation', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - - afterEach(() => { - jest.restoreAllMocks(); - }); - it('should delete a record', async () => { const nodeParameters = { operation: 'deleteRecord', diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts index eb9a612cf6a5d..a7726c5346c68 100644 --- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts +++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as get from '../../../../v2/actions/record/get.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction } from '../helpers'; @@ -23,19 +21,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('Test AirtableV2, create operation', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - - afterEach(() => { - jest.restoreAllMocks(); - }); - it('should create a record, autoMapInputData', async () => { const nodeParameters = { operation: 'get', diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts index b5c12159073cc..83e5f246f2188 100644 --- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts +++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as search from '../../../../v2/actions/record/search.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction } from '../helpers'; @@ -49,15 +47,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('Test AirtableV2, search operation', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should return all records', async () => { const nodeParameters = { operation: 'search', diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts index 89cdc0d9ef50f..7887066401918 100644 --- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts +++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as update from '../../../../v2/actions/record/update.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction } from '../helpers'; @@ -40,15 +38,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('Test AirtableV2, update operation', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should update a record by id, autoMapInputData', async () => { const nodeParameters = { operation: 'update', diff --git a/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts b/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts index ecedd706728b3..4be828543431d 100644 --- a/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts +++ b/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts @@ -25,7 +25,6 @@ describe('Test AWS Comprehend Node', () => { await initBinaryDataService(); - nock.disableNetConnect(); const baseUrl = 'https://comprehend.eu-central-1.amazonaws.com'; mock = nock(baseUrl); @@ -34,9 +33,6 @@ describe('Test AWS Comprehend Node', () => { beforeEach(async () => { mock.post('/').reply(200, response); }); - afterAll(() => { - nock.restore(); - }); testWorkflows(workflows); }); diff --git a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts index 49b1465307f98..f57696c690cf9 100644 --- a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts +++ b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts @@ -291,7 +291,6 @@ describe('Test AWS Rekogntion Node', () => { let mock: nock.Scope; beforeAll(async () => { - nock.disableNetConnect(); mock = nock(baseUrl); }); @@ -299,9 +298,6 @@ describe('Test AWS Rekogntion Node', () => { mock.post('/').reply(200, responseLabels); }); - afterAll(() => { - nock.restore(); - }); testWorkflows(workflows); }); }); diff --git a/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts index a5770b0b9c712..145ca84516ac1 100644 --- a/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts +++ b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts @@ -14,7 +14,6 @@ describe('Test S3 V1 Node', () => { await initBinaryDataService(); - nock.disableNetConnect(); mock = nock('https://bucket.s3.eu-central-1.amazonaws.com'); }); @@ -40,10 +39,6 @@ describe('Test S3 V1 Node', () => { .reply(200, { success: true }); }); - afterAll(() => { - nock.restore(); - }); - testWorkflows(workflows); }); }); diff --git a/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts index fe6b625331327..ff8aded605bb8 100644 --- a/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts +++ b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts @@ -14,7 +14,6 @@ describe('Test S3 V2 Node', () => { await initBinaryDataService(); - nock.disableNetConnect(); mock = nock('https://s3.eu-central-1.amazonaws.com/buc.ket'); }); @@ -40,10 +39,6 @@ describe('Test S3 V2 Node', () => { .reply(200, { success: true }); }); - afterAll(() => { - nock.restore(); - }); - testWorkflows(workflows); }); }); diff --git a/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts b/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts index 0456b5ca5863a..8c02c89da52e1 100644 --- a/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts +++ b/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts @@ -33,10 +33,6 @@ describe('Cron Node', () => { }, }); - afterAll(() => { - jest.resetAllMocks(); - }); - it('should return a function to trigger', async () => { expect(await node.trigger.call(triggerFunctions)).toEqual({ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts index 5f7e38ed1d1ee..39fbf2f5281b0 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -31,16 +30,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, channel => create', () => { const workflows = ['nodes/Discord/test/v2/node/channel/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts index 01f523d4c3209..9655bd13abb28 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -31,16 +30,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, channel => deleteChannel', () => { const workflows = ['nodes/Discord/test/v2/node/channel/deleteChannel.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts index ceb952395cd09..d59488dedac74 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes, IRequestOptions } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -46,16 +45,6 @@ requestApiSpy.mockImplementation( describe('Test DiscordV2, channel => get', () => { const workflows = ['nodes/Discord/test/v2/node/channel/get.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts index 1616cde2b0ddb..8cfb777b565ef 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -107,16 +106,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, channel => getAll', () => { const workflows = ['nodes/Discord/test/v2/node/channel/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts index e6139f59df945..4c01a1bb99266 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -31,16 +30,6 @@ discordApiRequestSpy.mockImplementation(async (method: string, _) => { describe('Test DiscordV2, channel => update', () => { const workflows = ['nodes/Discord/test/v2/node/channel/update.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts index 7de96bc6eefcc..9b92bc3d5a998 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -54,16 +53,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, member => getAll', () => { const workflows = ['nodes/Discord/test/v2/node/member/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts index febf091233e7c..2b06ebed3e4f6 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -20,16 +19,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, member => roleAdd', () => { const workflows = ['nodes/Discord/test/v2/node/member/roleAdd.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts index 159c3e71f08a2..d338a064b3a77 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -20,16 +19,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, member => roleRemove', () => { const workflows = ['nodes/Discord/test/v2/node/member/roleRemove.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts index 6ee8d16e41e19..746738fbd0e5d 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -20,16 +19,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, message => deleteMessage', () => { const workflows = ['nodes/Discord/test/v2/node/message/deleteMessage.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts index 78ec0f22b1ad6..67122f1aa1946 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -39,16 +38,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, message => get', () => { const workflows = ['nodes/Discord/test/v2/node/message/get.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts index 5bb7d7ba2f739..c679a296c74ce 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -62,16 +61,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, message => getAll', () => { const workflows = ['nodes/Discord/test/v2/node/message/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts index 13c4924f4efa4..56ec34e42bb87 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -20,16 +19,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, message => react', () => { const workflows = ['nodes/Discord/test/v2/node/message/react.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts index 95c2ca54cc1f0..484be92f3be48 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -61,16 +60,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, message => send', () => { const workflows = ['nodes/Discord/test/v2/node/message/send.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts index fa5487400e316..44a7113259da3 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -55,16 +54,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => { describe('Test DiscordV2, webhook => sendLegacy', () => { const workflows = ['nodes/Discord/test/v2/node/webhook/sendLegacy.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts b/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts index ff79027568609..bca9f9198fee8 100644 --- a/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts +++ b/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts @@ -125,10 +125,6 @@ describe('Test Discord > setupChannelGetter & checkAccessToChannel', () => { } }); - afterAll(() => { - jest.restoreAllMocks(); - }); - it('should setup channel getter and get channel id', async () => { const fakeExecuteFunction = (auth: string) => { return { diff --git a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts index 1b1a3638752b8..2b6b8794873e5 100644 --- a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts +++ b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts @@ -91,7 +91,7 @@ export class EmailSendV2 implements INodeType { async execute(this: IExecuteFunctions): Promise { let returnData: INodeExecutionData[][] = []; - const operation = this.getNodeParameter('operation', 0) as string; + const operation = this.getNodeParameter('operation', 0); if (operation === SEND_AND_WAIT_OPERATION) { returnData = await sendAndWait.execute.call(this); diff --git a/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts b/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts index cee940a5cd7e7..53131b691db72 100644 --- a/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts +++ b/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts @@ -125,8 +125,6 @@ describe('Gong Node', () => { ]; beforeAll(() => { - nock.disableNetConnect(); - jest .spyOn(Helpers.CredentialsHelper.prototype, 'authenticate') .mockImplementation( @@ -161,11 +159,6 @@ describe('Gong Node', () => { ); }); - afterAll(() => { - nock.restore(); - jest.restoreAllMocks(); - }); - nock(baseUrl) .post('/v2/calls/extensive', { filter: { callIds: ['7782342274025937895'] } }) .matchHeader( diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts index 542f3206b1509..616260f8b5ead 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { setup, workflowToTests } from '@test/nodes/Helpers'; @@ -33,16 +32,6 @@ jest.mock('../../../v2/transport', () => { describe('Test Google BigQuery V2, executeQuery', () => { const workflows = ['nodes/Google/BigQuery/test/v2/node/executeQuery.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts index 6a8effcb81835..6b282c6baee98 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { setup, workflowToTests } from '@test/nodes/Helpers'; @@ -41,16 +40,6 @@ jest.mock('../../../v2/transport', () => { describe('Test Google BigQuery V2, insert auto map', () => { const workflows = ['nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts index 4be27d3b3e475..b9bf45652642e 100644 --- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts +++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { setup, workflowToTests } from '@test/nodes/Helpers'; @@ -42,16 +41,6 @@ jest.mock('../../../v2/transport', () => { describe('Test Google BigQuery V2, insert define manually', () => { const workflows = ['nodes/Google/BigQuery/test/v2/node/insert.manualMode.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts index 505b1f525d273..3ae9ab7142c0c 100644 --- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts +++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts @@ -435,10 +435,10 @@ export class GoogleCalendar implements INodeType { const timeMin = dateObjectToISO(this.getNodeParameter('timeMin', i)); const timeMax = dateObjectToISO(this.getNodeParameter('timeMax', i)); if (timeMin) { - qs.timeMin = addTimezoneToDate(timeMin as string, tz || timezone); + qs.timeMin = addTimezoneToDate(timeMin, tz || timezone); } if (timeMax) { - qs.timeMax = addTimezoneToDate(timeMax as string, tz || timezone); + qs.timeMax = addTimezoneToDate(timeMax, tz || timezone); } if (!options.recurringEventHandling || options.recurringEventHandling === 'expand') { diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts index 7053c241656fd..f1d351f374b65 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as create from '../../../../v2/actions/drive/create.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -25,15 +23,6 @@ jest.mock('uuid', () => { }); describe('test GoogleDriveV2: drive create', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { resource: 'drive', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts index 05b5002ab58bd..9382f426fd0d6 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as deleteDrive from '../../../../v2/actions/drive/deleteDrive.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: drive deleteDrive', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { resource: 'drive', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts index 128b74a2201cd..4e057aefa1610 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as get from '../../../../v2/actions/drive/get.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: drive get', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { resource: 'drive', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts index ca8e6deb10adb..c6dd132a0e311 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import * as list from '../../../../v2/actions/drive/list.operation'; import * as transport from '../../../../v2/transport'; @@ -23,15 +22,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: drive list', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with limit', async () => { const nodeParameters = { resource: 'drive', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts index afa01998b8229..4aa6a600a472b 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as update from '../../../../v2/actions/drive/update.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: drive update', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { resource: 'drive', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts index 18812ba157db8..f1f30cd53fe77 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as copy from '../../../../v2/actions/file/copy.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: file copy', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { operation: 'copy', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts index 5fc45c8d9827d..248fe2edbd303 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as createFromText from '../../../../v2/actions/file/createFromText.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: file createFromText', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { operation: 'createFromText', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts index 13fb7ae791569..1b26d5a945f48 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as deleteFile from '../../../../v2/actions/file/deleteFile.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: file deleteFile', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { operation: 'deleteFile', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts index e7f4be6294678..9defcefbb7a2e 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as download from '../../../../v2/actions/file/download.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: file download', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { operation: 'deleteFile', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts index 03498e06ec784..b5d09ea92e200 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import * as move from '../../../../v2/actions/file/move.operation'; import * as transport from '../../../../v2/transport'; @@ -21,15 +20,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: file move', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { operation: 'move', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts index e8ed98a124155..0807f5dabfbd4 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as share from '../../../../v2/actions/file/share.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: file share', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { operation: 'share', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts index a8dbfa55708a8..281513378b3aa 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as update from '../../../../v2/actions/file/update.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: file update', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { operation: 'update', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts index fa39890cb78e3..c093f719bcf21 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import * as upload from '../../../../v2/actions/file/upload.operation'; import * as utils from '../../../../v2/helpers/utils'; @@ -37,20 +36,10 @@ jest.mock('../../../../v2/helpers/utils', () => { }); describe('test GoogleDriveV2: file upload', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - beforeEach(() => { jest.clearAllMocks(); }); - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - jest.unmock('../../../../v2/helpers/utils'); - }); - it('should upload buffers', async () => { const nodeParameters = { name: 'newFile.txt', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts index 630bd9469defc..f58171b42b1c7 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import * as search from '../../../../v2/actions/fileFolder/search.operation'; import * as transport from '../../../../v2/transport'; @@ -23,15 +22,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: fileFolder search', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('returnAll = false', async () => { const nodeParameters = { searchMethod: 'name', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts index 26855b6e5c47d..a0f3f19159a42 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as create from '../../../../v2/actions/folder/create.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: folder create', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { resource: 'folder', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts index ed486720f9be6..b040a3b033f47 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as deleteFolder from '../../../../v2/actions/folder/deleteFolder.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: folder deleteFolder', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with PATCH', async () => { const nodeParameters = { resource: 'folder', diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts index 4940b6b90af62..8f1f2b047532d 100644 --- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts +++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts @@ -1,5 +1,3 @@ -import nock from 'nock'; - import * as share from '../../../../v2/actions/folder/share.operation'; import * as transport from '../../../../v2/transport'; import { createMockExecuteFunction, driveNode } from '../helpers'; @@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => { }); describe('test GoogleDriveV2: folder share', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - it('should be called with', async () => { const nodeParameters = { resource: 'folder', diff --git a/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts index 9ab54ece28607..91362843514cf 100644 --- a/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts +++ b/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts @@ -42,8 +42,6 @@ describe('GmailTrigger', () => { } beforeAll(() => { - nock.disableNetConnect(); - jest.spyOn(mailparser, 'simpleParser').mockResolvedValue({ headers: new Map([['headerKey', 'headerValue']]), attachments: [], @@ -63,10 +61,6 @@ describe('GmailTrigger', () => { }); }); - afterAll(() => { - nock.restore(); - }); - it('should return incoming emails', async () => { const messageListResponse: MessageListResponse = { messages: [createListMessage({ id: '1' }), createListMessage({ id: '2' })], diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts index b14fe8132c3b8..4185d3ca41f3d 100644 --- a/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts +++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts @@ -14,13 +14,6 @@ describe('Test Gmail Node v2', () => { jest .useFakeTimers({ doNotFake: ['setImmediate', 'nextTick'] }) .setSystemTime(new Date('2024-12-16 12:34:56.789Z')); - - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); }); describe('Messages', () => { diff --git a/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts b/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts index 2b6014fcd4f15..563c5b31f9c20 100644 --- a/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts +++ b/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts @@ -17,7 +17,6 @@ describe('GraphQL Node', () => { beforeAll(async () => { await initBinaryDataService(); - nock.disableNetConnect(); nock(baseUrl) .matchHeader('accept', 'application/json') @@ -71,10 +70,6 @@ describe('GraphQL Node', () => { }); }); - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(workflowTests); for (const workflow of workflowTests) { diff --git a/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts index d22169e50d6ec..f7822250bf3d7 100644 --- a/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts +++ b/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts @@ -17,8 +17,6 @@ describe('Test Binary Data Download', () => { beforeAll(async () => { await initBinaryDataService(); - nock.disableNetConnect(); - nock(baseUrl) .persist() .get('/path/to/image.png') @@ -33,11 +31,6 @@ describe('Test Binary Data Download', () => { 'content-disposition': 'attachment; filename="testing.jpg"', }); }); - - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts index d5488c6f2e600..d98a76029b6b7 100644 --- a/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts +++ b/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts @@ -21,18 +21,11 @@ describe('Test Response Encoding', () => { beforeAll(async () => { await initBinaryDataService(); - nock.disableNetConnect(); - nock(baseUrl) .persist() .get('/index.html') .reply(200, payload, { 'content-type': 'text/plain; charset=latin1' }); }); - - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts index 5d3a67dde9ef0..0237a98836b0e 100644 --- a/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts +++ b/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts @@ -21,18 +21,11 @@ describe('Test Quoted Response Encoding', () => { beforeAll(async () => { await initBinaryDataService(); - nock.disableNetConnect(); - nock(baseUrl) .persist() .get('/index.html') .reply(200, payload, { 'content-type': 'text/plain; charset="latin1"' }); }); - - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts index 6e49794df3c6b..d25dd15f8f143 100644 --- a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts +++ b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts @@ -17,7 +17,6 @@ describe('Test HTTP Request Node', () => { beforeAll(async () => { await initBinaryDataService(); - nock.disableNetConnect(); function getPaginationReturnData(this: nock.ReplyFnContext, limit = 10, skip = 0) { const nextUrl = `${baseUrl}/users?skip=${skip + limit}&limit=${limit}`; @@ -192,11 +191,6 @@ describe('Test HTTP Request Node', () => { return getPaginationReturnData.call(this, limit, skip); }); }); - - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json index af54f6c267a8a..03e41b5b7daa2 100644 --- a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json +++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json @@ -1266,7 +1266,7 @@ "next-url": "https://dummyjson.com/users?skip=4&limit=4" }, "statusCode": 200, - "statusMessage": null + "statusMessage": "OK" } }, { @@ -1277,7 +1277,7 @@ "next-url": "https://dummyjson.com/users?skip=8&limit=4" }, "statusCode": 200, - "statusMessage": null + "statusMessage": "OK" } }, { @@ -1288,7 +1288,7 @@ "next-url": "https://dummyjson.com/users?skip=12&limit=4" }, "statusCode": 200, - "statusMessage": null + "statusMessage": "OK" } }, { @@ -1299,7 +1299,7 @@ "next-url": "https://dummyjson.com/users?skip=16&limit=4" }, "statusCode": 200, - "statusMessage": null + "statusMessage": "OK" } }, { @@ -1310,7 +1310,7 @@ "next-url": "https://dummyjson.com/users?skip=20&limit=4" }, "statusCode": 404, - "statusMessage": null + "statusMessage": "Not Found" } } ], @@ -1532,7 +1532,7 @@ "next-url": "https://dummyjson.com/users?skip=4&limit=4" }, "statusCode": 200, - "statusMessage": null + "statusMessage": "OK" } }, { @@ -1543,7 +1543,7 @@ "next-url": "https://dummyjson.com/users?skip=8&limit=4" }, "statusCode": 200, - "statusMessage": null + "statusMessage": "OK" } }, { @@ -1554,7 +1554,7 @@ "next-url": "https://dummyjson.com/users?skip=12&limit=4" }, "statusCode": 200, - "statusMessage": null + "statusMessage": "OK" } }, { @@ -1565,7 +1565,7 @@ "next-url": "https://dummyjson.com/users?skip=16&limit=4" }, "statusCode": 200, - "statusMessage": null + "statusMessage": "OK" } }, { @@ -1576,7 +1576,7 @@ "next-url": "https://dummyjson.com/users?skip=20&limit=4" }, "statusCode": 404, - "statusMessage": null + "statusMessage": "Not Found" } } ], diff --git a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts index 65a238c7352d6..353c0f278c02c 100644 --- a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts +++ b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts @@ -43,7 +43,6 @@ describe('Execute iCalendar Node', () => { }, }, ]; - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts index 1430ea8ec7e38..468a653d45d39 100644 --- a/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts +++ b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts @@ -11,8 +11,6 @@ import { describe('MailerLite', () => { describe('Run v1 workflow', () => { beforeAll(() => { - nock.disableNetConnect(); - const mock = nock('https://api.mailerlite.com/api/v2'); mock.post('/subscribers').reply(200, getCreateResponseClassic); @@ -21,10 +19,6 @@ describe('MailerLite', () => { mock.put('/subscribers/demo@mailerlite.com').reply(200, getUpdateSubscriberResponseClassic); }); - afterAll(() => { - nock.restore(); - }); - const workflows = getWorkflowFilenames(__dirname); testWorkflows(workflows); }); diff --git a/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts index d723e86908cdd..9752eb3a44756 100644 --- a/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts +++ b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts @@ -11,8 +11,6 @@ import { describe('MailerLite', () => { describe('Run v2 workflow', () => { beforeAll(() => { - nock.disableNetConnect(); - const mock = nock('https://connect.mailerlite.com/api'); mock.post('/subscribers').reply(200, getCreateResponseV2); @@ -24,10 +22,6 @@ describe('MailerLite', () => { mock.put('/subscribers/user@n8n.io').reply(200, getUpdateSubscriberResponseV2); }); - afterAll(() => { - nock.restore(); - }); - const workflows = getWorkflowFilenames(__dirname); testWorkflows(workflows); }); diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts index 5b15152624248..428e64d94b477 100644 --- a/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts @@ -91,8 +91,6 @@ describe('Gong Node', () => { ]; beforeAll(() => { - nock.disableNetConnect(); - jest .spyOn(Helpers.CredentialsHelper.prototype, 'authenticate') .mockImplementation( @@ -116,11 +114,6 @@ describe('Gong Node', () => { ); }); - afterAll(() => { - nock.restore(); - jest.restoreAllMocks(); - }); - nock(baseUrl) .get(`/groups/${microsoftEntraApiResponse.getGroup.id}`) .matchHeader( diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts index d53a43bd04259..9f837faf9a730 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -34,16 +33,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, table => addTable', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/addTable.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts index 04c51e71cdd98..4b85c99f9137e 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -51,16 +50,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, table => append', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/append.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts index 797e6c9de4872..ce6fb50265b09 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -31,16 +30,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, table => convertToRange', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/convertToRange.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts index a771b77b5a5e8..5a85db9290037 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, table => deleteTable', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/deleteTable.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts index 815c9581a1a49..cb7f138441ac8 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -33,16 +32,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, table => getColumns', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/getColumns.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts index d46d1a48a75de..2aba1e8c9258a 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -49,16 +48,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, table => getRows', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/getRows.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts index 1dd75ce25c5f6..e50d155669621 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -67,16 +66,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, table => lookup', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/lookup.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts index 3ecc29f3ae4fe..6a38edd3b4b7d 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -35,16 +34,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, workbook => addWorksheet', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts index 0f4ba9e4b522b..45a72c5e7354e 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, workbook => deleteWorkbook', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts index f87820ebcd54b..8058511767399 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -35,16 +34,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, workbook => getAll', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/workbook/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts index 8cac626c00aa0..f9ce0f59958e1 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -38,16 +37,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, worksheet => append', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/append.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts index aed1657626e05..14df918187915 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -30,16 +29,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, worksheet => clear', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/clear.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts index 54b1ae221e505..e38c43b60d631 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -30,16 +29,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, worksheet => deleteWorksheet', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts index 1f9057a687041..d17353817f3a7 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -37,16 +36,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, worksheet => getAll', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts index 181913cc89ccb..8dbed77a6ea59 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -35,16 +34,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, worksheet => readRows', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts index 0433d968dbe79..f31047c37fbb4 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -48,16 +47,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, worksheet => update', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/update.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts index 5de97bf39df16..4299db5bebfd2 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -50,16 +49,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftExcelV2, worksheet => upsert', () => { const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts index 822f20ca8a59f..93b5269fb8103 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -42,16 +41,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, calendar => create', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts index bf14756f739c1..7e3f368939f04 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, calendar => delete', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/delete.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts index 4f8b34c9ead82..a8b5908d6f5e0 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -42,16 +41,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, calendar => get', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/get.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts index 4c8176a05afa0..f994d55e3ed31 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -63,16 +62,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, calendar => getAll', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts index 80a2acd1ab9d2..18d05f7e44de3 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -42,16 +41,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, calendar => update', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/update.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts index 0dae646594984..20fb9abfd3732 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -65,16 +64,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, contact => create', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/contact/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts index 239d8bb42ddcb..85c54fce2ef49 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -71,16 +70,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, contact => update', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/contact/update.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts index 5f1dccf1ed5a8..d92bb1d5edb14 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -93,16 +92,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, draft => create', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/draft/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts index f88e8b2151ab3..d04b7ebbee2e6 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, draft => send', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/draft/send.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts index 3fec538f0b3ee..460982cc95ce9 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -103,16 +102,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, contact => event', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/event/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts index f9e2026c9d0ff..783ead7821f16 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -34,16 +33,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, contact => folder', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/folder/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts index c97a9895f3f64..b38daa72b91cd 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -27,16 +26,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, folderMessage => getAll', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts index 1673027104c1c..71070c7e9fe7c 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, message => move', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/message/move.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts index c7d106847c07e..e5cf588fc8def 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -82,16 +81,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, message => reply', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/message/reply.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts index 0ce4e7f6747ba..cb494ed1fac11 100644 --- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => { describe('Test MicrosoftOutlookV2, message => send', () => { const workflows = ['nodes/Microsoft/Outlook/test/v2/node/message/send.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../v2/transport'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts index cea94648c3d85..6e5eef1b7f2b3 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -30,16 +29,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, channel => create', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts index dfd97010495fd..6ffe72bbe47c0 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -18,16 +17,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, channel => deleteChannel', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts index fa54945b7e3fd..6d46fa9e69529 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -31,16 +30,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, channel => get', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/get.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts index 6ffa8ade53f12..ed462d0d2cf6b 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -55,16 +54,6 @@ microsoftApiRequestSpy.mockImplementation(async (_, method: string) => { describe('Test MicrosoftTeamsV2, channel => getAll', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts index 364b4df799584..c1868a2eac1b7 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -18,16 +17,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, channel => update', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/update.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts index ec15aa2b136af..6e1659c2bd657 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -60,16 +59,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, channelMessage => create', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/channelMessage/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts index 8c1152e82d6c7..5c5a86085f0e4 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -72,16 +71,6 @@ microsoftApiRequestSpy.mockImplementation(async (_, method: string) => { describe('Test MicrosoftTeamsV2, channelMessage => getAll', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts index 305c0069b05a7..1954ecd77a21f 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -56,16 +55,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, chatMessage => create', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/chatMessage/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts index 20c20ba4b9f85..62e7ae485bd42 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -57,16 +56,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, chatMessage => get', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/chatMessage/get.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts index 4d340a763a6c9..1ac2774de32bb 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -95,16 +94,6 @@ microsoftApiRequestSpy.mockImplementation(async (_, method: string) => { describe('Test MicrosoftTeamsV2, chatMessage => getAll', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts index f550bd075bdde..60635dd0dc88a 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -68,16 +67,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, task => create', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts index f7694b1cf02e2..f3442cb31daba 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -23,16 +22,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, task => deleteTask', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/deleteTask.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts index f70d458efbaf2..7f41b6e471075 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -68,16 +67,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, task => get', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/get.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts index 42ce214d8530d..177d34e938193 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -163,16 +162,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, task => getAll', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts index 9ec11c99bb55d..a48fc67b20120 100644 --- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts +++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -23,16 +22,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => { describe('Test MicrosoftTeamsV2, task => update', () => { const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/update.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.resetAllMocks(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts index b9dff77153135..b31cd493f783d 100644 --- a/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts +++ b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes } from 'n8n-workflow'; -import nock from 'nock'; import { executeWorkflow } from '@test/nodes/ExecuteWorkflow'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -25,16 +24,6 @@ jest.mock('../../v1/GenericFunctions', () => { describe('Test MySqlV1, executeQuery', () => { const workflows = ['nodes/MySql/test/v1/executeQuery.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../v1/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts index d4776686627c0..75b5bff71a6c4 100644 --- a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts +++ b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts @@ -10,17 +10,10 @@ describe('Test N8n Node, expect base_url to be received from credentials', () => const tests = workflowToTests(workflows); beforeAll(() => { - nock.disableNetConnect(); - //base url is set in fake credentials map packages/nodes-base/test/nodes/FakeCredentialsMap.ts const baseUrl = 'https://test.app.n8n.cloud/api/v1'; nock(baseUrl).get('/workflows?tags=n8n-test').reply(200, {}); }); - - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts index 5bd576ae4c947..cd9de28fa5fb9 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -427,16 +426,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, block => append', () => { const workflows = ['nodes/Notion/test/node/v2/block/append.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts index a482d97a06235..44d1490cd5199 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -223,16 +222,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, block => getAll', () => { const workflows = ['nodes/Notion/test/node/v2/block/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts index b4a36f8629a18..44b12ea38518a 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -81,16 +80,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, database => get', () => { const workflows = ['nodes/Notion/test/node/v2/database/get.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts index 467b6300604ee..de5ebcb33c19c 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -322,16 +321,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, database => getAll', () => { const workflows = ['nodes/Notion/test/node/v2/database/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts index 4208d1524e41e..1aeb937f19ad0 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -196,16 +195,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, database => search', () => { const workflows = ['nodes/Notion/test/node/v2/database/search.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts index f2c010e75a60a..0cf2222ee3634 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -97,16 +96,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, databasePage => create', () => { const workflows = ['nodes/Notion/test/node/v2/databasePage/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts index 5b2d5d2eb5997..b6164ddd11f07 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -77,16 +76,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, databasePage => get', () => { const workflows = ['nodes/Notion/test/node/v2/databasePage/get.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts index 1160e6c971c3e..07e20be464a83 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -78,16 +77,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, databasePage => getAll', () => { const workflows = ['nodes/Notion/test/node/v2/databasePage/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts index 39531dbac794a..964525e571c9f 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -77,16 +76,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, databasePage => update', () => { const workflows = ['nodes/Notion/test/node/v2/databasePage/update.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts index 72ae18ae017ed..e4d75c70894e8 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -77,16 +76,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, page => archive', () => { const workflows = ['nodes/Notion/test/node/v2/page/archive.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts index 85090c7938e94..3f8373d02357d 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -72,16 +71,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, page => create', () => { const workflows = ['nodes/Notion/test/node/v2/page/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts index bc4c2d7a92fae..7ec0dceb79b9a 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -73,16 +72,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, page => search', () => { const workflows = ['nodes/Notion/test/node/v2/page/search.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts index 62ed0ef6e223a..a8c971ef2e08f 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -28,16 +27,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, user => get', () => { const workflows = ['nodes/Notion/test/node/v2/user/get.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts index 46816dfea2330..44a51387043ad 100644 --- a/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts +++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -52,16 +51,6 @@ jest.mock('../../../../shared/GenericFunctions', () => { describe('Test NotionV2, user => getAll', () => { const workflows = ['nodes/Notion/test/node/v2/user/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../shared/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts b/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts index 2ae6f93a2b04d..12cb215935cc4 100644 --- a/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts +++ b/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts @@ -5,8 +5,6 @@ import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers'; describe('Test npm Node', () => { beforeAll(() => { - nock.disableNetConnect(); - const { registryUrl } = FAKE_CREDENTIALS_DATA.npmApi; const mock = nock(registryUrl); //.matchHeader('Authorization', `Bearer ${accessToken}`); @@ -30,10 +28,6 @@ describe('Test npm Node', () => { }); }); - afterAll(() => { - nock.restore(); - }); - const workflows = getWorkflowFilenames(__dirname); testWorkflows(workflows); }); diff --git a/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts b/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts index 70fe54bbb8793..45079bbc8a5ac 100644 --- a/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts +++ b/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts @@ -10,18 +10,12 @@ describe('OpenWeatherMap', () => { const tests = workflowToTests(workflows); beforeAll(() => { - nock.disableNetConnect(); - nock('https://api.openweathermap.org') .get('/data/2.5/weather') .query({ units: 'metric', q: 'berlin,de', lang: 'en' }) .reply(200, currentWeatherResponse); }); - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Oura/test/oura.node.test.ts b/packages/nodes-base/nodes/Oura/test/oura.node.test.ts index 19c1e8c2b4af0..5e4a1ad45c11a 100644 --- a/packages/nodes-base/nodes/Oura/test/oura.node.test.ts +++ b/packages/nodes-base/nodes/Oura/test/oura.node.test.ts @@ -56,17 +56,11 @@ describe('Oura', () => { const tests = workflowToTests(workflows); beforeAll(() => { - nock.disableNetConnect(); - nock('https://api.ouraring.com/v2') .get('/usercollection/personal_info') .reply(200, profileResponse); }); - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts b/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts index 26f67966327cd..4608552137ff6 100644 --- a/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts +++ b/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts @@ -19,8 +19,6 @@ describe('PhilipsHue', () => { const tests = workflowToTests(workflows); beforeAll(() => { - nock.disableNetConnect(); - const mock = nock('https://api.meethue.com/route'); mock.persist().get('/api/0/config').reply(200, getConfigResponse); mock.get('/api/pAtwdCV8NZId25Gk/lights').reply(200, getLightsResponse); @@ -28,10 +26,6 @@ describe('PhilipsHue', () => { mock.delete('/api/pAtwdCV8NZId25Gk/lights/1').reply(200, deleteLightResponse); }); - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts index 1305611046c04..6a271d8722265 100644 --- a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts +++ b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts @@ -8,17 +8,12 @@ import type { WorkflowTestData } from '@test/nodes/types'; describe('Test QuickChart Node', () => { beforeEach(async () => { await Helpers.initBinaryDataService(); - nock.disableNetConnect(); nock('https://quickchart.io') .persist() .get(/chart.*/) .reply(200, { success: true }); }); - afterEach(() => { - nock.restore(); - }); - const workflow = Helpers.readJsonFileSync('nodes/QuickChart/test/QuickChart.workflow.json'); const tests: WorkflowTestData[] = [ diff --git a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts index f68c8db965a60..451ab65bef017 100644 --- a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts +++ b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts @@ -10,15 +10,8 @@ describe('Test RSS Feed Trigger Node', () => { const tests = workflowToTests(workflows); beforeAll(() => { - nock.disableNetConnect(); - nock('https://lorem-rss.herokuapp.com').get('/feed?length=3').reply(200, feed); }); - - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts index f3eefc4bfa114..8ad2fee93d77e 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods } from 'n8n-workflow'; -import nock from 'nock'; import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -22,16 +21,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, channel => append', () => { const workflows = ['nodes/Slack/test/v2/node/channel/archive.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts index 81f23e284fbad..239c5d611a1a3 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -64,16 +63,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, channel => create', () => { const workflows = ['nodes/Slack/test/v2/node/channel/create.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts index 9e53394c3368e..87759f2e44439 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -63,16 +62,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, channel => get', () => { const workflows = ['nodes/Slack/test/v2/node/channel/get.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts index 4b816693baaf6..5d93684dcabb6 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -126,16 +125,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, channel => getAll', () => { const workflows = ['nodes/Slack/test/v2/node/channel/getAll.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts index 99878cb69162f..9d371ecb347de 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -182,16 +181,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, channel => history', () => { const workflows = ['nodes/Slack/test/v2/node/channel/history.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts index 154b137bfc121..6ad731e710191 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -26,16 +25,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, file => upload', () => { const workflows = ['nodes/Slack/test/v2/node/file/upload.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts index c18f17ba54acc..1e75a1ae9c894 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -27,16 +26,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, message => delete', () => { const workflows = ['nodes/Slack/test/v2/node/message/delete.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts index 78735d0fc626b..a16003cdc335e 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -27,16 +26,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, message => getPermalink', () => { const workflows = ['nodes/Slack/test/v2/node/message/getPermalink.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts index 2cfff4b6d0a94..e5f4216946d8e 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -66,16 +65,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, message => post', () => { const workflows = ['nodes/Slack/test/v2/node/message/post.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts index 03179ebede51f..a8d0426e576db 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -219,16 +218,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, message => search', () => { const workflows = ['nodes/Slack/test/v2/node/message/search.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts index acf00fbd95384..c6484c4e5c396 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts @@ -1,5 +1,4 @@ import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -70,16 +69,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, message => update', () => { const workflows = ['nodes/Slack/test/v2/node/message/update.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts index 62577de3b99c9..19820cedb6bb5 100644 --- a/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts +++ b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts @@ -1,5 +1,4 @@ import type { INodeTypes, WorkflowTestData } from 'n8n-workflow'; -import nock from 'nock'; import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers'; @@ -21,16 +20,6 @@ jest.mock('../../../../V2/GenericFunctions', () => { describe('Test SlackV2, user => updateProfile', () => { const workflows = ['nodes/Slack/test/v2/node/user/updateProfile.workflow.json']; const tests = workflowToTests(workflows); - - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../../../../V2/GenericFunctions'); - }); - const nodeTypes = setup(tests); const testNode = async (testData: WorkflowTestData, types: INodeTypes) => { diff --git a/packages/nodes-base/nodes/Spotify/__tests__/workflow/workflow.test.ts b/packages/nodes-base/nodes/Spotify/__tests__/workflow/workflow.test.ts index 393fd511b4b57..0ce85b7d5db0a 100644 --- a/packages/nodes-base/nodes/Spotify/__tests__/workflow/workflow.test.ts +++ b/packages/nodes-base/nodes/Spotify/__tests__/workflow/workflow.test.ts @@ -20,8 +20,6 @@ describe('Spotify', () => { const tests = workflowToTests(workflows); beforeAll(() => { - nock.disableNetConnect(); - const mock = nock('https://api.spotify.com/v1'); mock .get('/search') @@ -33,10 +31,6 @@ describe('Spotify', () => { mock.get('/artists/12Chz98pHFMPJEknJQMWvI').reply(200, getArtist); }); - afterAll(() => { - nock.restore(); - }); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts b/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts index ad6a04dba30ea..c752eba158ae8 100644 --- a/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts +++ b/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts @@ -19,8 +19,6 @@ import { getWorkflowFilenames, testWorkflows } from '../../../../test/nodes/Help describe('Telegram', () => { describe('Run Telegram workflow', () => { beforeAll(() => { - nock.disableNetConnect(); - const { baseUrl } = FAKE_CREDENTIALS_DATA.telegramApi; const mock = nock(baseUrl); @@ -43,10 +41,6 @@ describe('Telegram', () => { mock.post('/bottestToken/getChatMember').reply(200, getMemberResponse); }); - afterAll(() => { - nock.restore(); - }); - const workflows = getWorkflowFilenames(__dirname); testWorkflows(workflows); }); diff --git a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts index 0d370dc67504a..68b3af299706e 100644 --- a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts +++ b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts @@ -1,5 +1,4 @@ import type { IExecuteFunctions } from 'n8n-workflow'; -import nock from 'nock'; import { theHiveApiQuery } from '../transport/queryHelper'; import * as transport from '../transport/requestApi'; @@ -17,15 +16,6 @@ jest.mock('../transport/requestApi', () => { const fakeExecuteFunction = {} as unknown as IExecuteFunctions; describe('Test TheHiveProject, theHiveApiQuery', () => { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - jest.unmock('../transport/requestApi'); - }); - it('should make list query request', async () => { const scope = { query: 'listOrganisationPage', diff --git a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts index b653d691fe065..49339e1a614ed 100644 --- a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts +++ b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts @@ -74,7 +74,6 @@ const meResult = { describe('Test Twitter Request Node', () => { beforeAll(() => { const baseUrl = 'https://api.twitter.com/2'; - nock.disableNetConnect(); //GET nock(baseUrl).get('/users/me').reply(200, meResult); @@ -83,10 +82,6 @@ describe('Test Twitter Request Node', () => { .reply(200, searchResult); }); - afterEach(() => { - nock.restore(); - }); - const workflows = getWorkflowFilenames(__dirname); testWorkflows(workflows); }); diff --git a/packages/nodes-base/test/globalSetup.ts b/packages/nodes-base/test/globalSetup.ts new file mode 100644 index 0000000000000..49629bf321304 --- /dev/null +++ b/packages/nodes-base/test/globalSetup.ts @@ -0,0 +1,5 @@ +import nock from 'nock'; + +export default async () => { + nock.disableNetConnect(); +}; diff --git a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts index 3573edf2d4390..bb200851a0e87 100644 --- a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts +++ b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts @@ -17,16 +17,11 @@ const records = [ describe('Execute Airtable Node', () => { beforeEach(() => { - nock.disableNetConnect(); nock('https://api.airtable.com/v0') .get('/appIaXXdDqS5ORr4V/tbljyBEdYzCPF0NDh?pageSize=100') .reply(200, { records }); }); - afterEach(() => { - nock.restore(); - }); - const tests: WorkflowTestData[] = [ { description: 'List Airtable Records', diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts index 017e2058f91ff..81e68b2d05227 100644 --- a/packages/nodes-base/test/nodes/Helpers.ts +++ b/packages/nodes-base/test/nodes/Helpers.ts @@ -36,7 +36,6 @@ import type { WorkflowTestData, } from 'n8n-workflow'; import { ApplicationError, ICredentialsHelper, NodeHelpers, WorkflowHooks } from 'n8n-workflow'; -import nock from 'nock'; import { tmpdir } from 'os'; import path from 'path'; @@ -225,16 +224,6 @@ export function setup(testData: WorkflowTestData[] | WorkflowTestData) { testData = [testData]; } - if (testData.some((t) => !!t.nock)) { - beforeAll(() => { - nock.disableNetConnect(); - }); - - afterAll(() => { - nock.restore(); - }); - } - const nodeTypes = new NodeTypes(); const nodes = [...new Set(testData.flatMap((data) => data.input.workflowData.nodes))]; @@ -383,7 +372,6 @@ export const workflowToTests = (workflowFiles: string[]) => { export const testWorkflows = (workflows: string[]) => { const tests = workflowToTests(workflows); - const nodeTypes = setup(tests); for (const testData of tests) { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fc766913444d5..98383c0ec5be9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -184,8 +184,8 @@ importers: specifier: ^1.7.15 version: 1.7.15 nock: - specifier: ^13.3.2 - version: 13.3.2 + specifier: ^14.0.0 + version: 14.0.0 nodemon: specifier: ^3.0.1 version: 3.0.1 @@ -4416,6 +4416,10 @@ packages: cpu: [x64] os: [win32] + '@mswjs/interceptors@0.37.5': + resolution: {integrity: sha512-AAwRb5vXFcY4L+FvZ7LZusDuZ0vEe0Zm8ohn1FM6/X7A3bj4mqmkAcGRWuvC2JwSygNwHAAmMnAI73vPHeqsHA==} + engines: {node: '>=18'} + '@n8n/codemirror-lang-sql@1.0.2': resolution: {integrity: sha512-sOf/KyewSu3Ikij0CkRtzJJDhRDZcwNCEYl8UdH4U/riL0/XZGcBD7MYofCCcKszanJZiEWRZ2KU1sRp234iMg==} @@ -4544,6 +4548,15 @@ packages: '@one-ini/wasm@0.1.1': resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==} + '@open-draft/deferred-promise@2.2.0': + resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==} + + '@open-draft/logger@0.3.0': + resolution: {integrity: sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==} + + '@open-draft/until@2.1.0': + resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==} + '@opentelemetry/api-logs@0.52.1': resolution: {integrity: sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==} engines: {node: '>=14'} @@ -9235,6 +9248,9 @@ packages: resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} engines: {node: '>= 0.4'} + is-node-process@1.2.0: + resolution: {integrity: sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==} + is-number-object@1.0.7: resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} engines: {node: '>= 0.4'} @@ -10620,9 +10636,9 @@ packages: no-case@3.0.4: resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==} - nock@13.3.2: - resolution: {integrity: sha512-CwbljitiWJhF1gL83NbanhoKs1l23TDlRioNraPTZrzZIEooPemrHRj5m0FZCPkB1ecdYCSWWGcHysJgX/ngnQ==} - engines: {node: '>= 10.13'} + nock@14.0.0: + resolution: {integrity: sha512-3Z2ZoZoYTR/y2I+NI16+6IzfZFKBX7MrADtoBAm7v/QKqxQUhKw+Dh+847PPS1j/FDutjfIXfrh3CJF74yITWg==} + engines: {node: '>= 18'} node-abi@3.54.0: resolution: {integrity: sha512-p7eGEiQil0YUV3ItH4/tBb781L5impVmmx2E9FRKF7d18XXzp4PGT2tdYMFY6wQqgxD0IwNZOiSJ0/K0fSi/OA==} @@ -10933,6 +10949,9 @@ packages: otplib@12.0.1: resolution: {integrity: sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==} + outvariant@1.4.3: + resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==} + p-cancelable@2.1.1: resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==} engines: {node: '>=8'} @@ -12301,6 +12320,9 @@ packages: strict-event-emitter-types@2.0.0: resolution: {integrity: sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==} + strict-event-emitter@0.5.1: + resolution: {integrity: sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==} + strict-uri-encode@2.0.0: resolution: {integrity: sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==} engines: {node: '>=4'} @@ -16869,6 +16891,15 @@ snapshots: '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2': optional: true + '@mswjs/interceptors@0.37.5': + dependencies: + '@open-draft/deferred-promise': 2.2.0 + '@open-draft/logger': 0.3.0 + '@open-draft/until': 2.1.0 + is-node-process: 1.2.0 + outvariant: 1.4.3 + strict-event-emitter: 0.5.1 + '@n8n/codemirror-lang-sql@1.0.2(@codemirror/view@6.26.3)(@lezer/common@1.1.0)': dependencies: '@codemirror/autocomplete': 6.16.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)(@lezer/common@1.1.0) @@ -17035,6 +17066,15 @@ snapshots: '@one-ini/wasm@0.1.1': {} + '@open-draft/deferred-promise@2.2.0': {} + + '@open-draft/logger@0.3.0': + dependencies: + is-node-process: 1.2.0 + outvariant: 1.4.3 + + '@open-draft/until@2.1.0': {} + '@opentelemetry/api-logs@0.52.1': dependencies: '@opentelemetry/api': 1.9.0 @@ -23053,6 +23093,8 @@ snapshots: is-negative-zero@2.0.3: {} + is-node-process@1.2.0: {} + is-number-object@1.0.7: dependencies: has-tostringtag: 1.0.2 @@ -24875,14 +24917,11 @@ snapshots: lower-case: 2.0.2 tslib: 2.6.2 - nock@13.3.2: + nock@14.0.0: dependencies: - debug: 4.3.4 + '@mswjs/interceptors': 0.37.5 json-stringify-safe: 5.0.1 - lodash: 4.17.21 propagate: 2.0.1 - transitivePeerDependencies: - - supports-color node-abi@3.54.0: dependencies: @@ -25251,6 +25290,8 @@ snapshots: '@otplib/preset-default': 12.0.1 '@otplib/preset-v11': 12.0.1 + outvariant@1.4.3: {} + p-cancelable@2.1.1: {} p-finally@1.0.0: {} @@ -26867,6 +26908,8 @@ snapshots: strict-event-emitter-types@2.0.0: {} + strict-event-emitter@0.5.1: {} + strict-uri-encode@2.0.0: {} string-argv@0.3.1: {}