Merge pull request atom#16322 from atom/wl-more-history-fixes

Wliu · web-flow · commit 84f6203a3006 · 2017-12-21T12:20:06.000-05:00
More history manager fixes in specs
diff --git a/spec/history-manager-spec.js b/spec/history-manager-spec.js
@@ -1,19 +1,14 @@
-/** @babel */
+const {it, fit, ffit, fffit, beforeEach, afterEach} = require('./async-spec-helpers')
+const {Emitter, Disposable, CompositeDisposable} = require('event-kit')
 
-import {it, fit, ffit, fffit, beforeEach, afterEach} from './async-spec-helpers'
-import {Emitter, Disposable, CompositeDisposable} from 'event-kit'
-
-import {HistoryManager, HistoryProject} from '../src/history-manager'
-import StateStore from '../src/state-store'
+const {HistoryManager, HistoryProject} = require('../src/history-manager')
+const StateStore = require('../src/state-store')
 
 describe("HistoryManager", () => {
   let historyManager, commandRegistry, project, stateStore
   let commandDisposable, projectDisposable
 
   beforeEach(async () => {
-    // Do not clobber recent project history
-    spyOn(atom.applicationDelegate, 'didChangeHistoryManager')
-
     commandDisposable = jasmine.createSpyObj('Disposable', ['dispose'])
     commandRegistry = jasmine.createSpyObj('CommandRegistry', ['add'])
     commandRegistry.add.andReturn(commandDisposable)
@@ -185,11 +180,26 @@ describe("HistoryManager", () => {
     })
   })
 
-  describe("saveState" ,() => {
+  describe("saveState", () => {
+    let savedHistory
+    beforeEach(() => {
+      // historyManager.saveState is spied on globally to prevent specs from
+      // modifying the shared project history. Since these tests depend on
+      // saveState, we unspy it but in turn spy on the state store instead
+      // so that no data is actually stored to it.
+      jasmine.unspy(historyManager, 'saveState')
+
+      spyOn(historyManager.stateStore, 'save').andCallFake((name, history) => {
+        savedHistory = history
+        return Promise.resolve()
+      })
+    })
+
     it("saves the state", async () => {
       await historyManager.addProject(["/save/state"])
       await historyManager.saveState()
       const historyManager2 = new HistoryManager({stateStore, project, commands: commandRegistry})
+      spyOn(historyManager2.stateStore, 'load').andCallFake(name => Promise.resolve(savedHistory))
       await historyManager2.loadState()
       expect(historyManager2.getProjects()[0].paths).toEqual(['/save/state'])
     })
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
@@ -63,7 +63,7 @@ else
 
 beforeEach ->
   # Do not clobber recent project history
-  spyOn(atom.history, 'saveState').andReturn(Promise.resolve())
+  spyOn(Object.getPrototypeOf(atom.history), 'saveState').andReturn(Promise.resolve())
 
   atom.project.setPaths([specProjectPath])
 
