From 715de4637c0f534616ef725e398048c296a1f23e Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 5 May 2022 09:44:32 -0400 Subject: [PATCH] Simplify legacyRegisterApi when working in behaviour unit tests - Don't emit within main environment as there should be no auto registering there Signed-off-by: Sebastian Malton --- src/common/k8s-api/__tests__/kube-api.test.ts | 2 +- src/common/k8s-api/kube-api.ts | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/common/k8s-api/__tests__/kube-api.test.ts b/src/common/k8s-api/__tests__/kube-api.test.ts index c0b82e3606..05c9e22e09 100644 --- a/src/common/k8s-api/__tests__/kube-api.test.ts +++ b/src/common/k8s-api/__tests__/kube-api.test.ts @@ -12,7 +12,7 @@ import { PassThrough } from "stream"; import { ApiManager } from "../api-manager"; import type { FetchMock } from "jest-fetch-mock/types"; import { DeploymentApi, Ingress, IngressApi, Pod, PodApi } from "../endpoints"; -import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting"; +import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting"; import apiManagerInjectable from "../api-manager/manager.injectable"; import autoRegistrationInjectable from "../api-manager/auto-registration.injectable"; diff --git a/src/common/k8s-api/kube-api.ts b/src/common/k8s-api/kube-api.ts index d7e82d1b38..67ebacb608 100644 --- a/src/common/k8s-api/kube-api.ts +++ b/src/common/k8s-api/kube-api.ts @@ -313,14 +313,12 @@ export interface DeleteResourceDescriptor extends ResourceDescriptor { */ function legacyRegisterApi(api: KubeApi): void { // Try both just in case, because we might be in a testing environment - for (const env of [Environments.main, Environments.renderer]) { - const di = getEnvironmentSpecificLegacyGlobalDiForExtensionApi(env); + const di = getEnvironmentSpecificLegacyGlobalDiForExtensionApi(Environments.renderer); - if (di) { - const autoRegistrationEmitter = di.inject(autoRegistrationEmitterInjectable); + if (di) { + const autoRegistrationEmitter = di.inject(autoRegistrationEmitterInjectable); - autoRegistrationEmitter.emit("kubeApi", api); - } + autoRegistrationEmitter.emit("kubeApi", api); } }