Merge remote-tracking branch 'origin/master' into eliminate-gst-from-app-paths

src/common/__tests__/cluster-store.test.ts

@@ -493,42 +493,9 @@ users:
     it("moves the icon into preferences", async () => {
       const storedClusterData = clusterStore.clustersList[0];
 
-      expect(storedClusterData.hasOwnProperty("icon")).toBe(false);
-      expect(storedClusterData.preferences.hasOwnProperty("icon")).toBe(true);
-      expect(
-        storedClusterData.preferences.icon.startsWith("data:;base64,"),
-      ).toBe(true);
-    });
-  });
-
-  describe("for a pre 2.7.0-beta.0 config without a workspace", () => {
-    beforeEach(() => {
-      ClusterStore.resetInstance();
-      const mockOpts = {
-        "some-directory-for-user-data": {
-          "lens-cluster-store.json": JSON.stringify({
-            __internal__: {
-              migrations: {
-                version: "2.6.6",
-              },
-            },
-            cluster1: {
-              kubeConfig: minimalValidKubeConfig,
-              preferences: {
-                terminalCWD: "/some-directory-for-user-data",
-              },
-            },
-          }),
-        },
-      };
-
-      mockFs(mockOpts);
-
-      clusterStore = mainDi.inject(clusterStoreInjectable);
-    });
-
-    afterEach(() => {
-      mockFs.restore();
+      expect(Object.prototype.hasOwnProperty.call(storedClusterData, "icon")).toBe(false);
+      expect(Object.prototype.hasOwnProperty.call(storedClusterData.preferences, "icon")).toBe(true);
+      expect(storedClusterData.preferences.icon.startsWith("data:;base64,")).toBe(true);
     });
   });
 
@@ -580,6 +547,7 @@ users:
     });
   });
 });
+
 const minimalValidKubeConfig = JSON.stringify({
   apiVersion: "v1",
   clusters: [

src/common/__tests__/user-store.test.ts

@@ -42,19 +42,19 @@ import { Console } from "console";
 import { SemVer } from "semver";
 import electron from "electron";
 import { stdout, stderr } from "process";
-import { ThemeStore } from "../../renderer/theme.store";
-import type { ClusterStoreModel } from "../cluster-store/cluster-store";
 import { getDisForUnitTesting } from "../../test-utils/get-dis-for-unit-testing";
 import userStoreInjectable from "../user-store/user-store.injectable";
 import type { DependencyInjectionContainer } from "@ogre-tools/injectable";
 import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable";
+import type { ClusterStoreModel } from "../cluster-store/cluster-store";
+import { defaultTheme } from "../vars";
 
 console = new Console(stdout, stderr);
 
 describe("user store tests", () => {
   let userStore: UserStore;
   let mainDi: DependencyInjectionContainer;
-    
+
   beforeEach(async () => {
     const dis = getDisForUnitTesting({ doGeneralOverrides: true });
 
@@ -92,7 +92,7 @@ describe("user store tests", () => {
       userStore.httpsProxy = "abcd://defg";
 
       expect(userStore.httpsProxy).toBe("abcd://defg");
-      expect(userStore.colorTheme).toBe(ThemeStore.defaultTheme);
+      expect(userStore.colorTheme).toBe(defaultTheme);
 
       userStore.colorTheme = "light";
       expect(userStore.colorTheme).toBe("light");
@@ -101,7 +101,7 @@ describe("user store tests", () => {
     it("correctly resets theme to default value", async () => {
       userStore.colorTheme = "some other theme";
       userStore.resetTheme();
-      expect(userStore.colorTheme).toBe(ThemeStore.defaultTheme);
+      expect(userStore.colorTheme).toBe(defaultTheme);
     });
 
     it("correctly calculates if the last seen version is an old release", () => {