1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

Fix restarting and installing update when pressing update button

Co-authored-by: Alex Andreev <alex.andreev.email@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-06-28 12:30:30 +03:00
parent 05a6916d9f
commit 3665b5ffdf
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
2 changed files with 6 additions and 5 deletions

View File

@ -20,8 +20,8 @@ import openAppContextMenuInjectable from "../../renderer/components/layout/top-b
import toggleMaximizeWindowInjectable from "../../renderer/components/layout/top-bar/toggle-maximize-window.injectable"; import toggleMaximizeWindowInjectable from "../../renderer/components/layout/top-bar/toggle-maximize-window.injectable";
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
import restartAndInstallUpdateInjectable from "../../renderer/components/update-button/restart-and-install-update.injectable";
import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable"; import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable";
import quitAndInstallUpdateInjectable from "../../main/application-update/quit-and-install-update.injectable";
function daysToMilliseconds(days: number) { function daysToMilliseconds(days: number) {
return Math.round(days * 24 * 60 * 60 * 1000); return Math.round(days * 24 * 60 * 60 * 1000);
@ -31,7 +31,7 @@ describe("encourage user to update when sufficient time passed since update was
let applicationBuilder: ApplicationBuilder; let applicationBuilder: ApplicationBuilder;
let checkForPlatformUpdatesMock: AsyncFnMock<CheckForPlatformUpdates>; let checkForPlatformUpdatesMock: AsyncFnMock<CheckForPlatformUpdates>;
let downloadPlatformUpdateMock: AsyncFnMock<DownloadPlatformUpdate>; let downloadPlatformUpdateMock: AsyncFnMock<DownloadPlatformUpdate>;
let restartAndInstallUpdate: jest.MockedFunction<() => void>; let quitAndInstallUpdateMock: jest.MockedFunction<() => void>;
beforeEach(() => { beforeEach(() => {
applicationBuilder = getApplicationBuilder(); applicationBuilder = getApplicationBuilder();
@ -53,7 +53,8 @@ describe("encourage user to update when sufficient time passed since update was
mainDi.override(electronUpdaterIsActiveInjectable, () => true); mainDi.override(electronUpdaterIsActiveInjectable, () => true);
mainDi.override(publishIsConfiguredInjectable, () => true); mainDi.override(publishIsConfiguredInjectable, () => true);
rendererDi.override(restartAndInstallUpdateInjectable, () => restartAndInstallUpdate = jest.fn()); quitAndInstallUpdateMock = jest.fn();
mainDi.override(quitAndInstallUpdateInjectable, () => quitAndInstallUpdateMock);
// TODO: Remove below lines when TopBar are free from side-effects // TODO: Remove below lines when TopBar are free from side-effects
rendererDi.unoverride(openAppContextMenuInjectable); rendererDi.unoverride(openAppContextMenuInjectable);
@ -138,7 +139,7 @@ describe("encourage user to update when sufficient time passed since update was
act(() => updateMenuItem?.click()); act(() => updateMenuItem?.click());
expect(restartAndInstallUpdate).toBeCalled(); expect(quitAndInstallUpdateMock).toBeCalled();
}); });
describe("when dropdown closed without clicking update item", () => { describe("when dropdown closed without clicking update item", () => {
@ -149,7 +150,7 @@ describe("encourage user to update when sufficient time passed since update was
act(() => button?.click()); act(() => button?.click());
expect(restartAndInstallUpdate).not.toBeCalled(); expect(quitAndInstallUpdateMock).not.toBeCalled();
}); });
}); });
}); });