From ea440148d86e44dfcbe8d22325138402d994fb85 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <as-cii@github.com>
Date: Sun, 12 Mar 2017 11:49:48 +0100
Subject: [PATCH] Fix remaining tests

---
 spec/history-manager-spec.js          | 10 +++++-----
 spec/menu-manager-spec.coffee         |  7 ++-----
 spec/view-registry-spec.coffee        |  1 +
 spec/window-event-handler-spec.coffee |  3 ++-
 src/atom-environment.coffee           |  5 +++++
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/spec/history-manager-spec.js b/spec/history-manager-spec.js
index a4b6d4c1b..ed07446eb 100644
--- a/spec/history-manager-spec.js
+++ b/spec/history-manager-spec.js
@@ -12,8 +12,8 @@ describe("HistoryManager", () => {
 
   beforeEach(async () => {
     commandDisposable = jasmine.createSpyObj('Disposable', ['dispose'])
-    commandRegistry = jasmine.createSpyObj('CommandRegistry', ['add'])
-    commandRegistry.add.andReturn(commandDisposable)
+    commandRegistry = jasmine.createSpyObj('CommandRegistry', ['addBundled'])
+    commandRegistry.addBundled.andReturn(commandDisposable)
 
     stateStore = new StateStore('history-manager-test', 1)
     await stateStore.save('history-manager', {
@@ -31,7 +31,7 @@ describe("HistoryManager", () => {
     })
 
     historyManager = new HistoryManager({stateStore, project, commands: commandRegistry})
-    historyManager.initialize({localStorage: window.localStorage})
+    historyManager.initialize(window.localStorage)
     await historyManager.loadState()
   })
 
@@ -41,8 +41,8 @@ describe("HistoryManager", () => {
 
   describe("constructor", () => {
     it("registers the 'clear-project-history' command function", () => {
-      expect(commandRegistry.add).toHaveBeenCalled()
-      const cmdCall = commandRegistry.add.calls[0]
+      expect(commandRegistry.addBundled).toHaveBeenCalled()
+      const cmdCall = commandRegistry.addBundled.calls[0]
       expect(cmdCall.args.length).toBe(2)
       expect(cmdCall.args[0]).toBe('atom-workspace')
       expect(typeof cmdCall.args[1]['application:clear-project-history']).toBe('function')
diff --git a/spec/menu-manager-spec.coffee b/spec/menu-manager-spec.coffee
index 2db6f35a0..926d855a6 100644
--- a/spec/menu-manager-spec.coffee
+++ b/spec/menu-manager-spec.coffee
@@ -5,11 +5,8 @@ describe "MenuManager", ->
   menu = null
 
   beforeEach ->
-    menu = new MenuManager(
-      resourcePath: atom.getLoadSettings().resourcePath
-      keymapManager: atom.keymaps
-      packageManager: atom.packages
-    )
+    menu = new MenuManager({keymapManager: atom.keymaps, packageManager: atom.packages})
+    menu.initialize({resourcePath: atom.getLoadSettings().resourcePath})
 
   describe "::add(items)", ->
     it "can add new menus that can be removed with the returned disposable", ->
diff --git a/spec/view-registry-spec.coffee b/spec/view-registry-spec.coffee
index 68a482b48..d805d17cb 100644
--- a/spec/view-registry-spec.coffee
+++ b/spec/view-registry-spec.coffee
@@ -5,6 +5,7 @@ describe "ViewRegistry", ->
 
   beforeEach ->
     registry = new ViewRegistry
+    registry.initialize()
 
   afterEach ->
     registry.clearDocumentRequests()
diff --git a/spec/window-event-handler-spec.coffee b/spec/window-event-handler-spec.coffee
index e9a7894c3..d4387f23a 100644
--- a/spec/window-event-handler-spec.coffee
+++ b/spec/window-event-handler-spec.coffee
@@ -15,7 +15,8 @@ describe "WindowEventHandler", ->
       loadSettings.initialPath = initialPath
       loadSettings
     atom.project.destroy()
-    windowEventHandler = new WindowEventHandler({atomEnvironment: atom, applicationDelegate: atom.applicationDelegate, window, document})
+    windowEventHandler = new WindowEventHandler({atomEnvironment: atom, applicationDelegate: atom.applicationDelegate})
+    windowEventHandler.initialize(window, document)
 
   afterEach ->
     windowEventHandler.unsubscribe()
diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index 9cda07865..13f8ae3c9 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -792,8 +792,13 @@ class AtomEnvironment extends Model
   uninstallUncaughtErrorHandler: ->
     @window.onerror = @previousWindowErrorHandler
 
+  installWindowEventHandler: ->
+    @windowEventHandler = new WindowEventHandler({atomEnvironment: this, @applicationDelegate})
+    @windowEventHandler.initialize(@window, @document)
+
   uninstallWindowEventHandler: ->
     @windowEventHandler?.unsubscribe()
+    @windowEventHandler = null
 
   ###
   Section: Messaging the User