From 339572d72c667a8dde10aac67aac7f1288acac78 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Fri, 19 Aug 2022 14:44:45 -0400 Subject: [PATCH] Fix tests relating to hosted cluster id Signed-off-by: Sebastian Malton --- .../sidebar-and-tab-navigation-for-core.test.tsx | 6 ++---- ...idebar-and-tab-navigation-for-extensions.test.tsx | 12 +++++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx index 2272fc0db6..519e6bb3c8 100644 --- a/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx +++ b/src/features/cluster/sidebar-and-tab-navigation-for-core.test.tsx @@ -22,7 +22,6 @@ import pathExistsInjectable from "../../common/fs/path-exists.injectable"; import readJsonFileInjectable from "../../common/fs/read-json-file.injectable"; import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token"; import sidebarStorageInjectable from "../../renderer/components/layout/sidebar-storage/sidebar-storage.injectable"; -import hostedClusterIdInjectable from "../../renderer/cluster-frame-context/hosted-cluster-id.injectable"; import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time"; import storageSaveDelayInjectable from "../../renderer/utils/create-storage/storage-save-delay.injectable"; @@ -38,7 +37,6 @@ describe("cluster - sidebar and tab navigation for core", () => { builder.setEnvironmentToClusterFrame(); builder.beforeWindowStart((windowDi) => { - windowDi.override(hostedClusterIdInjectable, () => "some-hosted-cluster-id"); windowDi.override(storageSaveDelayInjectable, () => 250); windowDi.override( @@ -98,7 +96,7 @@ describe("cluster - sidebar and tab navigation for core", () => { const writeJsonFileFake = windowDi.inject(writeJsonFileInjectable); await writeJsonFileFake( - "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json", + "/some-directory-for-lens-local-storage/some-cluster-id.json", { sidebar: { expanded: { "some-parent-id": true }, @@ -286,7 +284,7 @@ describe("cluster - sidebar and tab navigation for core", () => { const readJsonFileFake = windowDi.inject(readJsonFileInjectable); const actual = await readJsonFileFake( - "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json", + "/some-directory-for-lens-local-storage/some-cluster-id.json", ); expect(actual).toEqual({ diff --git a/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx b/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx index 8d3de582ad..a228cc880e 100644 --- a/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx +++ b/src/features/cluster/sidebar-and-tab-navigation-for-extensions.test.tsx @@ -15,7 +15,6 @@ import pathExistsInjectable from "../../common/fs/path-exists.injectable"; import readJsonFileInjectable from "../../common/fs/read-json-file.injectable"; import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token"; import assert from "assert"; -import hostedClusterIdInjectable from "../../renderer/cluster-frame-context/hosted-cluster-id.injectable"; import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time"; import type { IObservableValue } from "mobx"; import { runInAction, computed, observable } from "mobx"; @@ -34,7 +33,6 @@ describe("cluster - sidebar and tab navigation for extensions", () => { applicationBuilder.setEnvironmentToClusterFrame(); applicationBuilder.beforeWindowStart((windowDi) => { - windowDi.override(hostedClusterIdInjectable, () => "some-hosted-cluster-id"); windowDi.override(storageSaveDelayInjectable, () => 250); windowDi.override( @@ -178,7 +176,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => { const writeJsonFileFake = windowDi.inject(writeJsonFileInjectable); await writeJsonFileFake( - "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json", + "/some-directory-for-lens-local-storage/some-cluster-id.json", { sidebar: { expanded: { "some-extension-name-some-parent-id": true }, @@ -214,7 +212,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => { const writeJsonFileFake = windowDi.inject(writeJsonFileInjectable); await writeJsonFileFake( - "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json", + "/some-directory-for-lens-local-storage/some-cluster-id.json", { sidebar: { expanded: { "some-extension-name-some-unknown-parent-id": true }, @@ -244,7 +242,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => { const writeJsonFileFake = windowDi.inject(writeJsonFileInjectable); await writeJsonFileFake( - "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json", + "/some-directory-for-lens-local-storage/some-cluster-id.json", { someThingButSidebar: {}, }, @@ -390,7 +388,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => { const pathExistsFake = windowDi.inject(pathExistsInjectable); const actual = await pathExistsFake( - "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json", + "/some-directory-for-lens-local-storage/some-cluster-id.json", ); expect(actual).toBe(false); @@ -402,7 +400,7 @@ describe("cluster - sidebar and tab navigation for extensions", () => { const readJsonFileFake = windowDi.inject(readJsonFileInjectable); const actual = await readJsonFileFake( - "/some-directory-for-lens-local-storage/some-hosted-cluster-id.json", + "/some-directory-for-lens-local-storage/some-cluster-id.json", ); expect(actual).toEqual({