hendrik/lens
1
0 Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

chore: Replace all uses of stopServicesAndExitApp with requestQuitOfApp

Browse Source 
- Also updated tests with new behaviour

Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton committed 2023-04-12 15:15:36 -04:00
1 parent 4ff3186ca7
commit 2c4a7ecfb4
8 files changed
+43 -110
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/core/src/features/application-menu/main/menu-items/special-menu-for-mac-application/quit-application/quit-application-menu-item.injectable.ts
+2 -7
View File
@@ -4,28 +4,23 @@
*/
import { getInjectable } from "@ogre-tools/injectable";
import applicationMenuItemInjectionToken from "../../application-menu-item-injection-token";
import stopServicesAndExitAppInjectable from "../../../../../../main/stop-services-and-exit-app.injectable";
import isMacInjectable from "../../../../../../common/vars/is-mac.injectable";
import requestQuitOfAppInjectable from "../../../../../../main/electron-app/features/require-quit.injectable";
const quitApplicationMenuItemInjectable = getInjectable({
id: "quit-application-menu-item",
instantiate: (di) => {
const stopServicesAndExitApp = di.inject(stopServicesAndExitAppInjectable);
const isMac = di.inject(isMacInjectable);
return {
kind: "clickable-menu-item" as const,
id: "quit",
label: "Quit",
parentId: isMac ? "mac" : "file",
orderNumber: isMac ? 140 : 70,
keyboardShortcut: isMac ? "Cmd+Q" : "Alt+F4",
onClick: () => {
stopServicesAndExitApp();
},
onClick: di.inject(requestQuitOfAppInjectable),
};
},
packages/core/src/features/quitting-and-restarting-the-app/quitting-the-app-using-application-menu.test.ts
+7 -28
View File
@@ -5,14 +5,13 @@
import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
import forceAppExitInjectable from "../../main/electron-app/features/force-app-exit.injectable";
import stopServicesAndExitAppInjectable from "../../main/stop-services-and-exit-app.injectable";
import { testUsingFakeTime, advanceFakeTime } from "../../test-utils/use-fake-time";
import { testUsingFakeTime } from "../../test-utils/use-fake-time";
import requestQuitOfAppInjectable from "../../main/electron-app/features/require-quit.injectable";
describe("quitting the app using application menu", () => {
describe("given application has started", () => {
let builder: ApplicationBuilder;
let forceAppExitMock: jest.Mock;
let requestQuitOfAppMock: jest.Mock;
beforeEach(async () => {
testUsingFakeTime("2015-10-21T07:28:00Z");
@@ -20,10 +19,8 @@ describe("quitting the app using application menu", () => {
builder = getApplicationBuilder();
builder.beforeApplicationStart(({ mainDi }) => {
mainDi.unoverride(stopServicesAndExitAppInjectable);
forceAppExitMock = jest.fn();
mainDi.override(forceAppExitInjectable, () => forceAppExitMock);
requestQuitOfAppMock = jest.fn();
mainDi.override(requestQuitOfAppInjectable, () => requestQuitOfAppMock);
});
await builder.render();
@@ -40,26 +37,8 @@ describe("quitting the app using application menu", () => {
builder.applicationMenu.click("root", "mac", "quit");
});
it("closes all windows", () => {
const windows = builder.applicationWindow.getAll();
expect(windows).toEqual([]);
});
it("after insufficient time passes, does not terminate application yet", () => {
advanceFakeTime(999);
expect(forceAppExitMock).not.toHaveBeenCalled();
});
describe("after sufficient time passes", () => {
beforeEach(() => {
advanceFakeTime(1000);
});
it("terminates application", () => {
expect(forceAppExitMock).toHaveBeenCalled();
});
it("requests quit of application", () => {
expect(requestQuitOfAppMock).toBeCalled();
});
});
});