Replace global state usages of ExtensionLoader with DI

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

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

@@ -27,6 +27,9 @@ import { ExtensionDiscovery } from "../extension-discovery";
 import os from "os";
 import { Console } from "console";
 import { AppPaths } from "../../common/app-paths";
+import type { ExtensionLoader } from "../extension-loader";
+import extensionLoaderInjectable from "../extension-loader/extension-loader.injectable";
+import { getDiForUnitTesting } from "../getDiForUnitTesting";
 
 jest.setTimeout(60_000);
 
@@ -62,10 +65,16 @@ console = new Console(process.stdout, process.stderr); // fix mockFS
 const mockedWatch = watch as jest.MockedFunction<typeof watch>;
 
 describe("ExtensionDiscovery", () => {
+  let extensionLoader: ExtensionLoader;
+
   beforeEach(() => {
     ExtensionDiscovery.resetInstance();
     ExtensionsStore.resetInstance();
     ExtensionsStore.createInstance();
+
+    const di = getDiForUnitTesting();
+
+    extensionLoader = di.inject(extensionLoaderInjectable);
   });
 
   describe("with mockFs", () => {
@@ -98,7 +107,9 @@ describe("ExtensionDiscovery", () => {
         (mockWatchInstance) as any,
       );
 
-      const extensionDiscovery = ExtensionDiscovery.createInstance();
+      const extensionDiscovery = ExtensionDiscovery.createInstance(
+        extensionLoader,
+      );
 
       // Need to force isLoaded to be true so that the file watching is started
       extensionDiscovery.isLoaded = true;
@@ -140,7 +151,9 @@ describe("ExtensionDiscovery", () => {
     mockedWatch.mockImplementationOnce(() =>
       (mockWatchInstance) as any,
     );
-    const extensionDiscovery = ExtensionDiscovery.createInstance();
+    const extensionDiscovery = ExtensionDiscovery.createInstance(
+      extensionLoader,
+    );
 
     // Need to force isLoaded to be true so that the file watching is started
     extensionDiscovery.isLoaded = true;

src/extensions/__tests__/extension-loader.test.ts

@@ -19,11 +19,13 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { ExtensionLoader } from "../extension-loader";
+import type { ExtensionLoader } from "../extension-loader";
 import { ipcRenderer } from "electron";
 import { ExtensionsStore } from "../extensions-store";
 import { Console } from "console";
 import { stdout, stderr } from "process";
+import { getDiForUnitTesting } from "../getDiForUnitTesting";
+import extensionLoaderInjectable from "../extension-loader/extension-loader.injectable";
 
 console = new Console(stdout, stderr);
 
@@ -128,13 +130,15 @@ jest.mock(
 );
 
 describe("ExtensionLoader", () => {
+  let extensionLoader: ExtensionLoader;
+
   beforeEach(() => {
-    ExtensionLoader.resetInstance();
+    const di = getDiForUnitTesting();
+
+    extensionLoader = di.inject(extensionLoaderInjectable);
   });
 
-  it.only("renderer updates extension after ipc broadcast", async (done) => {
-    const extensionLoader = ExtensionLoader.createInstance();
-
+  it.only("renderer updates extension after ipc broadcast", async done => {
     expect(extensionLoader.userExtensions).toMatchInlineSnapshot(`Map {}`);
 
     await extensionLoader.init();
@@ -178,8 +182,6 @@ describe("ExtensionLoader", () => {
     // Disable sending events in this test
     (ipcRenderer.on as any).mockImplementation();
 
-    const extensionLoader = ExtensionLoader.createInstance();
-
     await extensionLoader.init();
 
     expect(ExtensionsStore.getInstance().mergeState).not.toHaveBeenCalled();
@@ -194,6 +196,7 @@ describe("ExtensionLoader", () => {
       "manifest/path2": {
         enabled: true,
         name: "TestExtension2",
-      }});
+      },
+    });
   });
 });