diff --git a/jest.config.ts b/jest.config.ts index 63d0f2aab6dd44b317cbc33670304a0679681804..bf8c08d5a1f917b7c882d6a62124d19fc03eff4e 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -26,7 +26,7 @@ const config: InitialOptionsTsJest = { }, modulePathIgnorePatterns: ['<rootDir>/dist/', '/__fixtures__/'], reporters: ['default', './tmp/tools/jest-gh-reporter.js'], - setupFilesAfterEnv: ['<rootDir>/test/globals.ts'], + setupFilesAfterEnv: ['jest-extended', '<rootDir>/test/setup.ts'], snapshotSerializers: ['<rootDir>/test/newline-snapshot-serializer.ts'], testEnvironment: 'node', testRunner: 'jest-circus/runner', diff --git a/test/globals.ts b/test/setup.ts similarity index 65% rename from test/globals.ts rename to test/setup.ts index 93060e0c7984fa4e0053db138d69db87faf298c5..24f6cbf60a81daa55bd4dc1be0496982916379af 100644 --- a/test/globals.ts +++ b/test/setup.ts @@ -1,13 +1,6 @@ -import nock from 'nock'; -import 'jest-extended'; - jest.mock('../lib/platform', () => ({ platform: jest.createMockFromModule('../lib/platform/github'), initPlatform: jest.fn(), getPlatformList: jest.fn(), })); jest.mock('../lib/logger'); - -beforeAll(() => { - nock.disableNetConnect(); -}); diff --git a/tsconfig.json b/tsconfig.json index 709a98dc886a9d629828bf05e7ce26ee21da200f..0099ae0294bbe26c9fcc0d4bba5e69bbd1bfb070 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,7 @@ "resolveJsonModule": false, "noUnusedLocals": true, "lib": ["es2018"], - "types": ["node", "jest"], + "types": ["node", "jest", "jest-extended"], "allowJs": true, "checkJs": true },