From ff3328669c87ab8da2b3ca2ff4e7461d7c9f0bca Mon Sep 17 00:00:00 2001
From: Chris Breiding <chrisbreiding@users.noreply.github.com>
Date: Tue, 17 Aug 2021 14:36:17 -0400
Subject: [PATCH] fix: Use app.quit instead of process.exit to prevent crash on
 close (#17774)

---
 packages/server/lib/modes/interactive-e2e.js        | 4 ++--
 packages/server/test/unit/modes/interactive_spec.js | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/server/lib/modes/interactive-e2e.js b/packages/server/lib/modes/interactive-e2e.js
index 572108c1db..d30e8b8942 100644
--- a/packages/server/lib/modes/interactive-e2e.js
+++ b/packages/server/lib/modes/interactive-e2e.js
@@ -18,7 +18,7 @@ module.exports = {
     return os.platform() === 'darwin'
   },
 
-  getWindowArgs (state, options = {}) {
+  getWindowArgs (state) {
     const common = {
       backgroundColor: '#dfe2e4',
       width: state.appWidth || 800,
@@ -51,7 +51,7 @@ module.exports = {
         return Windows.showAll()
       },
       onClose () {
-        return process.exit()
+        app.quit()
       },
     }
 
diff --git a/packages/server/test/unit/modes/interactive_spec.js b/packages/server/test/unit/modes/interactive_spec.js
index cd774cab96..c433729c0a 100644
--- a/packages/server/test/unit/modes/interactive_spec.js
+++ b/packages/server/test/unit/modes/interactive_spec.js
@@ -25,11 +25,11 @@ describe('gui/interactive', () => {
   })
 
   context('.getWindowArgs', () => {
-    it('exits process when onClose is called', () => {
-      sinon.stub(process, 'exit')
+    it('quits app when onClose is called', () => {
+      electron.app.quit = sinon.stub()
       interactiveMode.getWindowArgs({}).onClose()
 
-      expect(process.exit).to.be.called
+      expect(electron.app.quit).to.be.called
     })
 
     it('tracks state properties', () => {