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/renderer/components/+extensions/__tests__/extensions.test.tsx

@@ -30,13 +30,13 @@ import { ConfirmDialog } from "../../confirm-dialog";
 import { Extensions } from "../extensions";
 import mockFs from "mock-fs";
 import { mockWindow } from "../../../../../__mocks__/windowMock";
-import { AppPaths } from "../../../../common/app-paths";
-import extensionLoaderInjectable
-  from "../../../../extensions/extension-loader/extension-loader.injectable";
+import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
 import { getDiForUnitTesting } from "../../getDiForUnitTesting";
 import { DiRender, renderFor } from "../../test-utils/renderFor";
-import extensionDiscoveryInjectable
-  from "../../../../extensions/extension-discovery/extension-discovery.injectable";
+import extensionDiscoveryInjectable from "../../../../extensions/extension-discovery/extension-discovery.injectable";
+import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import directoryForDownloadsInjectable
+  from "../../../../common/app-paths/directory-for-downloads/directory-for-downloads.injectable";
 
 mockWindow();
 
@@ -59,42 +59,28 @@ jest.mock("../../../../common/utils/downloadFile", () => ({
 
 jest.mock("../../../../common/utils/tar");
 
-jest.mock("electron", () => ({
-  app: {
-    getVersion: () => "99.99.99",
-    getName: () => "lens",
-    setName: jest.fn(),
-    setPath: jest.fn(),
-    getPath: () => "tmp",
-    getLocale: () => "en",
-    setLoginItemSettings: jest.fn(),
-  },
-  ipcMain: {
-    on: jest.fn(),
-    handle: jest.fn(),
-  },
-}));
-
-AppPaths.init();
-
 describe("Extensions", () => {
   let extensionLoader: ExtensionLoader;
   let extensionDiscovery: ExtensionDiscovery;
   let render: DiRender;
 
   beforeEach(async () => {
-    const di = getDiForUnitTesting();
+    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+
+    di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data");
+    di.override(directoryForDownloadsInjectable, () => "some-directory-for-downloads");
+
+    mockFs({
+      "some-directory-for-user-data": {},
+    });
+
+    await di.runSetups();
 
     render = renderFor(di);
 
     extensionLoader = di.inject(extensionLoaderInjectable);
-
     extensionDiscovery = di.inject(extensionDiscoveryInjectable);
 
-    mockFs({
-      "tmp": {},
-    });
-
     extensionLoader.addExtension({
       id: "extensionId",
       manifest: {

src/renderer/components/+extensions/install-from-select-file-dialog/install-from-select-file-dialog.injectable.ts

@@ -21,11 +21,13 @@
 import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
 import { installFromSelectFileDialog } from "./install-from-select-file-dialog";
 import attemptInstallsInjectable from "../attempt-installs/attempt-installs.injectable";
+import directoryForDownloadsInjectable from "../../../../common/app-paths/directory-for-downloads/directory-for-downloads.injectable";
 
 const installFromSelectFileDialogInjectable = getInjectable({
   instantiate: (di) =>
     installFromSelectFileDialog({
       attemptInstalls: di.inject(attemptInstallsInjectable),
+      directoryForDownloads: di.inject(directoryForDownloadsInjectable),
     }),
 
   lifecycle: lifecycleEnum.singleton,

src/renderer/components/+extensions/install-from-select-file-dialog/install-from-select-file-dialog.ts

@@ -19,18 +19,18 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 import { dialog } from "../../../remote-helpers";
-import { AppPaths } from "../../../../common/app-paths";
 import { supportedExtensionFormats } from "../supported-extension-formats";
 
 interface Dependencies {
   attemptInstalls: (filePaths: string[]) => Promise<void>
+  directoryForDownloads: string
 }
 
 export const installFromSelectFileDialog =
-  ({ attemptInstalls }: Dependencies) =>
+  ({ attemptInstalls, directoryForDownloads }: Dependencies) =>
     async () => {
       const { canceled, filePaths } = await dialog.showOpenDialog({
-        defaultPath: AppPaths.get("downloads"),
+        defaultPath: directoryForDownloads,
         properties: ["openFile", "multiSelections"],
         message: `Select extensions to install (formats: ${supportedExtensionFormats.join(
           ", ",