Move package reset down into PackageManager

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

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
 

src/package-manager.coffee

@@ -52,6 +52,11 @@ class PackageManager
 
   setThemeManager: (@themeManager) ->
 
+  reset: ->
+    @serviceHub.clear()
+    @deactivatePackages()
+    @packageStates = {}
+
   ###
   Section: Event Subscription
   ###