From 4d79d25b6e806732fe6db2a72392c29bf0a09143 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Fri, 1 Apr 2022 08:42:13 +0300 Subject: [PATCH] Stop running setups in unit tests without need Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- src/common/__tests__/base-store.test.ts | 4 +--- src/common/__tests__/user-store.test.ts | 10 +++------- ...verify-that-all-routes-have-route-component.test.ts | 4 +--- src/extensions/__tests__/extension-loader.test.ts | 4 +--- .../extension-discovery/extension-discovery.test.ts | 4 +--- src/main/__test__/context-handler.test.ts | 4 +--- src/main/__test__/static-file-route.test.ts | 4 +--- .../get-electron-app-path.test.ts | 4 +--- src/main/menu/electron-menu-items.test.ts | 4 +--- src/main/tray/tray-menu-items.test.ts | 2 -- src/renderer/components/+catalog/catalog.test.tsx | 4 +--- .../+extensions/__tests__/extensions.test.tsx | 4 +--- .../+cluster-role-bindings/__tests__/dialog.test.tsx | 4 +--- .../+role-bindings/__tests__/dialog.test.tsx | 4 +--- .../components/+welcome/__test__/welcome.test.tsx | 4 +--- .../+workloads-pods/__tests__/pod-tolerations.test.tsx | 4 +--- .../components/dock/__test__/dock-store.test.ts | 1 - .../components/dock/__test__/dock-tabs.test.tsx | 2 -- .../dock/logs/__test__/log-resource-selector.test.tsx | 4 +--- .../components/dock/logs/__test__/log-search.test.tsx | 4 +--- .../hotbar/__tests__/hotbar-remove-command.test.tsx | 8 ++------ .../kube-object-menu/kube-object-menu.test.tsx | 4 +--- .../kube-object-status-icon.test.tsx | 4 +--- .../components/layout/top-bar/top-bar.test.tsx | 4 +--- src/renderer/components/select/select.test.tsx | 3 +-- src/renderer/components/status-bar/status-bar.test.tsx | 4 +--- src/renderer/search-store/search-store.test.ts | 4 +--- 27 files changed, 27 insertions(+), 83 deletions(-) diff --git a/src/common/__tests__/base-store.test.ts b/src/common/__tests__/base-store.test.ts index 07cea7039e..a80d274f85 100644 --- a/src/common/__tests__/base-store.test.ts +++ b/src/common/__tests__/base-store.test.ts @@ -81,15 +81,13 @@ class TestStore extends BaseStore { describe("BaseStore", () => { let store: TestStore; - beforeEach(async () => { + beforeEach(() => { const mainDi = getDiForUnitTesting({ doGeneralOverrides: true }); mainDi.override(directoryForUserDataInjectable, () => "some-user-data-directory"); mainDi.permitSideEffects(getConfigurationFileModelInjectable); mainDi.permitSideEffects(appVersionInjectable); - await mainDi.runSetups(); - store = undefined; TestStore.resetInstance(); diff --git a/src/common/__tests__/user-store.test.ts b/src/common/__tests__/user-store.test.ts index 9fb3713be1..52e6602f75 100644 --- a/src/common/__tests__/user-store.test.ts +++ b/src/common/__tests__/user-store.test.ts @@ -33,10 +33,8 @@ import type { ClusterStoreModel } from "../cluster-store/cluster-store"; import { defaultTheme } from "../vars"; import writeFileInjectable from "../fs/write-file.injectable"; import { getDiForUnitTesting } from "../../main/getDiForUnitTesting"; -import getConfigurationFileModelInjectable - from "../get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable - from "../get-configuration-file-model/app-version/app-version.injectable"; +import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable"; +import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable"; console = new Console(stdout, stderr); @@ -44,7 +42,7 @@ describe("user store tests", () => { let userStore: UserStore; let di: DiContainer; - beforeEach(async () => { + beforeEach(() => { di = getDiForUnitTesting({ doGeneralOverrides: true }); mockFs(); @@ -55,8 +53,6 @@ describe("user store tests", () => { di.permitSideEffects(getConfigurationFileModelInjectable); di.permitSideEffects(appVersionInjectable); - - await di.runSetups(); }); afterEach(() => { diff --git a/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts b/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts index 7cf871f9b9..bf89e2546e 100644 --- a/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts +++ b/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts @@ -11,7 +11,7 @@ import type { ClusterStore } from "../cluster-store/cluster-store"; import { pipeline } from "@ogre-tools/fp"; describe("verify-that-all-routes-have-component", () => { - it("verify that routes have route component", async () => { + it("verify that routes have route component", () => { const rendererDi = getDiForUnitTesting({ doGeneralOverrides: true }); rendererDi.override( @@ -19,8 +19,6 @@ describe("verify-that-all-routes-have-component", () => { () => ({ getById: (): null => null } as unknown as ClusterStore), ); - await rendererDi.runSetups(); - const routes = rendererDi.injectMany(routeInjectionToken); const routeComponents = rendererDi.injectMany( routeSpecificComponentInjectionToken, diff --git a/src/extensions/__tests__/extension-loader.test.ts b/src/extensions/__tests__/extension-loader.test.ts index c9e145f8f9..c2f0d226bf 100644 --- a/src/extensions/__tests__/extension-loader.test.ts +++ b/src/extensions/__tests__/extension-loader.test.ts @@ -109,7 +109,7 @@ describe("ExtensionLoader", () => { let extensionLoader: ExtensionLoader; let updateExtensionStateMock: jest.Mock; - beforeEach(async () => { + beforeEach(() => { const dis = getDisForUnitTesting({ doGeneralOverrides: true }); mockFs(); @@ -118,8 +118,6 @@ describe("ExtensionLoader", () => { dis.mainDi.override(updateExtensionsStateInjectable, () => updateExtensionStateMock); - await dis.runSetups(); - extensionLoader = dis.mainDi.inject(extensionLoaderInjectable); }); diff --git a/src/extensions/extension-discovery/extension-discovery.test.ts b/src/extensions/extension-discovery/extension-discovery.test.ts index 84737a50d2..ce726fefae 100644 --- a/src/extensions/extension-discovery/extension-discovery.test.ts +++ b/src/extensions/extension-discovery/extension-discovery.test.ts @@ -48,7 +48,7 @@ const mockedFse = fse as jest.Mocked; describe("ExtensionDiscovery", () => { let extensionDiscovery: ExtensionDiscovery; - beforeEach(async () => { + beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: true }); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); @@ -56,8 +56,6 @@ describe("ExtensionDiscovery", () => { mockFs(); - await di.runSetups(); - extensionDiscovery = di.inject(extensionDiscoveryInjectable); }); diff --git a/src/main/__test__/context-handler.test.ts b/src/main/__test__/context-handler.test.ts index 7acedb7bcf..c1adbde7b3 100644 --- a/src/main/__test__/context-handler.test.ts +++ b/src/main/__test__/context-handler.test.ts @@ -75,7 +75,7 @@ const clusterStub = { describe("ContextHandler", () => { let createContextHandler: (cluster: Cluster) => ContextHandler; - beforeEach(async () => { + beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: true }); mockFs({ @@ -84,8 +84,6 @@ describe("ContextHandler", () => { di.override(createKubeAuthProxyInjectable, () => ({} as any)); - await di.runSetups(); - createContextHandler = di.inject(createContextHandlerInjectable); PrometheusProviderRegistry.createInstance(); diff --git a/src/main/__test__/static-file-route.test.ts b/src/main/__test__/static-file-route.test.ts index bd66b0b08d..28b0100666 100644 --- a/src/main/__test__/static-file-route.test.ts +++ b/src/main/__test__/static-file-route.test.ts @@ -26,11 +26,9 @@ jest.mock("electron", () => ({ describe("static-file-route", () => { let handleStaticFileRoute: Route; - beforeEach(async () => { + beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: true }); - await di.runSetups(); - handleStaticFileRoute = di.inject(staticFileRouteInjectable); }); diff --git a/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts b/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts index 2c0d19e571..68a7c545b2 100644 --- a/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts +++ b/src/main/app-paths/get-electron-app-path/get-electron-app-path.test.ts @@ -13,7 +13,7 @@ import { joinPathsFake } from "../../../common/test-utils/join-paths-fake"; describe("get-electron-app-path", () => { let getElectronAppPath: (name: string) => string | null; - beforeEach(async () => { + beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: false }); const appStub = { @@ -35,8 +35,6 @@ describe("get-electron-app-path", () => { di.override(registerChannelInjectable, () => () => undefined); di.override(joinPathsInjectable, () => joinPathsFake); - await di.runSetups(); - getElectronAppPath = di.inject(getElectronAppPathInjectable); }); diff --git a/src/main/menu/electron-menu-items.test.ts b/src/main/menu/electron-menu-items.test.ts index b1b2dd61b1..de40b4c71a 100644 --- a/src/main/menu/electron-menu-items.test.ts +++ b/src/main/menu/electron-menu-items.test.ts @@ -16,7 +16,7 @@ describe("electron-menu-items", () => { let electronMenuItems: IComputedValue; let extensionsStub: ObservableMap; - beforeEach(async () => { + beforeEach(() => { di = getDiForUnitTesting({ doGeneralOverrides: true }); extensionsStub = new ObservableMap(); @@ -26,8 +26,6 @@ describe("electron-menu-items", () => { () => computed(() => [...extensionsStub.values()]), ); - await di.runSetups(); - electronMenuItems = di.inject(electronMenuItemsInjectable); }); diff --git a/src/main/tray/tray-menu-items.test.ts b/src/main/tray/tray-menu-items.test.ts index da9f2f2745..e6ce596247 100644 --- a/src/main/tray/tray-menu-items.test.ts +++ b/src/main/tray/tray-menu-items.test.ts @@ -19,8 +19,6 @@ describe("tray-menu-items", () => { beforeEach(async () => { di = getDiForUnitTesting({ doGeneralOverrides: true }); - await di.runSetups(); - extensionsStub = new ObservableMap(); di.override( diff --git a/src/renderer/components/+catalog/catalog.test.tsx b/src/renderer/components/+catalog/catalog.test.tsx index 9a481d9535..130dca8625 100644 --- a/src/renderer/components/+catalog/catalog.test.tsx +++ b/src/renderer/components/+catalog/catalog.test.tsx @@ -88,7 +88,7 @@ describe("", () => { let emitEvent: (event: AppEvent) => void; let render: DiRender; - beforeEach(async () => { + beforeEach(() => { di = getDiForUnitTesting({ doGeneralOverrides: true }); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); @@ -96,8 +96,6 @@ describe("", () => { di.permitSideEffects(getConfigurationFileModelInjectable); di.permitSideEffects(appVersionInjectable); - await di.runSetups(); - mockFs(); UserStore.createInstance(); diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx index a29e9bb004..857b2bb379 100644 --- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx +++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx @@ -52,7 +52,7 @@ describe("Extensions", () => { let extensionDiscovery: ExtensionDiscovery; let render: DiRender; - beforeEach(async () => { + beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: true }); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); @@ -65,8 +65,6 @@ describe("Extensions", () => { "some-directory-for-user-data": {}, }); - await di.runSetups(); - render = renderFor(di); extensionLoader = di.inject(extensionLoaderInjectable); diff --git a/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx b/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx index 689b31951f..670d0b5318 100644 --- a/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx +++ b/src/renderer/components/+user-management/+cluster-role-bindings/__tests__/dialog.test.tsx @@ -17,11 +17,9 @@ jest.mock("../../+cluster-roles/store"); describe("ClusterRoleBindingDialog tests", () => { let render: DiRender; - beforeEach(async () => { + beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: true }); - await di.runSetups(); - render = renderFor(di); (clusterRolesStore as any).items = [new ClusterRole({ diff --git a/src/renderer/components/+user-management/+role-bindings/__tests__/dialog.test.tsx b/src/renderer/components/+user-management/+role-bindings/__tests__/dialog.test.tsx index 470a7006af..15fcb147a9 100644 --- a/src/renderer/components/+user-management/+role-bindings/__tests__/dialog.test.tsx +++ b/src/renderer/components/+user-management/+role-bindings/__tests__/dialog.test.tsx @@ -19,13 +19,11 @@ jest.mock("../../+cluster-roles/store"); describe("RoleBindingDialog tests", () => { let render: DiRender; - beforeEach(async () => { + beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: true }); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); - await di.runSetups(); - render = renderFor(di); (clusterRolesStore as any).items = [new ClusterRole({ diff --git a/src/renderer/components/+welcome/__test__/welcome.test.tsx b/src/renderer/components/+welcome/__test__/welcome.test.tsx index ed41dcdd31..24a6017509 100644 --- a/src/renderer/components/+welcome/__test__/welcome.test.tsx +++ b/src/renderer/components/+welcome/__test__/welcome.test.tsx @@ -30,11 +30,9 @@ describe("", () => { let di: DiContainer; let welcomeBannersStub: WelcomeBannerRegistration[]; - beforeEach(async () => { + beforeEach(() => { di = getDiForUnitTesting({ doGeneralOverrides: true }); - await di.runSetups(); - render = renderFor(di); welcomeBannersStub = []; diff --git a/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx b/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx index d970592628..ef4c03566d 100644 --- a/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx +++ b/src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx @@ -37,7 +37,7 @@ const tolerations: IToleration[] =[ describe("", () => { let render: DiRender; - beforeEach(async () => { + beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: true }); di.override( @@ -45,8 +45,6 @@ describe("", () => { () => "some-directory-for-lens-local-storage", ); - await di.runSetups(); - render = renderFor(di); }); diff --git a/src/renderer/components/dock/__test__/dock-store.test.ts b/src/renderer/components/dock/__test__/dock-store.test.ts index 88f6b8d11a..7569c45b81 100644 --- a/src/renderer/components/dock/__test__/dock-store.test.ts +++ b/src/renderer/components/dock/__test__/dock-store.test.ts @@ -28,7 +28,6 @@ describe("DockStore", () => { directoryForUserDataInjectable, () => "some-test-suite-specific-directory-for-user-data", ); - await di.runSetups(); dockStore = di.inject(dockStoreInjectable); diff --git a/src/renderer/components/dock/__test__/dock-tabs.test.tsx b/src/renderer/components/dock/__test__/dock-tabs.test.tsx index 6408b4d352..964cf7432e 100644 --- a/src/renderer/components/dock/__test__/dock-tabs.test.tsx +++ b/src/renderer/components/dock/__test__/dock-tabs.test.tsx @@ -88,8 +88,6 @@ describe("", () => { di.permitSideEffects(getConfigurationFileModelInjectable); di.permitSideEffects(appVersionInjectable); - await di.runSetups(); - dockStore = di.inject(dockStoreInjectable); UserStore.createInstance(); diff --git a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx index fcbd1f1382..b270745068 100644 --- a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx +++ b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx @@ -130,7 +130,7 @@ const getFewPodsTabData = (tabId: TabId, deps: Partial", () => { let render: DiRender; - beforeEach(async () => { + beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: true }); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); @@ -141,8 +141,6 @@ describe("", () => { render = renderFor(di); - await di.runSetups(); - mockFs({ "tmp": {}, }); diff --git a/src/renderer/components/dock/logs/__test__/log-search.test.tsx b/src/renderer/components/dock/logs/__test__/log-search.test.tsx index ab1a5b3e02..8a74127605 100644 --- a/src/renderer/components/dock/logs/__test__/log-search.test.tsx +++ b/src/renderer/components/dock/logs/__test__/log-search.test.tsx @@ -61,12 +61,10 @@ const getOnePodViewModel = (tabId: TabId, deps: Partial { let render: DiRender; - beforeEach(async () => { + beforeEach(() => { const di = getDiForUnitTesting({ doGeneralOverrides: true }); render = renderFor(di); - - await di.runSetups(); }); it("renders w/o errors", () => { diff --git a/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx b/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx index 0d4c6491b1..78d5c66cc5 100644 --- a/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx +++ b/src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx @@ -63,7 +63,7 @@ describe("", () => { UserStore.resetInstance(); }); - it("renders w/o errors", async () => { + it("renders w/o errors", () => { di.override(hotbarStoreInjectable, () => ({ hotbars: [mockHotbars["1"]], getById: (id: string) => mockHotbars[id], @@ -73,14 +73,12 @@ describe("", () => { getDisplayLabel: () => "1: Default", }) as any as HotbarStore); - await di.runSetups(); - const { container } = render(); expect(container).toBeInstanceOf(HTMLElement); }); - it("calls remove if you click on the entry", async () => { + it("calls remove if you click on the entry", () => { const removeMock = jest.fn(); di.override(hotbarStoreInjectable, () => ({ @@ -91,8 +89,6 @@ describe("", () => { getDisplayLabel: () => "1: Default", }) as any as HotbarStore); - await di.runSetups(); - const { getByText } = render( <> diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx index 1624b0b9b4..83a3cc235c 100644 --- a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx +++ b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx @@ -54,7 +54,7 @@ describe("kube-object-menu", () => { let di: DiContainer; let render: DiRender; - beforeEach(async () => { + beforeEach(() => { const MenuItemComponent: React.FC = () =>
  • Some menu item
    • ; const kubeObjectMenuItems = [ @@ -87,8 +87,6 @@ describe("kube-object-menu", () => { computed(() => [someTestExtension]), ); - await di.runSetups(); - di.override( clusterInjectable, () => diff --git a/src/renderer/components/kube-object-status-icon/kube-object-status-icon.test.tsx b/src/renderer/components/kube-object-status-icon/kube-object-status-icon.test.tsx index c2338f634c..1f53a9b62b 100644 --- a/src/renderer/components/kube-object-status-icon/kube-object-status-icon.test.tsx +++ b/src/renderer/components/kube-object-status-icon/kube-object-status-icon.test.tsx @@ -18,7 +18,7 @@ describe("kube-object-status-icon", () => { let render: DiRender; let kubeObjectStatusRegistrations: KubeObjectStatusRegistration[]; - beforeEach(async () => { + beforeEach(() => { // TODO: Make mocking of date in unit tests global global.Date.now = () => new Date("2015-10-21T07:28:00Z").getTime(); @@ -35,8 +35,6 @@ describe("kube-object-status-icon", () => { di.override(rendererExtensionsInjectable, () => computed(() => [someTestExtension]), ); - - await di.runSetups(); }); it("given no statuses, when rendered, renders as empty", () => { diff --git a/src/renderer/components/layout/top-bar/top-bar.test.tsx b/src/renderer/components/layout/top-bar/top-bar.test.tsx index a33573b32b..9355da74ae 100644 --- a/src/renderer/components/layout/top-bar/top-bar.test.tsx +++ b/src/renderer/components/layout/top-bar/top-bar.test.tsx @@ -76,15 +76,13 @@ describe("", () => { let di: DiContainer; let render: DiRender; - beforeEach(async () => { + beforeEach(() => { di = getDiForUnitTesting({ doGeneralOverrides: true }); mockFs(); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); - await di.runSetups(); - render = renderFor(di); }); diff --git a/src/renderer/components/select/select.test.tsx b/src/renderer/components/select/select.test.tsx index ee5252e8d9..f55b5834ab 100644 --- a/src/renderer/components/select/select.test.tsx +++ b/src/renderer/components/select/select.test.tsx @@ -30,13 +30,12 @@ describe("