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

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

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

@@ -110,6 +110,10 @@ describe("cluster-store", () => {
     createCluster = mainDi.inject(createClusterInjectionToken);
   });
 
+  afterEach(() => {
+    mockFs.restore();
+  });
+
   describe("empty config", () => {
     let getCustomKubeConfigDirectory: (directoryName: string) => string;
 

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

@@ -239,7 +239,7 @@ describe("HotbarStore", () => {
       const hotbarStore = HotbarStore.getInstance();
 
       hotbarStore.add({ name: "hottest", id: "hottest" });
-      hotbarStore.activeHotbarId = "hottest";
+      hotbarStore.setActiveHotbar("hottest");
 
       const { error } = logger;
       const mocked = jest.fn();