fix sidebar-and-tab-navigation-for-core.test.tsx

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

src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx

@@ -108,7 +108,6 @@ describe("cluster - sidebar and tab navigation for core", () => {
           const sidebarStorage = rendererDi.inject(sidebarStorageInjectable);
 
           await sidebarStorage.whenReady;
-          console.log({ ...sidebarStorage.get() });
         });
 
         rendered = await applicationBuilder.render();

src/main/getDiForUnitTesting.ts

@@ -34,9 +34,9 @@ import { getAbsolutePathFake } from "../common/test-utils/get-absolute-path-fake
 import joinPathsInjectable from "../common/path/join-paths.injectable";
 import { joinPathsFake } from "../common/test-utils/join-paths-fake";
 import hotbarStoreInjectable from "../common/hotbars/store.injectable";
+import type { GetDiForUnitTestingOptions } from "../test-utils/get-dis-for-unit-testing";
 
-export interface GetDiOptions {
+export interface GetMainDiForUnitTestingOptions extends GetDiForUnitTestingOptions {
-  doGeneralOverrides?: boolean;
   overrideHotbarStore?: boolean;
   overrideUserStore?: boolean;
   overrideExtensionsStore?: boolean;
@@ -44,7 +44,7 @@ export interface GetDiOptions {
   overrideFileSystemProvisionerStore?: boolean;
 }
 
-export function getDiForUnitTesting(opts: GetDiOptions = {}) {
+export function getDiForUnitTesting(opts: GetMainDiForUnitTestingOptions = {}) {
   const {
     doGeneralOverrides = false,
   } = opts;

src/renderer/components/test-utils/get-application-builder.tsx

@@ -72,6 +72,7 @@ interface Environment {
 export const getApplicationBuilder = () => {
   const { rendererDi, mainDi, runSetups } = getDisForUnitTesting({
     doGeneralOverrides: true,
+    overrideCreateStorage: false,
   });
 
   const dis = { rendererDi, mainDi };

src/renderer/getDiForUnitTesting.tsx

@@ -39,10 +39,19 @@ import createStorageInjectable from "./utils/create-storage/create-storage.injec
 import { observable, toJS } from "mobx";
 import type { Draft } from "immer";
 import { produce, isDraft } from "immer";
+import type { GetDiForUnitTestingOptions } from "../test-utils/get-dis-for-unit-testing";
 
-export const getDiForUnitTesting = (
+export interface GetRendererDiForUnitTestingOptions extends GetDiForUnitTestingOptions {
-  { doGeneralOverrides } = { doGeneralOverrides: false },
+  overrideCreateStorage?: boolean;
-) => {
+}
+
+export const getDiForUnitTesting = (opts: GetRendererDiForUnitTestingOptions = {}) => {
+  const {
+    doGeneralOverrides = false,
+  } = opts;
+  const {
+    overrideCreateStorage = doGeneralOverrides,
+  } = opts;
   const di = createContainer();
 
   setLegacyGlobalDiForExtensionApi(di, Environments.renderer);
@@ -64,40 +73,6 @@ export const getDiForUnitTesting = (
     di.override(isLinuxInjectable, () => false);
 
     di.override(terminalSpawningPoolInjectable, () => document.createElement("div"));
-    di.override(createStorageInjectable, () => function <MockT>(key: string, defaultValue: MockT) {
-      const srcValue = observable.box(defaultValue);
-
-      return {
-        get: () => srcValue.get(),
-        isDefaultValue: val => isEqual(val, defaultValue),
-        merge: (value: Partial<MockT> | ((draft: Draft<MockT>) => void | Partial<MockT>)) => {
-          const nextValue = produce(toJS(srcValue.get()), (draft) => {
-
-            if (typeof value == "function") {
-              const newValue = value(draft);
-
-              // merge returned plain objects from `value-as-callback` usage
-              // otherwise `draft` can be just modified inside a callback without returning any value (void)
-              if (newValue && !isDraft(newValue)) {
-                Object.assign(draft, newValue);
-              }
-            } else if (isPlainObject(value)) {
-              Object.assign(draft, value);
-            }
-
-            return draft;
-          });
-
-          srcValue.set(nextValue);
-        },
-        reset: () => srcValue.set(defaultValue),
-        set: (val: MockT) => srcValue.set(val),
-        get value() {
-          return srcValue.get();
-        },
-        whenReady: Promise.resolve(),
-      };
-    });
     di.override(hostedClusterIdInjectable, () => undefined);
 
     di.override(getAbsolutePathInjectable, () => getAbsolutePathFake);
@@ -138,6 +113,43 @@ export const getDiForUnitTesting = (
     }));
   }
 
+  if (overrideCreateStorage) {
+    di.override(createStorageInjectable, () => function <MockT>(key: string, defaultValue: MockT) {
+      const srcValue = observable.box(defaultValue);
+
+      return {
+        get: () => srcValue.get(),
+        isDefaultValue: val => isEqual(val, defaultValue),
+        merge: (value: Partial<MockT> | ((draft: Draft<MockT>) => void | Partial<MockT>)) => {
+          const nextValue = produce(toJS(srcValue.get()), (draft) => {
+
+            if (typeof value == "function") {
+              const newValue = value(draft);
+
+              // merge returned plain objects from `value-as-callback` usage
+              // otherwise `draft` can be just modified inside a callback without returning any value (void)
+              if (newValue && !isDraft(newValue)) {
+                Object.assign(draft, newValue);
+              }
+            } else if (isPlainObject(value)) {
+              Object.assign(draft, value);
+            }
+
+            return draft;
+          });
+
+          srcValue.set(nextValue);
+        },
+        reset: () => srcValue.set(defaultValue),
+        set: (val: MockT) => srcValue.set(val),
+        get value() {
+          return srcValue.get();
+        },
+        whenReady: Promise.resolve(),
+      };
+    });
+  }
+
   return di;
 };
 

src/renderer/utils/create-storage/create-storage.ts

@@ -39,16 +39,12 @@ export const createStorage = ({
 }: Dependencies): CreateStorage => (key, defaultValue) => {
   const { logPrefix } = StorageHelper;
 
-  console.log("createStorage", { key, defaultValue });
-
   if (!storage.initialized) {
     storage.initialized = true;
 
     (async () => {
       const filePath = getAbsolutePath(directoryForLensLocalStorage, `${hostedClusterId || "app"}.json`);
 
-      console.log("reading from", filePath);
-
       try {
         storage.data = (await readJsonFile(filePath)) as JsonObject;
       } catch {

src/test-utils/get-dis-for-unit-testing.ts

@@ -2,13 +2,19 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
+import type { GetRendererDiForUnitTestingOptions } from "../renderer/getDiForUnitTesting";
 import { getDiForUnitTesting as getRendererDi } from "../renderer/getDiForUnitTesting";
+import type { GetMainDiForUnitTestingOptions } from "../main/getDiForUnitTesting";
 import { getDiForUnitTesting as getMainDi } from "../main/getDiForUnitTesting";
 import { overrideIpcBridge } from "./override-ipc-bridge";
 
-export const getDisForUnitTesting = ({ doGeneralOverrides } = { doGeneralOverrides: false }) => {
+export interface GetDiForUnitTestingOptions {
-  const rendererDi = getRendererDi({ doGeneralOverrides });
+  doGeneralOverrides?: boolean;
-  const mainDi = getMainDi({ doGeneralOverrides });
+}
+
+export const getDisForUnitTesting = (opts?: GetMainDiForUnitTestingOptions & GetRendererDiForUnitTestingOptions) => {
+  const rendererDi = getRendererDi(opts);
+  const mainDi = getMainDi(opts);
 
   overrideIpcBridge({ rendererDi, mainDi });