Cascade different refactorings to eliminate global shared state from app paths

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

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

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

@@ -26,12 +26,9 @@ import isCompatibleExtensionInjectable from "./is-compatible-extension/is-compat
 import isCompatibleBundledExtensionInjectable from "./is-compatible-bundled-extension/is-compatible-bundled-extension.injectable";
 import extensionsStoreInjectable from "../extensions-store/extensions-store.injectable";
 import extensionInstallationStateStoreInjectable from "../extension-installation-state-store/extension-installation-state-store.injectable";
-import installExtensionInjectable
-  from "../extension-installer/install-extension/install-extension.injectable";
-import extensionPackageRootDirectoryInjectable
-  from "../extension-installer/extension-package-root-directory/extension-package-root-directory.injectable";
-import installExtensionsInjectable
-  from "../extension-installer/install-extensions/install-extensions.injectable";
+import installExtensionInjectable from "../extension-installer/install-extension/install-extension.injectable";
+import extensionPackageRootDirectoryInjectable from "../extension-installer/extension-package-root-directory/extension-package-root-directory.injectable";
+import installExtensionsInjectable from "../extension-installer/install-extensions/install-extensions.injectable";
 
 const extensionDiscoveryInjectable = getInjectable({
   instantiate: (di) =>
@@ -51,7 +48,10 @@ const extensionDiscoveryInjectable = getInjectable({
 
       installExtension: di.inject(installExtensionInjectable),
       installExtensions: di.inject(installExtensionsInjectable),
-      extensionPackageRootDirectory: di.inject(extensionPackageRootDirectoryInjectable),
+
+      extensionPackageRootDirectory: di.inject(
+        extensionPackageRootDirectoryInjectable,
+      ),
     }),
 
   lifecycle: lifecycleEnum.singleton,

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

@@ -25,11 +25,10 @@ import path from "path";
 import type { ExtensionDiscovery } from "./extension-discovery";
 import os from "os";
 import { Console } from "console";
-import { AppPaths } from "../../common/app-paths";
-import { getDiForUnitTesting } from "../getDiForUnitTesting";
 import extensionDiscoveryInjectable from "./extension-discovery.injectable";
 import extensionPackageRootDirectoryInjectable from "../extension-installer/extension-package-root-directory/extension-package-root-directory.injectable";
 import installExtensionInjectable from "../extension-installer/install-extension/install-extension.injectable";
+import { getDiForUnitTesting } from "../../main/getDiForUnitTesting";
 
 jest.setTimeout(60_000);
 
@@ -53,16 +52,22 @@ jest.mock("electron", () => ({
   },
 }));
 
-AppPaths.init();
-
 console = new Console(process.stdout, process.stderr); // fix mockFS
 const mockedWatch = watch as jest.MockedFunction<typeof watch>;
 
 describe("ExtensionDiscovery", () => {
   let extensionDiscovery: ExtensionDiscovery;
 
-  beforeEach(() => {
-    const di = getDiForUnitTesting();
+  beforeEach(async () => {
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    mockFs({
+      [`${os.homedir()}/.k8slens/extensions/my-extension/package.json`]:
+          JSON.stringify({
+            name: "my-extension",
+          }),
+    });
+
 
     di.override(installExtensionInjectable, () => () => Promise.resolve());
 
@@ -71,70 +76,62 @@ describe("ExtensionDiscovery", () => {
       () => "some-extension-packages-root",
     );
 
+    await di.runSetups();
+
     extensionDiscovery = di.inject(extensionDiscoveryInjectable);
   });
 
-  describe("with mockFs", () => {
-    beforeEach(() => {
-      mockFs({
-        [`${os.homedir()}/.k8slens/extensions/my-extension/package.json`]:
-          JSON.stringify({
-            name: "my-extension",
-          }),
-      });
-    });
+  afterEach(() => {
+    mockFs.restore();
+  });
 
-    afterEach(() => {
-      mockFs.restore();
-    });
 
-    it("emits add for added extension", async (done) => {
-      let addHandler: (filePath: string) => void;
+  it("emits add for added extension", async (done) => {
+    let addHandler: (filePath: string) => void;
 
-      const mockWatchInstance: any = {
-        on: jest.fn((event: string, handler: typeof addHandler) => {
-          if (event === "add") {
-            addHandler = handler;
-          }
+    const mockWatchInstance: any = {
+      on: jest.fn((event: string, handler: typeof addHandler) => {
+        if (event === "add") {
+          addHandler = handler;
+        }
 
-          return mockWatchInstance;
-        }),
-      };
+        return mockWatchInstance;
+      }),
+    };
 
-      mockedWatch.mockImplementationOnce(() => mockWatchInstance as any);
+    mockedWatch.mockImplementationOnce(() => mockWatchInstance as any);
 
-      // Need to force isLoaded to be true so that the file watching is started
-      extensionDiscovery.isLoaded = true;
+    // Need to force isLoaded to be true so that the file watching is started
+    extensionDiscovery.isLoaded = true;
 
-      await extensionDiscovery.watchExtensions();
+    await extensionDiscovery.watchExtensions();
 
-      extensionDiscovery.events.on("add", (extension) => {
-        expect(extension).toEqual({
-          absolutePath: expect.any(String),
-          id: path.normalize(
-            "some-extension-packages-root/node_modules/my-extension/package.json",
-          ),
-          isBundled: false,
-          isEnabled: false,
-          isCompatible: false,
-          manifest: {
-            name: "my-extension",
-          },
-          manifestPath: path.normalize(
-            "some-extension-packages-root/node_modules/my-extension/package.json",
-          ),
-        });
-
-        done();
-      });
-
-      addHandler(
-        path.join(
-          extensionDiscovery.localFolderPath,
-          "/my-extension/package.json",
+    extensionDiscovery.events.on("add", (extension) => {
+      expect(extension).toEqual({
+        absolutePath: expect.any(String),
+        id: path.normalize(
+          "some-extension-packages-root/node_modules/my-extension/package.json",
         ),
-      );
+        isBundled: false,
+        isEnabled: false,
+        isCompatible: false,
+        manifest: {
+          name: "my-extension",
+        },
+        manifestPath: path.normalize(
+          "some-extension-packages-root/node_modules/my-extension/package.json",
+        ),
+      });
+
+      done();
     });
+
+    addHandler(
+      path.join(
+        extensionDiscovery.localFolderPath,
+        "/my-extension/package.json",
+      ),
+    );
   });
 
   it("doesn't emit add for added file under extension", async (done) => {