Simplify test setup by removing option for global overrides (#7302)

* Remove option to doGeneralOverrides and do it always

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Override telemetry by default to optimize and simplify testing

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Simplify more usages of getDiForUnitTesting

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

* Fix code style

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

---------

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

packages/core/src/common/__tests__/cluster-store.test.ts

@@ -67,7 +67,7 @@ describe("cluster-store", () => {
   let writeFileSyncAndReturnPath: (filePath: string, contents: string) => string;
 
   beforeEach(async () => {
-    di = getDiForUnitTesting({ doGeneralOverrides: true });
+    di = getDiForUnitTesting();
 
     di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");
     di.override(directoryForTempInjectable, () => "/some-temp-directory");

packages/core/src/common/__tests__/create-resource-stack.test.ts

@@ -17,7 +17,7 @@ describe("create resource stack tests", () => {
   let cluster: KubernetesCluster;
 
   beforeEach(async () => {
-    di = getDiForUnitTesting({ doGeneralOverrides: true });
+    di = getDiForUnitTesting();
     cluster = {
       getId: () => "test-cluster",
     } as any;

packages/core/src/common/__tests__/hotbar-store.test.ts

@@ -43,7 +43,7 @@ describe("HotbarStore", () => {
   let loggerMock: jest.Mocked<Logger>;
 
   beforeEach(async () => {
-    di = getDiForUnitTesting({ doGeneralOverrides: true });
+    di = getDiForUnitTesting();
 
     testCluster = getMockCatalogEntity({
       apiVersion: "v1",

packages/core/src/common/__tests__/user-store.test.ts

@@ -21,7 +21,7 @@ describe("user store tests", () => {
   let di: DiContainer;
 
   beforeEach(async () => {
-    di = getDiForUnitTesting({ doGeneralOverrides: true });
+    di = getDiForUnitTesting();
 
     di.override(writeFileInjectable, () => () => Promise.resolve());
     di.override(directoryForUserDataInjectable, () => "/some-directory-for-user-data");

packages/core/src/common/catalog-entities/__tests__/kubernetes-cluster.test.ts

@@ -12,7 +12,7 @@ describe("kubernetesClusterCategory", () => {
   let kubernetesClusterCategory: KubernetesClusterCategory;
 
   beforeEach(() => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+    const di = getDiForUnitTesting();
 
     kubernetesClusterCategory = di.inject(kubernetesClusterCategoryInjectable);
   });

packages/core/src/common/cluster/request-namespace-list-permissions.test.ts

@@ -20,7 +20,7 @@ describe("requestNamespaceListPermissions", () => {
   let requestNamespaceListPermissions: RequestNamespaceListPermissionsFor;
 
   beforeEach(() => {
-    di = getDiForUnitTesting({ doGeneralOverrides: true });
+    di = getDiForUnitTesting();
     requestNamespaceListPermissions = di.inject(requestNamespaceListPermissionsForInjectable);
   });
 

packages/core/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts

@@ -12,7 +12,7 @@ import { pipeline } from "@ogre-tools/fp";
 
 describe("verify-that-all-routes-have-component", () => {
   it("verify that routes have route component", () => {
-    const rendererDi = getDiForUnitTesting({ doGeneralOverrides: true });
+    const rendererDi = getDiForUnitTesting();
 
     rendererDi.override(clusterStoreInjectable, () => ({
       getById: () => null,

packages/core/src/common/initializable-state/create.test.ts

@@ -15,7 +15,7 @@ describe("InitializableState tests", () => {
   let di: DiContainer;
 
   beforeEach(() => {
-    di = getDiForUnitTesting({ doGeneralOverrides: true });
+    di = getDiForUnitTesting();
   });
 
   describe("when created", () => {

packages/core/src/common/k8s-api/__tests__/api-manager.test.ts

@@ -37,7 +37,7 @@ describe("ApiManager", () => {
   let di: DiContainer;
 
   beforeEach(() => {
-    di = getDiForUnitTesting({ doGeneralOverrides: true });
+    di = getDiForUnitTesting();
 
     di.override(directoryForUserDataInjectable, () => "/some-user-store-path");
     di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs");

packages/core/src/common/k8s-api/__tests__/deployment.api.test.ts

@@ -15,7 +15,7 @@ describe("DeploymentApi", () => {
   let kubeJsonApi: jest.Mocked<KubeJsonApi>;
 
   beforeEach(() => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+    const di = getDiForUnitTesting();
 
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
     kubeJsonApi = {

packages/core/src/common/k8s-api/__tests__/kube-api-version-detection.test.ts

@@ -30,7 +30,7 @@ describe("KubeApi", () => {
   let di: DiContainer;
 
   beforeEach(async () => {
-    di = getDiForUnitTesting({ doGeneralOverrides: true });
+    di = getDiForUnitTesting();
 
     fetchMock = asyncFn();
     di.override(fetchInjectable, () => fetchMock);

packages/core/src/common/k8s-api/__tests__/kube-api.test.ts

@@ -42,7 +42,7 @@ describe("createKubeApiForRemoteCluster", () => {
   let fetchMock: AsyncFnMock<Fetch>;
 
   beforeEach(async () => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+    const di = getDiForUnitTesting();
 
     di.override(directoryForUserDataInjectable, () => "/some-user-store-path");
     di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs");
@@ -145,7 +145,7 @@ describe("KubeApi", () => {
   let di: DiContainer;
 
   beforeEach(async () => {
-    di = getDiForUnitTesting({ doGeneralOverrides: true });
+    di = getDiForUnitTesting();
 
     di.override(directoryForUserDataInjectable, () => "/some-user-store-path");
     di.override(directoryForKubeConfigsInjectable, () => "/some-kube-configs");

packages/core/src/common/k8s-api/__tests__/stateful-set.api.test.ts

@@ -15,7 +15,7 @@ describe("StatefulSetApi", () => {
   let kubeJsonApi: jest.Mocked<KubeJsonApi>;
 
   beforeEach(() => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+    const di = getDiForUnitTesting();
 
     di.override(storesAndApisCanBeCreatedInjectable, () => true);
     kubeJsonApi = {

packages/core/src/common/utils/with-error-logging/with-error-logging.test.ts

@@ -18,7 +18,7 @@ describe("with-error-logging", () => {
     let logErrorMock: jest.Mock;
 
     beforeEach(() => {
-      const di = getDiForUnitTesting({ doGeneralOverrides: true });
+      const di = getDiForUnitTesting();
 
       logErrorMock = jest.fn();
 
@@ -116,7 +116,7 @@ describe("with-error-logging", () => {
     let logErrorMock: jest.Mock;
 
     beforeEach(() => {
-      const di = getDiForUnitTesting({ doGeneralOverrides: true });
+      const di = getDiForUnitTesting();
 
       logErrorMock = jest.fn();
 

packages/core/src/common/utils/with-orphan-promise/with-orphan-promise.test.ts

@@ -14,7 +14,7 @@ describe("with orphan promise, when called", () => {
   let logErrorMock: jest.Mock;
 
   beforeEach(() => {
-    const di = getDiForUnitTesting({ doGeneralOverrides: true });
+    const di = getDiForUnitTesting();
 
     logErrorMock = jest.fn();