Fix tests

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/common/__tests__/event-bus.test.ts

@@ -3,14 +3,23 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import type { AppEvent } from "../app-event-bus/event-bus";
+import type { AppEvent, AppEventBus } from "../app-event-bus/event-bus";
-import { appEventBus } from "../app-event-bus/event-bus";
 import { assert, Console } from "console";
 import { stdout, stderr } from "process";
+import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
+import appEventBusInjectable from "../app-event-bus/app-event-bus.injectable";
 
 console = new Console(stdout, stderr);
 
 describe("event bus tests", () => {
+  let appEventBus: AppEventBus;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting();
+
+    appEventBus = di.inject(appEventBusInjectable);
+  });
+
   describe("emit", () => {
     it("emits an event", () => {
       let event: AppEvent | undefined;

src/common/app-event-bus/event-bus.ts

@@ -4,6 +4,7 @@
  */
 
 import { asLegacyGlobalForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/as-legacy-global-object-for-extension-api";
+import type { EventEmitter } from "../event-emitter";
 import appEventBusInjectable from "./app-event-bus.injectable";
 
 export interface AppEvent {
@@ -13,6 +14,8 @@ export interface AppEvent {
   params?: Record<string, any>;
 }
 
+export type AppEventBus = EventEmitter<[AppEvent]>;
+
 /**
  * @deprecated Switch to using appEventBusInjectable instead
  */

src/renderer/components/+add-cluster/add-cluster.tsx

@@ -13,7 +13,7 @@ import { observer } from "mobx-react";
 import path from "path";
 import React from "react";
 import * as uuid from "uuid";
-import { appEventBus } from "../../../common/app-event-bus/event-bus";
+import type { AppEventBus } from "../../../common/app-event-bus/event-bus";
 import { loadConfigFromString, splitConfig } from "../../../common/kube-helpers";
 import { docsUrl } from "../../../common/vars";
 import { isDefined, iter } from "../../utils";
@@ -25,6 +25,7 @@ import { withInjectables } from "@ogre-tools/injectable-react";
 import getCustomKubeConfigDirectoryInjectable from "../../../common/app-paths/get-custom-kube-config-directory/get-custom-kube-config-directory.injectable";
 import type { NavigateToCatalog } from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
 import navigateToCatalogInjectable from "../../../common/front-end-routing/routes/catalog/navigate-to-catalog.injectable";
+import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable";
 
 interface Option {
   config: KubeConfig;
@@ -34,6 +35,7 @@ interface Option {
 interface Dependencies {
   getCustomKubeConfigDirectory: (directoryName: string) => string;
   navigateToCatalog: NavigateToCatalog;
+  appEventBus: AppEventBus;
 }
 
 function getContexts(config: KubeConfig): Map<string, Option> {
@@ -59,7 +61,7 @@ class NonInjectedAddCluster extends React.Component<Dependencies> {
   }
 
   componentDidMount() {
-    appEventBus.emit({ name: "cluster-add", action: "start" });
+    this.props.appEventBus.emit({ name: "cluster-add", action: "start" });
   }
 
   @computed get allErrors(): string[] {
@@ -85,7 +87,7 @@ class NonInjectedAddCluster extends React.Component<Dependencies> {
 
   addClusters = action(async () => {
     this.isWaiting = true;
-    appEventBus.emit({ name: "cluster-add", action: "click" });
+    this.props.appEventBus.emit({ name: "cluster-add", action: "click" });
 
     try {
       const absPath = this.props.getCustomKubeConfigDirectory(uuid.v4());
@@ -155,10 +157,8 @@ class NonInjectedAddCluster extends React.Component<Dependencies> {
 
 export const AddCluster = withInjectables<Dependencies>(NonInjectedAddCluster, {
   getProps: (di) => ({
-    getCustomKubeConfigDirectory: di.inject(
+    getCustomKubeConfigDirectory: di.inject(getCustomKubeConfigDirectoryInjectable),
-      getCustomKubeConfigDirectoryInjectable,
-    ),
-
     navigateToCatalog: di.inject(navigateToCatalogInjectable),
+    appEventBus: di.inject(appEventBusInjectable),
   }),
 });

src/renderer/components/+catalog/__tests__/catalog-add-button.test.tsx

@@ -3,11 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import React from "react";
-import { render, screen } from "@testing-library/react";
+import { screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import type { CatalogCategorySpec } from "../../../../common/catalog";
 import { CatalogCategory } from "../../../../common/catalog";
 import { CatalogAddButton } from "../catalog-add-button";
+import type { DiRender } from "../../test-utils/renderFor";
+import { renderFor } from "../../test-utils/renderFor";
+import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
 
 class TestCatalogCategory extends CatalogCategory {
   public readonly apiVersion = "catalog.k8slens.dev/v1alpha1";
@@ -26,6 +29,14 @@ class TestCatalogCategory extends CatalogCategory {
 }
 
 describe("CatalogAddButton", () => {
+  let render: DiRender;
+
+  beforeEach(() => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    render = renderFor(di);
+  });
+
   it("opens Add menu", async () => {
     const category = new TestCatalogCategory();