diff --git a/web/src/components/core/InstallationProgress.test.tsx b/web/src/components/core/InstallationProgress.test.tsx index 46bccbb010..12bfdf4727 100644 --- a/web/src/components/core/InstallationProgress.test.tsx +++ b/web/src/components/core/InstallationProgress.test.tsx @@ -27,7 +27,6 @@ import { InstallationPhase } from "~/types/status"; import InstallationProgress from "./InstallationProgress"; import { ROOT } from "~/routes/paths"; -let isBusy = false; let phase = InstallationPhase.Install; const mockInstallerStatusChanges = jest.fn(); @@ -35,7 +34,7 @@ jest.mock("~/components/core/ProgressReport", () => () =>
ProgressReport Mo jest.mock("~/queries/status", () => ({ ...jest.requireActual("~/queries/status"), - useInstallerStatus: () => ({ isBusy, phase }), + useInstallerStatus: () => ({ phase }), useInstallerStatusChanges: () => mockInstallerStatusChanges(), })); @@ -56,10 +55,9 @@ describe("InstallationProgress", () => { }); }); - describe("when installer in the installation phase and busy", () => { + describe("when installer in the installation phase", () => { beforeEach(() => { phase = InstallationPhase.Install; - isBusy = true; }); it("renders progress report", () => { @@ -67,16 +65,4 @@ describe("InstallationProgress", () => { screen.getByText("ProgressReport Mock"); }); }); - - describe("when installer in the installation phase but not busy", () => { - beforeEach(() => { - phase = InstallationPhase.Install; - isBusy = false; - }); - - it("redirect to installation finished path", async () => { - installerRender(); - await screen.findByText(`Navigating to ${ROOT.installationFinished}`); - }); - }); }); diff --git a/web/src/components/core/InstallationProgress.tsx b/web/src/components/core/InstallationProgress.tsx index 53e38685d4..6197d8720d 100644 --- a/web/src/components/core/InstallationProgress.tsx +++ b/web/src/components/core/InstallationProgress.tsx @@ -29,17 +29,13 @@ import { Navigate } from "react-router-dom"; import { useInstallerStatus, useInstallerStatusChanges } from "~/queries/status"; function InstallationProgress() { - const { isBusy, phase } = useInstallerStatus({ suspense: true }); + const { phase } = useInstallerStatus({ suspense: true }); useInstallerStatusChanges(); if (phase !== InstallationPhase.Install) { return ; } - if (!isBusy) { - return ; - } - return ; }