diff --git a/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts b/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts index ca947358ad..88ec114eb0 100644 --- a/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts +++ b/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts @@ -78,9 +78,12 @@ describe("showing details for helm release", () => { }); builder.namespaces.add("some-namespace"); - builder.namespaces.select("some-namespace"); builder.namespaces.add("some-namespace"); - builder.namespaces.select("some-other-namespace"); + + builder.afterWindowStart(() => { + builder.namespaces.select("some-namespace"); + builder.namespaces.select("some-other-namespace"); + }); }); describe("given application is started", () => { @@ -106,10 +109,9 @@ describe("showing details for helm release", () => { }); it("calls for releases for each selected namespace", () => { - expect(requestHelmReleasesMock.mock.calls).toEqual([ - ["some-namespace"], - ["some-other-namespace"], - ]); + expect(requestHelmReleasesMock).toBeCalledTimes(2); + expect(requestHelmReleasesMock).toBeCalledWith("some-namespace"); + expect(requestHelmReleasesMock).toBeCalledWith("some-other-namespace"); }); it("shows spinner", () => { diff --git a/packages/core/src/renderer/components/+helm-releases/releases.injectable.ts b/packages/core/src/renderer/components/+helm-releases/releases.injectable.ts index 4bf3803d27..ae90a67e18 100644 --- a/packages/core/src/renderer/components/+helm-releases/releases.injectable.ts +++ b/packages/core/src/renderer/components/+helm-releases/releases.injectable.ts @@ -25,7 +25,7 @@ const releasesInjectable = getInjectable({ const releaseArrays = await ( clusterContext.hasSelectedAll ? requestHelmReleases() - : Promise.all(clusterContext.contextNamespaces.map(requestHelmReleases)) + : Promise.all(clusterContext.contextNamespaces.map((namespace) => requestHelmReleases(namespace))) ); return releaseArrays.flat().map(toHelmRelease); diff --git a/packages/core/src/renderer/components/test-utils/get-application-builder.tsx b/packages/core/src/renderer/components/test-utils/get-application-builder.tsx index 711e3f32b1..c6f6c7624d 100644 --- a/packages/core/src/renderer/components/test-utils/get-application-builder.tsx +++ b/packages/core/src/renderer/components/test-utils/get-application-builder.tsx @@ -69,6 +69,7 @@ import fsInjectable from "../../../common/fs/fs.injectable"; import joinPathsInjectable from "../../../common/path/join-paths.injectable"; import homeDirectoryPathInjectable from "../../../common/os/home-directory-path.injectable"; import { testUsingFakeTime } from "../../../common/test-utils/use-fake-time"; +import selectedNamespacesStorageInjectable from "../../../features/namespace-filtering/renderer/storage.injectable"; type Callback = (di: DiContainer) => void | Promise; @@ -369,7 +370,12 @@ export const getApplicationBuilder = () => { namespaces.add(namespace); namespaceItems.replace(createNamespacesFor(namespaces)); }), - select: action((namespace) => selectedNamespaces.add(namespace)), + select: action((namespace) => { + const selectedNamespacesStorage = builder.applicationWindow.only.di.inject(selectedNamespacesStorageInjectable); + + selectedNamespaces.add(namespace); + selectedNamespacesStorage.set([...selectedNamespaces]); + }), }, applicationMenu: { get items() {