From 467698bb83f93117f2b5dd61caa35e1ea78b1832 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Mon, 6 Jun 2022 15:59:27 +0300 Subject: [PATCH] Make some tests more deterministic by mocking tooltips Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- ...tory-from-list-in-preferences.test.ts.snap | 153 ++-- ...ive-repository-in-preferences.test.ts.snap | 62 +- ...m-repositories-in-preferences.test.ts.snap | 826 ++++++++++++++++-- ...epository-from-list-in-preferences.test.ts | 6 + ...f-active-repository-in-preferences.test.ts | 5 + ...e-helm-repositories-in-preferences.test.ts | 9 +- 6 files changed, 865 insertions(+), 196 deletions(-) diff --git a/src/behaviours/helm-charts/__snapshots__/activate-helm-repository-from-list-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/activate-helm-repository-from-list-in-preferences.test.ts.snap index 7433d2fe39..11cefe5481 100644 --- a/src/behaviours/helm-charts/__snapshots__/activate-helm-repository-from-list-in-preferences.test.ts.snap +++ b/src/behaviours/helm-charts/__snapshots__/activate-helm-repository-from-list-in-preferences.test.ts.snap @@ -397,12 +397,6 @@ exports[`activate helm repository from list in preferences when navigating to pr -
+
+
@@ -960,12 +962,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
-
+
delete -
+
@@ -1537,12 +1540,6 @@ exports[`activate helm repository from list in preferences when navigating to pr -
+
delete -
+
@@ -2167,12 +2171,6 @@ exports[`activate helm repository from list in preferences when navigating to pr -
+
delete -
+
@@ -2744,12 +2749,6 @@ exports[`activate helm repository from list in preferences when navigating to pr -
+
+
@@ -3307,12 +3314,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
-
+
delete -
delete -
+
@@ -3913,12 +3920,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
-
+
delete -
delete -
+
@@ -4582,12 +4589,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
-
+
delete -
delete -
+
@@ -5188,12 +5195,6 @@ exports[`activate helm repository from list in preferences when navigating to pr
-
+
+
diff --git a/src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap index 7afbf7ef6b..752dc53ad4 100644 --- a/src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap +++ b/src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap @@ -397,12 +397,6 @@ exports[`deactivate helm repository from list of active repositories in preferen
-
+
+
@@ -960,12 +962,6 @@ exports[`deactivate helm repository from list of active repositories in preferen
-
+
delete -
+
@@ -1537,12 +1540,6 @@ exports[`deactivate helm repository from list of active repositories in preferen -
+
delete -
+
@@ -2114,12 +2118,6 @@ exports[`deactivate helm repository from list of active repositories in preferen -
+
+
diff --git a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap index c225666a26..e1b8a0c51f 100644 --- a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap +++ b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap @@ -397,12 +397,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
-
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+
+
+
+
@@ -869,12 +962,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
-
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+
+
+
+
@@ -1341,12 +1527,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
-
-
+
+
+ +
- some-repository -
-
- some-repository-url -
-
-
-
- some-other-repository -
-
- some-other-repository-url +
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+
+ some-repository +
+
+ some-repository-url +
+ + + delete + + +
+
+
+ some-other-repository +
+
+ some-other-repository-url +
+ + + delete + + +
+
+
@@ -1839,12 +2133,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
-
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+
+
+
+
@@ -2311,12 +2698,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
-
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+
+
+
+
@@ -2783,12 +3263,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
-
+
- The repositories have not been added yet + + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+
+ The repositories have not been added yet +
+
+
@@ -3261,12 +3819,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
-
+
- The repositories have not been added yet + + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+
+ The repositories have not been added yet +
+
+
diff --git a/src/behaviours/helm-charts/activate-helm-repository-from-list-in-preferences.test.ts b/src/behaviours/helm-charts/activate-helm-repository-from-list-in-preferences.test.ts index 80029efd78..cae953f63c 100644 --- a/src/behaviours/helm-charts/activate-helm-repository-from-list-in-preferences.test.ts +++ b/src/behaviours/helm-charts/activate-helm-repository-from-list-in-preferences.test.ts @@ -13,6 +13,12 @@ import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/ge import type { HelmRepo } from "../../common/helm-repo"; import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; +// TODO: Make tooltips free of side effects by making it deterministic +jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: (target: any) => target, +})); + + describe("activate helm repository from list in preferences", () => { let applicationBuilder: ApplicationBuilder; let rendered: RenderResult; diff --git a/src/behaviours/helm-charts/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts b/src/behaviours/helm-charts/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts index c71adf628c..3f664ca528 100644 --- a/src/behaviours/helm-charts/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts +++ b/src/behaviours/helm-charts/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts @@ -14,6 +14,11 @@ import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/ge import type { HelmRepo } from "../../common/helm-repo"; import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; +// TODO: Make tooltips free of side effects by making it deterministic +jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: (target: any) => target, +})); + describe("deactivate helm repository from list of active repositories in preferences", () => { let applicationBuilder: ApplicationBuilder; let rendered: RenderResult; diff --git a/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts b/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts index 711acf67e6..489956cd72 100644 --- a/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts +++ b/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts @@ -14,6 +14,12 @@ import execFileInjectable from "../../common/fs/exec-file.injectable"; import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; import loggerInjectable from "../../common/logger.injectable"; import type { Logger } from "../../common/logger"; +import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; + +// TODO: Make tooltips free of side effects by making it deterministic +jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: (target: any) => target, +})); describe("listing active helm repositories in preferences", () => { let applicationBuilder: ApplicationBuilder; @@ -30,7 +36,8 @@ describe("listing active helm repositories in preferences", () => { loggerStub = { warn: jest.fn() } as unknown as Logger; - applicationBuilder.beforeApplicationStart(({ mainDi }) => { + applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => { + rendererDi.override(callForPublicHelmRepositoriesInjectable, () => async () => []); mainDi.override(readYamlFileInjectable, () => readYamlFileMock); mainDi.override(execFileInjectable, () => execFileMock); mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path");