Merge pull request #10381 from brave/10349

If crashing within first 2min don't lose windows
brave · Aug 10, 2017 · 2634bbf · 2634bbf
2 parents e3e2855 + 9145373
commit 2634bbf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/app/sessionStoreShutdown.js b/app/sessionStoreShutdown.js
@@ -188,13 +188,12 @@ app.on('before-quit', (e) => {
   if (sessionStateSaveInterval !== undefined) {
     clearInterval(sessionStateSaveInterval)
   }
-  initiateSessionStateSave()
+  module.exports.initiateSessionStateSave()
 })
 
 const startSessionSaveInterval = () => {
   // save app state every 5 minutes regardless of update frequency
-  initiateSessionStateSave()
-  sessionStateSaveInterval = setInterval(initiateSessionStateSave, appConfig.sessionSaveInterval)
+  sessionStateSaveInterval = setInterval(module.exports.initiateSessionStateSave, appConfig.sessionSaveInterval)
 }
 
 // User initiated exit using File->Quit

diff --git a/test/unit/app/sessionStoreShutdownTest.js b/test/unit/app/sessionStoreShutdownTest.js
@@ -355,4 +355,18 @@ describe('sessionStoreShutdown unit tests', function () {
       })
     })
   })
+  describe('startSessionSaveInterval', function () {
+    before(function () {
+      this.initiateSessionStateSave = sinon.spy(sessionStoreShutdown, 'initiateSessionStateSave')
+    })
+    after(function () {
+      this.initiateSessionStateSave.restore()
+    })
+    // We only care that initiateSessionStateSave is not called sync.
+    // Windows will be initialized for the non sync case.
+    it('does not call initiateSessionStateSave', function () {
+      sessionStoreShutdown.startSessionSaveInterval()
+      assert.equal(this.initiateSessionStateSave.notCalled, true)
+    })
+  })
 })