Merge pull request #171 from electron/properly-quit

fix: On quit, quit properly

src/main/main.ts

@@ -28,6 +28,15 @@ export async function onReady() {
   setupDialogs();
 }
 
+/**
+ * Handle the "before-quit" event
+ *
+ * @export
+ */
+export function onBeforeQuit() {
+  (global as any).isQuitting = true;
+}
+
 /**
  * All windows have been closed, quit on anything but
  * macOS.
@@ -62,6 +71,7 @@ export function main() {
 
   // Launch
   app.on('ready', onReady);
+  app.on('before-quit', onBeforeQuit);
   app.on('window-all-closed', onWindowsAllClosed);
   app.on('activate', getOrCreateMainWindow);
 }

src/renderer/state.ts

@@ -132,7 +132,16 @@ export class AppState {
             // The user confirmed, let's close for real.
             if (this.warningDialogLastResult) {
               window.onbeforeunload = null;
-              window.close();
+
+              // Should we just close or quit?
+              const remote = require('electron').remote;
+              const isQuitting = remote.getGlobal('isQuitting');
+
+              if (isQuitting) {
+                remote.app.quit();
+              } else {
+                window.close();
+              }
             }
           });
 

tests/main/main-spec.ts

@@ -1,6 +1,6 @@
 import { app } from 'electron';
 
-import { main, onReady, onWindowsAllClosed } from '../../src/main/main';
+import { main, onBeforeQuit, onReady, onWindowsAllClosed } from '../../src/main/main';
 import { shouldQuit } from '../../src/main/squirrel';
 import { setupUpdates } from '../../src/main/update';
 import { getOrCreateMainWindow } from '../../src/main/windows';
@@ -48,7 +48,16 @@ describe('main', () => {
 
     it('listens to core events', () => {
       main();
-      expect(app.on).toHaveBeenCalledTimes(4);
+      expect(app.on).toHaveBeenCalledTimes(5);
+    });
+  });
+
+  describe('onBeforeQuit()', () => {
+    it('sets a global', () => {
+      onBeforeQuit();
+
+      expect((global as any).isQuitting).toBe(true);
+      (global as any).isQuitting = false;
     });
   });
 

tests/mocks/electron.ts

@@ -181,6 +181,7 @@ const electronMock = {
     session,
     BrowserWindow: MockBrowserWindow,
     getCurrentWindow: jest.fn(),
+    getGlobal: jest.fn(),
     Menu: MockMenu,
     MenuItem: MockMenuItem,
     process: {

tests/renderer/state-spec.ts

@@ -64,7 +64,27 @@ describe('AppState', () => {
       });
     });
 
-    it('closes the window', (done) => {
+    it('closes the app', (done) => {
+      const { remote } = require('electron');
+      window.close = jest.fn();
+      appState.isUnsaved = true;
+      (remote.getGlobal as jest.Mock).mockReturnValueOnce(true);
+      expect(window.onbeforeunload).toBeTruthy();
+
+      const result = window.onbeforeunload!(undefined as any);
+      expect(result).toBe(false);
+      expect(appState.isWarningDialogShowing).toBe(true);
+
+      appState.warningDialogLastResult = true;
+      appState.isWarningDialogShowing = false;
+      process.nextTick(() => {
+        expect(window.close).toHaveBeenCalledTimes(0);
+        expect(remote.app.quit).toHaveBeenCalledTimes(1);
+        done();
+      });
+    });
+
+    it('does not close the window', (done) => {
       window.close = jest.fn();
       appState.isUnsaved = true;
       expect(window.onbeforeunload).toBeTruthy();