From 6a92ee2c7cd8be1a14f95f68f3f76ec308712b92 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Fri, 19 Aug 2022 12:51:08 -0400 Subject: [PATCH] fix showing-details-for-helm-release tests Signed-off-by: Sebastian Malton --- ...wing-details-for-helm-release.test.ts.snap | 121 ++++++++++++++---- .../showing-details-for-helm-release.test.ts | 16 +-- .../test-utils/get-application-builder.tsx | 28 ++-- 3 files changed, 118 insertions(+), 47 deletions(-) diff --git a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap index 7c995becc5..a4159c60be 100644 --- a/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap +++ b/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap @@ -596,14 +596,9 @@ exports[`showing details for helm release given application is started when navi
-
- Item list is empty -
-
+ class="Spinner singleColor center" + data-testid="helm-releases-spinner" + />
-
+
Close ⌘+W
@@ -2162,6 +2160,7 @@ exports[`showing details for helm release given application is started when navi
@@ -2243,6 +2242,7 @@ exports[`showing details for helm release given application is started when navi
@@ -2323,6 +2323,7 @@ exports[`showing details for helm release given application is started when navi > -
+
Close ⌘+W
@@ -3073,6 +3076,7 @@ exports[`showing details for helm release given application is started when navi
@@ -3154,6 +3158,7 @@ exports[`showing details for helm release given application is started when navi
@@ -3234,6 +3239,7 @@ exports[`showing details for helm release given application is started when navi > -
+
Close ⌘+W
@@ -4045,6 +4053,7 @@ exports[`showing details for helm release given application is started when navi
@@ -4126,6 +4135,7 @@ exports[`showing details for helm release given application is started when navi
@@ -4206,6 +4216,7 @@ exports[`showing details for helm release given application is started when navi > -
+
Close ⌘+W
@@ -5017,6 +5030,7 @@ exports[`showing details for helm release given application is started when navi
@@ -5098,6 +5112,7 @@ exports[`showing details for helm release given application is started when navi
@@ -5178,6 +5193,7 @@ exports[`showing details for helm release given application is started when navi > -
+
Close ⌘+W
@@ -5288,6 +5306,7 @@ exports[`showing details for helm release given application is started when navi >
  • @@ -6324,6 +6344,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -6404,6 +6425,7 @@ exports[`showing details for helm release given application is started when navi > -
    +
    Close ⌘+W
    @@ -6514,6 +6538,7 @@ exports[`showing details for helm release given application is started when navi >
  • @@ -7550,6 +7576,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -7630,6 +7657,7 @@ exports[`showing details for helm release given application is started when navi > -
    +
    Close ⌘+W
    @@ -7740,6 +7770,7 @@ exports[`showing details for helm release given application is started when navi >
  • -
    +
    Close ⌘+W
    @@ -8793,6 +8827,7 @@ exports[`showing details for helm release given application is started when navi >
  • -
    +
    Close ⌘+W
    @@ -9846,6 +9884,7 @@ exports[`showing details for helm release given application is started when navi >
  • @@ -10884,6 +10924,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -10964,6 +11005,7 @@ exports[`showing details for helm release given application is started when navi > -
    +
    Close ⌘+W
    @@ -11074,6 +11118,7 @@ exports[`showing details for helm release given application is started when navi >
  • @@ -12110,6 +12156,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -12190,6 +12237,7 @@ exports[`showing details for helm release given application is started when navi > -
    +
    Close ⌘+W
    @@ -12239,6 +12289,7 @@ exports[`showing details for helm release given application is started when navi > -
    +
    Close ⌘+W
    @@ -12998,6 +13051,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -13079,6 +13133,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -13159,6 +13214,7 @@ exports[`showing details for helm release given application is started when navi > -
    +
    Close ⌘+W
    @@ -13973,6 +14031,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -14054,6 +14113,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -14134,6 +14194,7 @@ exports[`showing details for helm release given application is started when navi > -
    +
    Close ⌘+W
    @@ -14884,6 +14947,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -14965,6 +15029,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -15045,6 +15110,7 @@ exports[`showing details for helm release given application is started when navi > -
    +
    Close ⌘+W
    @@ -15856,6 +15924,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -15937,6 +16006,7 @@ exports[`showing details for helm release given application is started when navi
    @@ -16017,6 +16087,7 @@ exports[`showing details for helm release given application is started when navi > -
    +
    Close ⌘+W
    diff --git a/src/features/helm-releases/showing-details-for-helm-release.test.ts b/src/features/helm-releases/showing-details-for-helm-release.test.ts index f906d2c5ce..57bf101414 100644 --- a/src/features/helm-releases/showing-details-for-helm-release.test.ts +++ b/src/features/helm-releases/showing-details-for-helm-release.test.ts @@ -11,8 +11,6 @@ import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import type { RequestHelmReleases } from "../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; import requestHelmReleasesInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; -import namespaceStoreInjectable from "../../renderer/components/+namespaces/store.injectable"; -import type { NamespaceStore } from "../../renderer/components/+namespaces/store"; import type { RequestHelmReleaseConfiguration } from "../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; import requestHelmReleaseConfigurationInjectable from "../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; import type { RequestHelmReleaseUpdate } from "../../common/k8s-api/endpoints/helm-releases.api/request-update.injectable"; @@ -77,16 +75,12 @@ describe("showing details for helm release", () => { windowDi.override(requestHelmChartVersionsInjectable, () => requestHelmChartVersionsMock); windowDi.override(requestHelmChartReadmeInjectable, () => requestHelmChartReadmeMock); windowDi.override(requestHelmChartValuesInjectable, () => requestHelmChartValuesMock); - windowDi.override( - namespaceStoreInjectable, - () => - ({ - contextNamespaces: ["some-namespace", "some-other-namespace"], - items: [], - selectNamespaces: () => {}, - } as unknown as NamespaceStore), - ); }); + + builder.namespaces.add("some-namespace"); + builder.namespaces.select("some-namespace"); + builder.namespaces.add("some-namespace"); + builder.namespaces.select("some-other-namespace"); }); describe("given application is started", () => { diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 2ffd69c66c..0e249bd79b 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -66,6 +66,7 @@ import closeAllWindowsInjectable from "../../../main/start-main-application/lens import type { LensWindow } from "../../../main/start-main-application/lens-window/application-window/create-lens-window.injectable"; import type { FakeExtensionOptions } from "./get-extension-fake"; import { getExtensionFakeForMain, getExtensionFakeForRenderer } from "./get-extension-fake"; +import namespaceApiInjectable from "../../../common/k8s-api/endpoints/namespace.api.injectable"; type Callback = (di: DiContainer) => void | Promise; @@ -247,8 +248,8 @@ export const getApplicationBuilder = () => { let applicationHasStarted = false; - const namespaces = observable.array(); - const selectedNamespaces = observable.array(); + const namespaces = observable.set(); + const selectedNamespaces = observable.set(); const builder: ApplicationBuilder = { mainDi, @@ -311,8 +312,8 @@ export const getApplicationBuilder = () => { }, }, namespaces: { - add: action((namespace) => namespaces.push(namespace)), - select: action((namespace) => selectedNamespaces.push(namespace)), + add: action((namespace) => namespaces.add(namespace)), + select: action((namespace) => selectedNamespaces.add(namespace)), }, applicationMenu: { click: (path: string) => { @@ -476,22 +477,26 @@ export const getApplicationBuilder = () => { computed(() => catalogEntityFromCluster(clusterStub)), ); + windowDi.override(hostedClusterIdInjectable, () => "irrelevant-hosted-cluster-id"); + // TODO: Figure out a way to remove this stub. const namespaceStoreStub = { isLoaded: true, - contextNamespaces: selectedNamespaces, - allowedNamespaces: namespaces, - contextItems: [], - api: { - kind: "Namespace", + get contextNamespaces() { + return Array.from(selectedNamespaces); }, - items: [], + get allowedNamespaces() { + return Array.from(namespaces); + }, + contextItems: [], + api: windowDi.inject(namespaceApiInjectable), + items: observable.array(), selectNamespaces: () => {}, getByPath: () => undefined, pickOnlySelected: () => [], isSelectedAll: () => false, getTotalCount: () => 0, - } as unknown as NamespaceStore; + } as Partial as NamespaceStore; const clusterFrameContextFake = new ClusterFrameContext( clusterStub, @@ -503,7 +508,6 @@ export const getApplicationBuilder = () => { windowDi.override(namespaceStoreInjectable, () => namespaceStoreStub); windowDi.override(hostedClusterInjectable, () => clusterStub); - windowDi.override(hostedClusterIdInjectable, () => "irrelevant-hosted-cluster-id"); windowDi.override(clusterFrameContextInjectable, () => clusterFrameContextFake); // Todo: get rid of global state.