Stop running setups in unit tests without need

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/common/__tests__/base-store.test.ts

@@ -81,15 +81,13 @@ class TestStore extends BaseStore<TestStoreModel> {
 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();
 

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
+import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable";
-  from "../get-configuration-file-model/get-configuration-file-model.injectable";
+import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.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(() => {

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,

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);
   });
 

src/extensions/extension-discovery/extension-discovery.test.ts

@@ -48,7 +48,7 @@ const mockedFse = fse as jest.Mocked<typeof fse>;
 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);
   });
 

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();

src/main/__test__/static-file-route.test.ts

@@ -26,11 +26,9 @@ jest.mock("electron", () => ({
 describe("static-file-route", () => {
   let handleStaticFileRoute: Route<Buffer>;
 
-  beforeEach(async () => {
+  beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    await di.runSetups();
-
     handleStaticFileRoute = di.inject(staticFileRouteInjectable);
   });
 

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);
   });
 

src/main/menu/electron-menu-items.test.ts

@@ -16,7 +16,7 @@ describe("electron-menu-items", () => {
   let electronMenuItems: IComputedValue<MenuRegistration[]>;
   let extensionsStub: ObservableMap<string, LensMainExtension>;
 
-  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);
   });
 

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(

src/renderer/components/+catalog/catalog.test.tsx

@@ -88,7 +88,7 @@ describe("<Catalog />", () => {
   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("<Catalog />", () => {
     di.permitSideEffects(getConfigurationFileModelInjectable);
     di.permitSideEffects(appVersionInjectable);
 
-    await di.runSetups();
-
     mockFs();
 
     UserStore.createInstance();

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);

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({

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({

src/renderer/components/+welcome/__test__/welcome.test.tsx

@@ -30,11 +30,9 @@ describe("<Welcome/>", () => {
   let di: DiContainer;
   let welcomeBannersStub: WelcomeBannerRegistration[];
 
-  beforeEach(async () => {
+  beforeEach(() => {
     di = getDiForUnitTesting({ doGeneralOverrides: true });
 
-    await di.runSetups();
-
     render = renderFor(di);
 
     welcomeBannersStub = [];

src/renderer/components/+workloads-pods/__tests__/pod-tolerations.test.tsx

@@ -37,7 +37,7 @@ const tolerations: IToleration[] =[
 describe("<PodTolerations />", () => {
   let render: DiRender;
 
-  beforeEach(async () => {
+  beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     di.override(
@@ -45,8 +45,6 @@ describe("<PodTolerations />", () => {
       () => "some-directory-for-lens-local-storage",
     );
 
-    await di.runSetups();
-
     render = renderFor(di);
   });
 

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);
 

src/renderer/components/dock/__test__/dock-tabs.test.tsx

@@ -88,8 +88,6 @@ describe("<DockTabs />", () => {
     di.permitSideEffects(getConfigurationFileModelInjectable);
     di.permitSideEffects(appVersionInjectable);
 
-    await di.runSetups();
-
     dockStore = di.inject(dockStoreInjectable);
 
     UserStore.createInstance();

src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx

@@ -130,7 +130,7 @@ const getFewPodsTabData = (tabId: TabId, deps: Partial<LogTabViewModelDependenci
 describe("<LogResourceSelector />", () => {
   let render: DiRender;
 
-  beforeEach(async () => {
+  beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
@@ -141,8 +141,6 @@ describe("<LogResourceSelector />", () => {
 
     render = renderFor(di);
 
-    await di.runSetups();
-
     mockFs({
       "tmp": {},
     });

src/renderer/components/dock/logs/__test__/log-search.test.tsx

@@ -61,12 +61,10 @@ const getOnePodViewModel = (tabId: TabId, deps: Partial<LogTabViewModelDependenc
 describe("LogSearch tests", () => {
   let render: DiRender;
 
-  beforeEach(async () => {
+  beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     render = renderFor(di);
-
-    await di.runSetups();
   });
 
   it("renders w/o errors", () => {

src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx

@@ -63,7 +63,7 @@ describe("<HotbarRemoveCommand />", () => {
     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("<HotbarRemoveCommand />", () => {
       getDisplayLabel: () => "1: Default",
     }) as any as HotbarStore);
 
-    await di.runSetups();
-
     const { container } = render(<HotbarRemoveCommand />);
 
     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("<HotbarRemoveCommand />", () => {
       getDisplayLabel: () => "1: Default",
     }) as any as HotbarStore);
 
-    await di.runSetups();
-
     const { getByText } = render(
       <>
         <HotbarRemoveCommand />

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 = () => <li>Some menu item</li>;
 
     const kubeObjectMenuItems = [
@@ -87,8 +87,6 @@ describe("kube-object-menu", () => {
       computed(() => [someTestExtension]),
     );
 
-    await di.runSetups();
-
     di.override(
       clusterInjectable,
       () =>

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", () => {

src/renderer/components/layout/top-bar/top-bar.test.tsx

@@ -76,15 +76,13 @@ describe("<TopBar/>", () => {
   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);
   });
 

src/renderer/components/select/select.test.tsx

@@ -30,13 +30,12 @@ describe("<Select />", () => {
   let di: DiContainer;
   let render: DiRender;
 
-  beforeEach(async () => {
+  beforeEach(() => {
     di = getDiForUnitTesting({ doGeneralOverrides: true });
     render = renderFor(di);
 
     mockFs();
 
-    await di.runSetups();
     di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
     di.override(rendererExtensionsInjectable, () => computed(() => [] as LensRendererExtension[]));
 

src/renderer/components/status-bar/status-bar.test.tsx

@@ -39,15 +39,13 @@ describe("<StatusBar />", () => {
   let di: DiContainer;
   let statusBarItems: IObservableArray<any>;
 
-  beforeEach(async () => {
+  beforeEach(() => {
     statusBarItems = observable.array([]);
     di = getDiForUnitTesting({ doGeneralOverrides: true });
     render = renderFor(di);
 
     di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
     di.override(rendererExtensionsInjectable, () => computed(() => [new SomeTestExtension(statusBarItems)]));
-
-    await di.runSetups();
   });
 
   it("renders w/o errors", () => {

src/renderer/search-store/search-store.test.ts

@@ -28,13 +28,11 @@ const logs = [
 describe("search store tests", () => {
   let searchStore: SearchStore;
 
-  beforeEach(async () => {
+  beforeEach(() => {
     const di = getDiForUnitTesting({ doGeneralOverrides: true });
 
     di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
 
-    await di.runSetups();
-
     searchStore = di.inject(searchStoreInjectable);
   });