diff --git a/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap b/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap index 723a7dcb3a..39921a654b 100644 --- a/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap +++ b/src/behaviours/__snapshots__/extension-special-characters-in-page-registrations.test.tsx.snap @@ -56,7 +56,9 @@ exports[`extension special characters in page registrations renders 1`] = `
-
+
No new updates available
@@ -127,7 +129,9 @@ exports[`extension special characters in page registrations when navigating to r
-
+
No new updates available
diff --git a/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap b/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap index deb712fdda..ba9273cc17 100644 --- a/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap +++ b/src/behaviours/__snapshots__/navigate-to-extension-page.test.tsx.snap @@ -56,7 +56,9 @@ exports[`navigate to extension page renders 1`] = `
-
+
No new updates available
@@ -127,7 +129,9 @@ exports[`navigate to extension page when extension navigates to child route rend
-
+
No new updates available
@@ -201,7 +205,9 @@ exports[`navigate to extension page when extension navigates to route with param
-
+
No new updates available
@@ -291,7 +297,9 @@ exports[`navigate to extension page when extension navigates to route without pa
-
+
No new updates available
@@ -381,7 +389,9 @@ exports[`navigate to extension page when extension navigates to route without pa
-
+
No new updates available
diff --git a/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap b/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap index 774c596c10..65c8bbd72c 100644 --- a/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap +++ b/src/behaviours/__snapshots__/navigating-between-routes.test.tsx.snap @@ -56,7 +56,9 @@ exports[`navigating between routes given route with optional path parameters whe
-
+
No new updates available
@@ -133,7 +135,9 @@ exports[`navigating between routes given route without path parameters when navi
-
+
No new updates available
diff --git a/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap b/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap index 3fecea0b6b..c7aca43db0 100644 --- a/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap +++ b/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap @@ -56,7 +56,9 @@ exports[`add-cluster - navigation using application menu renders 1`] = `
-
+
No new updates available
@@ -127,7 +129,9 @@ exports[`add-cluster - navigation using application menu when navigating to add
-
+
No new updates available
diff --git a/src/behaviours/application-update/__snapshots__/installing-update-using-tray.test.ts.snap b/src/behaviours/application-update/__snapshots__/installing-update-using-tray.test.ts.snap index ae04ddac4f..623e3785d5 100644 --- a/src/behaviours/application-update/__snapshots__/installing-update-using-tray.test.ts.snap +++ b/src/behaviours/application-update/__snapshots__/installing-update-using-tray.test.ts.snap @@ -57,7 +57,9 @@ exports[`installing update using tray when started renders 1`] = `
-
+
No new updates available
@@ -133,7 +135,9 @@ exports[`installing update using tray when started when user checks for updates
-
+
Checking for updates...
@@ -247,8 +251,10 @@ exports[`installing update using tray when started when user checks for updates
-
- Download for version some-version started +
+ Download for version some-version started...
-
- No new updates available +
+ Download of update failed
@@ -634,7 +642,9 @@ exports[`installing update using tray when started when user checks for updates
-
+
some-version is available
@@ -788,7 +798,9 @@ exports[`installing update using tray when started when user checks for updates
-
+
No new updates available
diff --git a/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap b/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap index 9228858235..0191306220 100644 --- a/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap +++ b/src/behaviours/application-update/__snapshots__/installing-update.test.ts.snap @@ -57,7 +57,9 @@ exports[`installing update when started renders 1`] = `
-
+
No new updates available
@@ -133,7 +135,9 @@ exports[`installing update when started when user checks for updates renders 1`]
-
+
Checking for updates...
@@ -206,8 +210,10 @@ exports[`installing update when started when user checks for updates when new up
-
- Download for version some-version started +
+ Download for version some-version started...
-
- No new updates available +
+ Download of update failed
@@ -391,7 +399,9 @@ exports[`installing update when started when user checks for updates when new up
-
+
some-version is available
@@ -464,7 +474,9 @@ exports[`installing update when started when user checks for updates when no new
-
+
No new updates available
diff --git a/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap b/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap index 28f2bcb59a..76d5fbc5c5 100644 --- a/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap +++ b/src/behaviours/application-update/__snapshots__/periodical-checking-of-updates.test.ts.snap @@ -57,7 +57,9 @@ exports[`periodical checking of updates given updater is enabled and configurati
-
+
No new updates available
diff --git a/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap b/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap index 4882b5c6d5..d3df093db9 100644 --- a/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap +++ b/src/behaviours/application-update/__snapshots__/selection-of-update-stability.test.ts.snap @@ -57,7 +57,9 @@ exports[`selection of update stability when started renders 1`] = `
-
+
No new updates available
diff --git a/src/behaviours/application-update/installing-update.test.ts b/src/behaviours/application-update/installing-update.test.ts index 05f2c1719c..6a8f99cc76 100644 --- a/src/behaviours/application-update/installing-update.test.ts +++ b/src/behaviours/application-update/installing-update.test.ts @@ -15,7 +15,12 @@ import asyncFn from "@async-fn/jest"; import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable"; import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable"; import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable"; +<<<<<<< HEAD import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable"; +======= +import type { AskBoolean } from "../../main/ask-boolean/ask-boolean.injectable"; +import askBooleanInjectable from "../../main/ask-boolean/ask-boolean.injectable"; +>>>>>>> 035dcaf34f (fixed tests) import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable"; describe("installing update", () => { @@ -24,20 +29,32 @@ describe("installing update", () => { let checkForPlatformUpdatesMock: AsyncFnMock; let downloadPlatformUpdateMock: AsyncFnMock; let setUpdateOnQuitMock: jest.Mock; +<<<<<<< HEAD let showInfoNotificationMock: jest.Mock; +======= + let askBooleanMock: AsyncFnMock; +>>>>>>> 035dcaf34f (fixed tests) beforeEach(() => { + jest.useFakeTimers(); + applicationBuilder = getApplicationBuilder(); - applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => { + applicationBuilder.beforeApplicationStart(({ mainDi }) => { quitAndInstallUpdateMock = jest.fn(); checkForPlatformUpdatesMock = asyncFn(); downloadPlatformUpdateMock = asyncFn(); setUpdateOnQuitMock = jest.fn(); +<<<<<<< HEAD showInfoNotificationMock = jest.fn(() => () => {}); rendererDi.override(showInfoNotificationInjectable, () => showInfoNotificationMock); +======= + askBooleanMock = asyncFn(); + + mainDi.override(askBooleanInjectable, () => askBooleanMock); +>>>>>>> 035dcaf34f (fixed tests) mainDi.override(setUpdateOnQuitInjectable, () => setUpdateOnQuitMock); mainDi.override( @@ -98,8 +115,6 @@ describe("installing update", () => { describe("when no new update is discovered", () => { beforeEach(async () => { - showInfoNotificationMock.mockClear(); - await checkForPlatformUpdatesMock.resolve({ updateWasDiscovered: false, }); @@ -108,7 +123,7 @@ describe("installing update", () => { }); it("notifies the user", () => { - expect(showInfoNotificationMock).toHaveBeenCalledWith("No new updates available"); + expect(rendered.getByTestId("auto-update-component")).toHaveTextContent("No new updates available"); }); it("does not start downloading update", () => { @@ -135,7 +150,7 @@ describe("installing update", () => { }); it("notifies the user that download is happening", () => { - expect(showInfoNotificationMock).toHaveBeenCalledWith("Download for version some-version started..."); + expect(rendered.getByTestId("auto-update-component")).toHaveTextContent("Download for version some-version started..."); }); it("renders", () => { @@ -152,7 +167,7 @@ describe("installing update", () => { }); it("notifies the user about failed download", () => { - expect(showInfoNotificationMock).toHaveBeenCalledWith("Download of update failed"); + expect(rendered.getByTestId("auto-update-component")).toHaveTextContent("Download of update failed"); }); it("renders", () => { @@ -169,6 +184,10 @@ describe("installing update", () => { expect(quitAndInstallUpdateMock).not.toHaveBeenCalled(); }); + it("notifies the user about successful download", () => { + expect(rendered.getByTestId("auto-update-component")).toHaveTextContent("some-version is available"); + }); + it("renders", () => { expect(rendered.baseElement).toMatchSnapshot(); }); diff --git a/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap index dc164f44ca..0b5dba1c80 100644 --- a/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap +++ b/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap @@ -56,7 +56,9 @@ exports[`extensions - navigation using application menu renders 1`] = `
-
+
No new updates available
@@ -127,7 +129,9 @@ exports[`extensions - navigation using application menu when navigating to exten
-
+
No new updates available
diff --git a/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap index 9be28c54f4..eb7d7c06f5 100644 --- a/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap +++ b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap @@ -57,7 +57,9 @@ exports[`add custom helm repository in preferences when navigating to preference
-
+
No new updates available
@@ -589,7 +591,9 @@ exports[`add custom helm repository in preferences when navigating to preference
-
+
No new updates available
@@ -1128,7 +1132,9 @@ exports[`add custom helm repository in preferences when navigating to preference
-
+
No new updates available
@@ -1776,7 +1782,9 @@ exports[`add custom helm repository in preferences when navigating to preference
-
+
No new updates available
@@ -2323,7 +2331,9 @@ exports[`add custom helm repository in preferences when navigating to preference
-
+
No new updates available
@@ -2971,7 +2981,9 @@ exports[`add custom helm repository in preferences when navigating to preference
-
+
No new updates available
@@ -3795,7 +3807,9 @@ exports[`add custom helm repository in preferences when navigating to preference
-
+
No new updates available
@@ -4442,7 +4456,11 @@ exports[`add custom helm repository in preferences when navigating to preference >
+ > +
+
+ > +
+
+ > +
+
+ > +
+
+ > +
+
-
+
No new updates available
@@ -589,7 +591,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
-
+
No new updates available
@@ -1128,7 +1132,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
-
+
No new updates available
@@ -1720,7 +1726,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
-
+
No new updates available
@@ -2259,7 +2267,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
-
+
No new updates available
@@ -2798,7 +2808,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
-
+
No new updates available
@@ -3330,7 +3342,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
-
+
No new updates available
@@ -3899,7 +3913,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
-
+
No new updates available
@@ -4531,7 +4547,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
-
+
No new updates available
@@ -5100,7 +5118,9 @@ exports[`add helm repository from list in preferences when navigating to prefere
-
+
No new updates available
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 5756a20e51..5bd34ef932 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 @@ -57,7 +57,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
+
No new updates available
@@ -589,7 +591,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
+
No new updates available
@@ -1121,7 +1125,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
+
No new updates available
@@ -1545,7 +1551,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
+
No new updates available
@@ -2077,7 +2085,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
+
No new updates available
@@ -2501,7 +2511,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
+
No new updates available
@@ -3033,7 +3045,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
+
No new updates available
@@ -3602,7 +3616,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
+
No new updates available
@@ -4026,7 +4042,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
+
No new updates available
@@ -4450,7 +4468,9 @@ exports[`listing active helm repositories in preferences when navigating to pref
-
+
No new updates available
diff --git a/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap index 96de0d6df3..fe71457fa3 100644 --- a/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap +++ b/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap @@ -57,7 +57,9 @@ exports[`remove helm repository from list of active repositories in preferences
-
+
No new updates available
@@ -589,7 +591,9 @@ exports[`remove helm repository from list of active repositories in preferences
-
+
No new updates available
@@ -1128,7 +1132,9 @@ exports[`remove helm repository from list of active repositories in preferences
-
+
No new updates available
@@ -1667,7 +1673,9 @@ exports[`remove helm repository from list of active repositories in preferences
-
+
No new updates available
diff --git a/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap b/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap index c2f3e8010c..44f91d2f1e 100644 --- a/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap +++ b/src/behaviours/preferences/__snapshots__/closing-preferences.test.tsx.snap @@ -56,7 +56,9 @@ exports[`preferences - closing-preferences given accessing preferences directly
-
+
No new updates available
@@ -660,7 +662,9 @@ exports[`preferences - closing-preferences given accessing preferences directly
-
+
No new updates available
@@ -868,7 +872,9 @@ exports[`preferences - closing-preferences given accessing preferences directly
-
+
No new updates available
@@ -942,7 +948,9 @@ exports[`preferences - closing-preferences given accessing preferences directly
-
+
No new updates available
@@ -1016,7 +1024,9 @@ exports[`preferences - closing-preferences given already in a page and then navi
-
+
No new updates available
@@ -1620,7 +1630,9 @@ exports[`preferences - closing-preferences given already in a page and then navi
-
+
No new updates available
@@ -1828,7 +1840,9 @@ exports[`preferences - closing-preferences given already in a page and then navi
-
+
No new updates available
@@ -2036,7 +2050,9 @@ exports[`preferences - closing-preferences given already in a page and then navi
-
+
No new updates available
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap index a53afd0f9e..5b3929d025 100644 --- a/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap +++ b/src/behaviours/preferences/__snapshots__/navigation-to-application-preferences.test.ts.snap @@ -56,7 +56,9 @@ exports[`preferences - navigation to application preferences given in some child
-
+
No new updates available
@@ -324,7 +326,9 @@ exports[`preferences - navigation to application preferences given in some child
-
+
No new updates available
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap index 3a16047bfd..f22c14c545 100644 --- a/src/behaviours/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap +++ b/src/behaviours/preferences/__snapshots__/navigation-to-editor-preferences.test.ts.snap @@ -56,7 +56,9 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
-
+
No new updates available
@@ -648,7 +650,9 @@ exports[`preferences - navigation to editor preferences given in preferences, wh
-
+
No new updates available
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap b/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap index 9bee95dd99..ae6a423409 100644 --- a/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap +++ b/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap @@ -71,7 +71,9 @@ exports[`preferences - navigation to extension specific preferences given in pre
-
+
No new updates available
@@ -313,7 +315,9 @@ exports[`preferences - navigation to extension specific preferences given in pre
-
+
No new updates available
@@ -567,7 +571,9 @@ exports[`preferences - navigation to extension specific preferences given in pre
-
+
No new updates available
@@ -821,7 +827,9 @@ exports[`preferences - navigation to extension specific preferences given in pre
-
+
No new updates available
@@ -1098,7 +1106,9 @@ exports[`preferences - navigation to extension specific preferences given in pre
-
+
No new updates available
@@ -1690,7 +1700,9 @@ exports[`preferences - navigation to extension specific preferences given in pre
-
+
No new updates available
@@ -2317,7 +2329,9 @@ exports[`preferences - navigation to extension specific preferences given in pre
-
+
No new updates available
@@ -2583,7 +2597,9 @@ exports[`preferences - navigation to extension specific preferences given in pre
-
+
No new updates available
@@ -2794,7 +2810,9 @@ exports[`preferences - navigation to extension specific preferences when navigat
-
+
No new updates available
@@ -3036,7 +3054,9 @@ exports[`preferences - navigation to extension specific preferences when navigat
-
+
No new updates available
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap index 944aaec393..988e60bad5 100644 --- a/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap +++ b/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap @@ -56,7 +56,9 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
-
+
No new updates available
@@ -648,7 +650,9 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
-
+
No new updates available
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap index 5cdf47c381..6ef6431153 100644 --- a/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap +++ b/src/behaviours/preferences/__snapshots__/navigation-to-proxy-preferences.test.ts.snap @@ -56,7 +56,9 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
-
+
No new updates available
@@ -648,7 +650,9 @@ exports[`preferences - navigation to proxy preferences given in preferences, whe
-
+
No new updates available
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap b/src/behaviours/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap index 25781cfaf1..dba75c8b76 100644 --- a/src/behaviours/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap +++ b/src/behaviours/preferences/__snapshots__/navigation-to-telemetry-preferences.test.tsx.snap @@ -56,7 +56,9 @@ exports[`preferences - navigation to telemetry preferences given URL for Sentry
-
+
No new updates available
@@ -310,7 +312,9 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
-
+
No new updates available
@@ -902,7 +906,9 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
-
+
No new updates available
@@ -1506,7 +1512,9 @@ exports[`preferences - navigation to telemetry preferences given in preferences,
-
+
No new updates available
@@ -1748,7 +1756,9 @@ exports[`preferences - navigation to telemetry preferences given no URL for Sent
-
+
No new updates available
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap index 3290e2fd68..c39e7724da 100644 --- a/src/behaviours/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap +++ b/src/behaviours/preferences/__snapshots__/navigation-to-terminal-preferences.test.ts.snap @@ -56,7 +56,9 @@ exports[`preferences - navigation to terminal preferences given in preferences,
-
+
No new updates available
@@ -648,7 +650,9 @@ exports[`preferences - navigation to terminal preferences given in preferences,
-
+
No new updates available
diff --git a/src/behaviours/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap index ec8c7f22c1..4a6b64e8f4 100644 --- a/src/behaviours/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap +++ b/src/behaviours/preferences/__snapshots__/navigation-using-application-menu.test.ts.snap @@ -56,7 +56,9 @@ exports[`preferences - navigation using application menu renders 1`] = `
-
+
No new updates available
@@ -127,7 +129,9 @@ exports[`preferences - navigation using application menu when navigating to pref
-
+
No new updates available
diff --git a/src/behaviours/preferences/__snapshots__/navigation-using-tray.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-using-tray.test.ts.snap index 036e1cc9fe..d68e2551b3 100644 --- a/src/behaviours/preferences/__snapshots__/navigation-using-tray.test.ts.snap +++ b/src/behaviours/preferences/__snapshots__/navigation-using-tray.test.ts.snap @@ -57,7 +57,9 @@ exports[`show-about-using-tray renders 1`] = `
-
+
No new updates available
@@ -130,7 +132,9 @@ exports[`show-about-using-tray when navigating using tray renders 1`] = `
-
+
No new updates available
diff --git a/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap index babd50badd..30789379c9 100644 --- a/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap +++ b/src/behaviours/welcome/__snapshots__/navigation-using-application-menu.test.ts.snap @@ -56,7 +56,9 @@ exports[`welcome - navigation using application menu renders 1`] = `
-
+
No new updates available
@@ -127,7 +129,9 @@ exports[`welcome - navigation using application menu when navigating to welcome
-
+
No new updates available
diff --git a/src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts b/src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts index 3473e845be..cf7b0cf7e0 100644 --- a/src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts +++ b/src/common/application-update/progress-of-update-download/progress-of-update-download.injectable.ts @@ -9,6 +9,7 @@ import { syncBoxInjectionToken } from "../../utils/sync-box/sync-box-injection-t export interface ProgressOfDownload { percentage: number; + failed?: string; } export type ProgressOfUpdateDownload = SyncBox; diff --git a/src/main/application-update/download-update/download-update.injectable.ts b/src/main/application-update/download-update/download-update.injectable.ts index f68b5166c0..4def3b493a 100644 --- a/src/main/application-update/download-update/download-update.injectable.ts +++ b/src/main/application-update/download-update/download-update.injectable.ts @@ -38,6 +38,7 @@ const downloadUpdateInjectable = getInjectable({ runInAction(() => { if (!downloadWasSuccessful) { + progressOfUpdateDownload.set({ percentage: 0, failed: "Download of update failed" }); discoveredVersionState.set(null); } diff --git a/src/main/ask-boolean/__snapshots__/ask-boolean.test.ts.snap b/src/main/ask-boolean/__snapshots__/ask-boolean.test.ts.snap index f6e54b9b2d..bb6809e345 100644 --- a/src/main/ask-boolean/__snapshots__/ask-boolean.test.ts.snap +++ b/src/main/ask-boolean/__snapshots__/ask-boolean.test.ts.snap @@ -12,7 +12,9 @@ exports[`ask-boolean given started when asking multiple questions renders 1`] =
-
+
No new updates available
@@ -177,7 +179,9 @@ exports[`ask-boolean given started when asking multiple questions when answering
-
+
No new updates available
@@ -274,7 +278,9 @@ exports[`ask-boolean given started when asking question renders 1`] = `
-
+
No new updates available
@@ -371,7 +377,9 @@ exports[`ask-boolean given started when asking question when user answers "no" r
-
+
No new updates available
@@ -399,7 +407,9 @@ exports[`ask-boolean given started when asking question when user answers "yes"
-
+
No new updates available
@@ -427,7 +437,9 @@ exports[`ask-boolean given started when asking question when user closes notific
-
+
No new updates available
diff --git a/src/renderer/components/status-bar/auto-update-status-bar-item.tsx b/src/renderer/components/status-bar/auto-update-component.tsx similarity index 82% rename from src/renderer/components/status-bar/auto-update-status-bar-item.tsx rename to src/renderer/components/status-bar/auto-update-component.tsx index 765d7f855f..6cb89fd87e 100644 --- a/src/renderer/components/status-bar/auto-update-status-bar-item.tsx +++ b/src/renderer/components/status-bar/auto-update-component.tsx @@ -44,33 +44,35 @@ const EndNote = ({ version, note }: EndNoteProps) => { return note(version ?? ""); }; +const DivWithTestId = (text: string) =>
{text}
; + const checking = () => ( <> -
{"Checking for updates..."}
+ {DivWithTestId("Checking for updates..." )} ); -const available = (version: string) =>
{`${version ?? "Update"} is available`}
; +const available = (version: string) => DivWithTestId(`${version ?? "Update"} is available`); -const notAvailable = () =>
{"No new updates available"}
; +const notAvailable = () => DivWithTestId("No new updates available"); const downloading = (version: string, percentDone: number) => { if ( percentDone === 0 ) { return ( <> -
{`Download for version ${version} started `}
+ {DivWithTestId(`Download for version ${version} started...`)} ); } - return
{`Download for version ${version} ${percentDone}%...`}
; + return DivWithTestId(`Download for version ${version} ${percentDone}%...`); }; -const downloadSucceeded = (version: string) =>
{`Download for version ${version} complete`}
; +const downloadFailed = (errMsg: string) => DivWithTestId(errMsg); -const idle = () => <>; +const idle = () => DivWithTestId(""); export const NonInjectedAutoUpdateComponent = observer(({ @@ -81,15 +83,13 @@ export const NonInjectedAutoUpdateComponent = observer(({ }: Dependencies) => { const discoveredVersion = discoveredVersionState.value.get(); + const { percentage, failed } = progressOfUpdateDownload.value.get(); + if (downloadingUpdateState.value.get()) { assert(discoveredVersion); - const roundedPercentage = Math.round(progressOfUpdateDownload.value.get().percentage); - - if ( roundedPercentage > 99 ) { - return ; - } + const roundedPercentage = Math.round(percentage); return downloading(discoveredVersion.version, roundedPercentage); } @@ -102,6 +102,10 @@ export const NonInjectedAutoUpdateComponent = observer(({ return ; } + if ( failed ) { + return ; + } + return ; }); diff --git a/src/renderer/components/status-bar/auto-update-status-bar-item.injectable.tsx b/src/renderer/components/status-bar/auto-update-status-bar-item.injectable.ts similarity index 77% rename from src/renderer/components/status-bar/auto-update-status-bar-item.injectable.tsx rename to src/renderer/components/status-bar/auto-update-status-bar-item.injectable.ts index 3b9e3a20a0..b9ba28de89 100644 --- a/src/renderer/components/status-bar/auto-update-status-bar-item.injectable.tsx +++ b/src/renderer/components/status-bar/auto-update-status-bar-item.injectable.ts @@ -4,15 +4,14 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import React from "react"; -import { AutoUpdateComponent } from "./auto-update-status-bar-item"; +import { AutoUpdateComponent } from "./auto-update-component"; import { statusBarItemInjectionToken } from "./status-bar-item-injection-token"; const autoUpdateStatusBarItemInjectable = getInjectable({ id: "quit-app-separator-tray-item", instantiate: () => ({ - component: () => , + component: AutoUpdateComponent, position: "left" as const, visible: computed(() => true), }),