hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Remove previous fix to fix last test

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2023-03-05 18:52:13 -05:00
parent 786fa39c33
commit 8cf42525e9
2 changed files with 18 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
packages/core/src/features/cluster/refresh-accessibility-technical.test.ts
View File

@ -10,20 +10,20 @@ import clusterStoreInjectable from "../../common/cluster-store/cluster-store.inj
import type { Cluster } from "../../common/cluster/cluster"; import type { Cluster } from "../../common/cluster/cluster";
import createAuthorizationApiInjectable from "../../common/cluster/create-authorization-api.injectable"; import createAuthorizationApiInjectable from "../../common/cluster/create-authorization-api.injectable";
import writeJsonFileInjectable from "../../common/fs/write-json-file.injectable"; import writeJsonFileInjectable from "../../common/fs/write-json-file.injectable";
import createContextHandlerInjectable from "../../main/context-handler/create-context-handler.injectable";
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
import url from "url";
import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injectable"; import broadcastMessageInjectable from "../../common/ipc/broadcast-message.injectable";
import type { PartialDeep } from "type-fest"; import type { PartialDeep } from "type-fest";
import { anyObject } from "jest-mock-extended"; import { anyObject } from "jest-mock-extended";
import { flushPromises } from "../../common/test-utils/flush-promises";
import createCoreApiInjectable from "../../common/cluster/create-core-api.injectable"; import createCoreApiInjectable from "../../common/cluster/create-core-api.injectable";
import type { K8sRequest } from "../../main/k8s-request.injectable"; import type { K8sRequest } from "../../main/k8s-request.injectable";
import k8sRequestInjectable from "../../main/k8s-request.injectable"; import k8sRequestInjectable from "../../main/k8s-request.injectable";
import type { DetectClusterMetadata } from "../../main/cluster-detectors/detect-cluster-metadata.injectable"; import type { DetectClusterMetadata } from "../../main/cluster-detectors/detect-cluster-metadata.injectable";
import detectClusterMetadataInjectable from "../../main/cluster-detectors/detect-cluster-metadata.injectable"; import detectClusterMetadataInjectable from "../../main/cluster-detectors/detect-cluster-metadata.injectable";
import { delay } from "../../common/utils"; import type { ClusterConnection } from "../../main/cluster/cluster-connection.injectable";
import clusterConnectionInjectable from "../../main/cluster/cluster-connection.injectable";
import { flushPromises } from "@k8slens/test-utils";
import { setTimeout } from "timers/promises";
describe("Refresh Cluster Accessibility Technical Tests", () => { describe("Refresh Cluster Accessibility Technical Tests", () => {
let builder: ApplicationBuilder; let builder: ApplicationBuilder;
@ -34,9 +34,7 @@ describe("Refresh Cluster Accessibility Technical Tests", () => {
let detectClusterMetadataMock: AsyncFnMock<DetectClusterMetadata>; let detectClusterMetadataMock: AsyncFnMock<DetectClusterMetadata>;
beforeEach(async () => { beforeEach(async () => {
builder = getApplicationBuilder({ builder = getApplicationBuilder();
fakeTime: false,
});
const mainDi = builder.mainDi; const mainDi = builder.mainDi;
@ -48,15 +46,6 @@ describe("Refresh Cluster Accessibility Technical Tests", () => {
k8sRequestMock = asyncFn(); k8sRequestMock = asyncFn();
mainDi.override(k8sRequestInjectable, () => k8sRequestMock); mainDi.override(k8sRequestInjectable, () => k8sRequestMock);
mainDi.override(createContextHandlerInjectable, () => (cluster) => {
const clusterUrl = url.parse(cluster.apiUrl);
return {
clusterUrl,
ensureServer: async () => {},
};
});
createSelfSubjectRulesReviewMock = asyncFn(); createSelfSubjectRulesReviewMock = asyncFn();
createSelfSubjectAccessReviewMock = asyncFn(); createSelfSubjectAccessReviewMock = asyncFn();
mainDi.override(createAuthorizationApiInjectable, () => () => ({ mainDi.override(createAuthorizationApiInjectable, () => () => ({
@ -74,6 +63,7 @@ describe("Refresh Cluster Accessibility Technical Tests", () => {
describe("given a cluster with no configured preferences", () => { describe("given a cluster with no configured preferences", () => {
let cluster: Cluster; let cluster: Cluster;
let clusterConnection: ClusterConnection;
let refreshPromise: Promise<void>; let refreshPromise: Promise<void>;
beforeEach(async () => { beforeEach(async () => {
@ -109,11 +99,12 @@ describe("Refresh Cluster Accessibility Technical Tests", () => {
}); });
cluster = clusterStore.getById("some-cluster-id") ?? (() => { throw new Error("missing cluster"); })(); cluster = clusterStore.getById("some-cluster-id") ?? (() => { throw new Error("missing cluster"); })();
refreshPromise = cluster.refreshAccessibilityAndMetadata(); clusterConnection = mainDi.inject(clusterConnectionInjectable, cluster);
refreshPromise = clusterConnection.refreshAccessibilityAndMetadata();
// NOTE: I don't know why these are all are required to get the tests to pass // NOTE: I don't know why these are all are required to get the tests to pass
await flushPromises(); await flushPromises();
await delay(50); await setTimeout(50);
await flushPromises(); await flushPromises();
}); });
@ -272,17 +263,11 @@ describe("Refresh Cluster Accessibility Technical Tests", () => {
}); });
it("should have the cluster displaying 'pods'", () => { it("should have the cluster displaying 'pods'", () => {
expect(cluster.shouldShowResource({ expect(cluster.resourcesToShow.has("pods")).toBe(true);
apiName: "pods",
group: "",
})).toBe(true);
}); });
it("should have the cluster displaying 'namespaces'", () => { it("should have the cluster displaying 'namespaces'", () => {
expect(cluster.shouldShowResource({ expect(cluster.resourcesToShow.has("namespaces")).toBe(true);
apiName: "namespaces",
group: "",
})).toBe(true);
}); });
}); });
}); });
@ -324,17 +309,11 @@ describe("Refresh Cluster Accessibility Technical Tests", () => {
}); });
it("should have the cluster displaying 'pods'", () => { it("should have the cluster displaying 'pods'", () => {
expect(cluster.shouldShowResource({ expect(cluster.resourcesToShow.has("pods")).toBe(false);
apiName: "pods",
group: "",
})).toBe(false);
}); });
it("should have the cluster not displaying 'namespaces'", () => { it("should have the cluster not displaying 'namespaces'", () => {
expect(cluster.shouldShowResource({ expect(cluster.resourcesToShow.has("namespaces")).toBe(false);
apiName: "namespaces",
group: "",
})).toBe(false);
}); });
}); });
}); });
@ -376,17 +355,11 @@ describe("Refresh Cluster Accessibility Technical Tests", () => {
}); });
it("should have the cluster displaying 'pods'", () => { it("should have the cluster displaying 'pods'", () => {
expect(cluster.shouldShowResource({ expect(cluster.resourcesToShow.has("pods")).toBe(true);
apiName: "pods",
group: "",
})).toBe(true);
}); });
it("should have the cluster not displaying 'namespaces'", () => { it("should have the cluster not displaying 'namespaces'", () => {
expect(cluster.shouldShowResource({ expect(cluster.resourcesToShow.has("namespaces")).toBe(false);
apiName: "namespaces",
group: "",
})).toBe(false);
}); });
}); });
}); });
@ -428,17 +401,11 @@ describe("Refresh Cluster Accessibility Technical Tests", () => {
}); });
it("should have the cluster displaying 'pods'", () => { it("should have the cluster displaying 'pods'", () => {
expect(cluster.shouldShowResource({ expect(cluster.resourcesToShow.has("pods")).toBe(true);
apiName: "pods",
group: "",
})).toBe(true);
}); });
it("should have the cluster not displaying 'namespaces'", () => { it("should have the cluster not displaying 'namespaces'", () => {
expect(cluster.shouldShowResource({ expect(cluster.resourcesToShow.has("namespaces")).toBe(false);
apiName: "namespaces",
group: "",
})).toBe(false);
}); });
}); });
}); });

2
packages/core/src/main/kubeconfig-manager/kubeconfig-manager.ts
View File

@ -85,7 +85,7 @@ export class KubeconfigManager {
return this.tempFilePath = await this.createProxyKubeconfig(); return this.tempFilePath = await this.createProxyKubeconfig();
} catch (error) { } catch (error) {
throw new Error(`Failed to creat temp config for auth-proxy: ${error}`); throw new Error(`Failed to create temp config for auth-proxy: ${error}`);
} }
} }