test: fix fetch tests for Node 18

sapphiredev · Jun 1, 2022 · e92fb02 · e92fb02
1 parent 522c305
commit e92fb02
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -32,13 +32,16 @@ jobs:
   Testing:
     name: Unit Tests
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [16, 18]
     steps:
       - name: Checkout Project
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3
-      - name: Use Node.js v16
+      - name: Use Node.js v{{ matrix.version }}
         uses: actions/setup-node@17f8bd926464a1afa4c6a11669539e9c1ba77048 # tag=v3
         with:
-          node-version: 16
+          node-version: ${{ matrix.version }}
           cache: yarn
           registry-url: https://registry.npmjs.org/
       - name: Install Dependencies
@@ -48,6 +51,7 @@ jobs:
       - name: Run tests
         run: yarn test:coverage
       - name: Store code coverage report
+        if: ${{ matrix.node == '18' }}
         uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # tag=v3
         with:
           name: coverage

diff --git a/jest.config.mjs b/jest.config.mjs
@@ -4,7 +4,7 @@ const config = {
 	preset: 'ts-jest',
 	testMatch: ['<rootDir>/packages/**/tests/**/*.test.ts', '<rootDir>/packages/**/tests/**/*.test.js', '<rootDir>/packages/**/tests/**/*.test.tsx'],
 	collectCoverageFrom: ['<rootDir>/packages/**/src/**/*.ts'],
-	setupFilesAfterEnv: ['jest-extended/all'],
+	setupFilesAfterEnv: ['jest-extended/all', '<rootDir>/packages/fetch/tests/jest.setup.js'],
 	globals: {
 		'ts-jest': {
 			tsconfig: '<rootDir>/tsconfig.dev.json'

diff --git a/packages/fetch/jest.config.mjs b/packages/fetch/jest.config.mjs
@@ -4,6 +4,7 @@ const config = {
 	preset: 'ts-jest',
 	testMatch: ['<rootDir>/tests/**/*.test.ts'],
 	collectCoverageFrom: ['<rootDir>/src/**/*.ts'],
+	setupFilesAfterEnv: ['<rootDir>/tests/jest.setup.js'],
 	globals: {
 		'ts-jest': {
 			tsconfig: '<rootDir>/tests/tsconfig.json'

diff --git a/packages/fetch/tests/fetch.test.ts b/packages/fetch/tests/fetch.test.ts
@@ -1,6 +1,6 @@
 import nock from 'nock';
 import { URL as NodeUrl } from 'node:url';
-import { fetch, FetchResultTypes, QueryError, FetchMediaContentTypes } from '../dist';
+import { fetch, FetchMediaContentTypes, FetchResultTypes, QueryError } from '../dist';
 
 describe('fetch', () => {
 	let nockScopeHttp: nock.Scope;

diff --git a/packages/fetch/tests/jest.setup.js b/packages/fetch/tests/jest.setup.js
@@ -0,0 +1,9 @@
+const originalGlobalFetch = globalThis.fetch;
+
+globalThis.fetch = undefined;
+
+afterAll(() => {
+	if (originalGlobalFetch) {
+		globalThis.fetch = originalGlobalFetch;
+	}
+});