From 0432d5040c9f72182b3f65308a94efb73c573a4a Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 10 Nov 2022 10:45:24 -0500 Subject: [PATCH] Fix tests Signed-off-by: Sebastian Malton --- src/common/fetch/fetch.injectable.ts | 2 +- src/common/k8s-api/__tests__/kube-api.test.ts | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/common/fetch/fetch.injectable.ts b/src/common/fetch/fetch.injectable.ts index 8f0cec3c2e..e320c0128a 100644 --- a/src/common/fetch/fetch.injectable.ts +++ b/src/common/fetch/fetch.injectable.ts @@ -14,7 +14,7 @@ export type Fetch = (url: string, init?: RequestInit) => Promise; const fetchInjectable = getInjectable({ id: "fetch", - instantiate: () => fetch, + instantiate: (): Fetch => fetch, causesSideEffects: true, }); diff --git a/src/common/k8s-api/__tests__/kube-api.test.ts b/src/common/k8s-api/__tests__/kube-api.test.ts index 474c876d36..2e681d4ba9 100644 --- a/src/common/k8s-api/__tests__/kube-api.test.ts +++ b/src/common/k8s-api/__tests__/kube-api.test.ts @@ -21,8 +21,7 @@ import { flushPromises } from "../../test-utils/flush-promises"; import createKubeJsonApiInjectable from "../create-kube-json-api.injectable"; import type { IKubeWatchEvent } from "../kube-watch-event"; import type { KubeJsonApiDataFor } from "../kube-object"; -import { Headers as NodeFetchHeaders } from "node-fetch"; -import type { Response } from "node-fetch"; +import type { Response, Headers as NodeFetchHeaders } from "node-fetch"; import AbortController from "abort-controller"; const createMockResponseFromString = (url: string, data: string, statusCode = 200) => { @@ -33,7 +32,7 @@ const createMockResponseFromString = (url: string, data: string, statusCode = 20 blob: jest.fn(async () => { throw new Error("blob() is not supported"); }), body: new PassThrough(), bodyUsed: false, - headers: new NodeFetchHeaders(), + headers: new Headers() as NodeFetchHeaders, json: jest.fn(async () => JSON.parse(await res.text())), ok: 200 <= statusCode && statusCode < 300, redirected: 300 <= statusCode && statusCode < 400, @@ -43,8 +42,7 @@ const createMockResponseFromString = (url: string, data: string, statusCode = 20 text: jest.fn(async () => data), type: "basic", url, - textConverted: jest.fn(async () => { throw new Error("textConverted() is not supported"); }), - timeout: 0, + formData: jest.fn(async () => { throw new Error("formData() is not supported"); }), }; return res; @@ -58,7 +56,7 @@ const createMockResponseFromStream = (url: string, stream: NodeJS.ReadableStream blob: jest.fn(async () => { throw new Error("blob() is not supported"); }), body: stream, bodyUsed: false, - headers: new NodeFetchHeaders(), + headers: new Headers() as NodeFetchHeaders, json: jest.fn(async () => JSON.parse(await res.text())), ok: 200 <= statusCode && statusCode < 300, redirected: 300 <= statusCode && statusCode < 400, @@ -76,8 +74,7 @@ const createMockResponseFromStream = (url: string, stream: NodeJS.ReadableStream }), type: "basic", url, - textConverted: jest.fn(async () => { throw new Error("textConverted() is not supported"); }), - timeout: 0, + formData: jest.fn(async () => { throw new Error("formData() is not supported"); }), }; return res;