From 60e4b78da39bb7911ff81266c8bb020e03850874 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 9 Oct 2015 10:04:04 +0200
Subject: [PATCH] Move package reset down into PackageManager

---
 spec/spec-helper.coffee     | 5 -----
 src/atom-environment.coffee | 4 +++-
 src/package-manager.coffee  | 5 +++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 034a2e35c..a13ba9b9c 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -91,8 +91,6 @@ beforeEach ->
   spyOn(window, "setTimeout").andCallFake window.fakeSetTimeout
   spyOn(window, "clearTimeout").andCallFake window.fakeClearTimeout
 
-  atom.packages.packageStates = {}
-
   serializedWindowState = null
 
   spyOn(atom, 'saveStateSync')
@@ -141,14 +139,11 @@ beforeEach ->
   addCustomMatchers(this)
 
 afterEach ->
-  atom.packages.deactivatePackages()
-
   atom.workspace?.destroy()
   atom.workspace = null
   atom.themes.workspace = null
   delete atom.state.workspace
 
-  delete atom.state.packageStates
   atom.reset()
 
   document.getElementById('jasmine-content').innerHTML = '' unless window.debugContent
diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index 0dfbd9bb4..289f4a1dc 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -253,10 +253,12 @@ class AtomEnvironment extends Model
 
     @contextMenu.clear()
 
-    @packages.serviceHub.clear()
+    @packages.reset()
 
     @project.reset(@packages)
 
+    @state.packageStates = {}
+
   destroy: ->
     return if not @project
 
diff --git a/src/package-manager.coffee b/src/package-manager.coffee
index beed62683..b4af8ecdb 100644
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -52,6 +52,11 @@ class PackageManager
 
   setThemeManager: (@themeManager) ->
 
+  reset: ->
+    @serviceHub.clear()
+    @deactivatePackages()
+    @packageStates = {}
+
   ###
   Section: Event Subscription
   ###