From f40ce3b6a292f2c4c73dcf11d4a8efe4c333b7f3 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 23 Jun 2022 15:54:43 -0400 Subject: [PATCH] Fix tests Signed-off-by: Sebastian Malton --- src/main/__test__/cluster.test.ts | 3 --- src/main/__test__/kube-auth-proxy.test.ts | 3 --- src/main/__test__/kubeconfig-manager.test.ts | 2 -- .../__tests__/delete-cluster-dialog.test.tsx | 3 --- 4 files changed, 11 deletions(-) diff --git a/src/main/__test__/cluster.test.ts b/src/main/__test__/cluster.test.ts index 07ed281cfc..7e73d6112d 100644 --- a/src/main/__test__/cluster.test.ts +++ b/src/main/__test__/cluster.test.ts @@ -23,8 +23,6 @@ import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable"; import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-arch.injectable"; import createAuthorizationReviewInjectable from "../../common/cluster/authorization-review.injectable"; import createListNamespacesInjectable from "../../common/cluster/list-namespaces.injectable"; -import { readFileSync } from "fs-extra"; -import readFileSyncInjectable from "../../common/fs/read-file-sync.injectable"; console = new Console(process.stdout, process.stderr); // fix mockFS @@ -56,7 +54,6 @@ describe("create clusters", () => { setupPrometheus: jest.fn(), ensureServer: jest.fn(), } as ClusterContextHandler)); - di.override(readFileSyncInjectable, () => readFileSync); // TODO: don't bypass injectables createCluster = di.inject(createClusterInjectionToken); diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts index 9fd8c884b8..0377fc6cb9 100644 --- a/src/main/__test__/kube-auth-proxy.test.ts +++ b/src/main/__test__/kube-auth-proxy.test.ts @@ -59,8 +59,6 @@ import directoryForTempInjectable from "../../common/app-paths/directory-for-tem import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable"; import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable"; import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-arch.injectable"; -import readFileSyncInjectable from "../../common/fs/read-file-sync.injectable"; -import { readFileSync } from "fs"; console = new Console(stdout, stderr); @@ -117,7 +115,6 @@ describe("kube auth proxy tests", () => { mockFs(mockMinikubeConfig); - di.override(readFileSyncInjectable, () => readFileSync); // TODO: don't bypass injectables createCluster = di.inject(createClusterInjectionToken); createKubeAuthProxy = di.inject(createKubeAuthProxyInjectable); }); diff --git a/src/main/__test__/kubeconfig-manager.test.ts b/src/main/__test__/kubeconfig-manager.test.ts index 76d8fe29a7..ab65be5278 100644 --- a/src/main/__test__/kubeconfig-manager.test.ts +++ b/src/main/__test__/kubeconfig-manager.test.ts @@ -23,7 +23,6 @@ import directoryForUserDataInjectable from "../../common/app-paths/directory-for import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable"; import kubectlBinaryNameInjectable from "../kubectl/binary-name.injectable"; import kubectlDownloadingNormalizedArchInjectable from "../kubectl/normalized-arch.injectable"; -import readFileSyncInjectable from "../../common/fs/read-file-sync.injectable"; console = new Console(process.stdout, process.stderr); // fix mockFS @@ -89,7 +88,6 @@ describe("kubeconfig manager tests", () => { ensureServer: jest.fn(), })); - di.override(readFileSyncInjectable, () => fse.readFileSync); // TODO: don't bypass injectables const createCluster = di.inject(createClusterInjectionToken); createKubeconfigManager = di.inject(createKubeconfigManagerInjectable); diff --git a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx index 21d5620c50..67448de623 100644 --- a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx +++ b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx @@ -28,8 +28,6 @@ import hotbarStoreInjectable from "../../../../common/hotbars/store.injectable"; import normalizedPlatformInjectable from "../../../../common/vars/normalized-platform.injectable"; import kubectlBinaryNameInjectable from "../../../../main/kubectl/binary-name.injectable"; import kubectlDownloadingNormalizedArchInjectable from "../../../../main/kubectl/normalized-arch.injectable"; -import readFileSyncInjectable from "../../../../common/fs/read-file-sync.injectable"; -import { readFileSync } from "fs"; jest.mock("electron", () => ({ app: { @@ -115,7 +113,6 @@ describe("", () => { rendererDi.override(hotbarStoreInjectable, () => ({})); rendererDi.override(storesAndApisCanBeCreatedInjectable, () => true); - rendererDi.override(readFileSyncInjectable, () => readFileSync); }); const { rendererDi } = applicationBuilder.dis;