Fix tests

spec/atom-spec.coffee

@@ -20,6 +20,7 @@ describe "the `atom` global", ->
           expect(pack.activateStylesheets).toHaveBeenCalled()
 
         it "continues if the package has an invalid package.json", ->
+          spyOn(console, 'warn')
           config.set("core.disabledPackages", [])
           expect(-> atom.loadPackage("package-with-broken-package-json")).not.toThrow()
 
@@ -224,14 +225,6 @@ describe "the `atom` global", ->
               expect(atom.themes.stylesheetElementForId(three)).toExist()
               expect($('#jasmine-content').css('font-size')).toBe '3px'
 
-        describe "theme loading", ->
-          it "properly sets the config.themes to activate the theme when a theme is activated", ->
-            themeName = "theme-with-package-file"
-            expect(config.get('core.themes')).not.toContain themeName
-            atom.activatePackage(themeName)
-            expect(config.get('core.themes')).toContain themeName
-            expect(atom.themes.getAvailableNames()).toContain themeName
-
         describe "grammar loading", ->
           it "loads the package's grammars", ->
             atom.activatePackage('package-with-grammars')
@@ -256,14 +249,17 @@ describe "the `atom` global", ->
 
         describe "when the package has no grammars but does have preferences", ->
           it "loads the package's preferences as scoped properties", ->
-            jasmine.unspy(window, 'setTimeout')
-            spyOn(syntax, 'addProperties').andCallThrough()
+            runs ->
+              jasmine.unspy(window, 'setTimeout')
+              spyOn(syntax, 'addProperties').andCallThrough()
 
-            atom.activatePackage('package-with-preferences-tmbundle')
+              console.log atom.packages.loadedPackages
+              atom.activatePackage('package-with-preferences-tmbundle')
 
             waitsFor ->
               syntax.addProperties.callCount > 0
             runs ->
+              console.log atom.packages.loadedPackages
               expect(syntax.getProperty(['.source.pref'], 'editor.increaseIndentPattern')).toBe '^abc$'
 
     describe ".deactivatePackage(id)", ->
@@ -343,3 +339,31 @@ describe "the `atom` global", ->
           atom.activatePackage('language-ruby', sync: true)
           atom.deactivatePackage('language-ruby')
           expect(syntax.getProperty(['.source.ruby'], 'editor.commentStart')).toBeUndefined()
+
+    describe ".activatePackages()", ->
+      beforeEach ->
+        spyOn(console, 'warn')
+        atom.packages.loadPackages()
+
+      afterEach ->
+        atom.packages.deactivatePackages()
+        atom.packages.unloadPackages()
+
+        Syntax = require '../src/syntax'
+        atom.syntax = window.syntax = new Syntax()
+
+      it "activates all the packages, and none of the themes", ->
+        atom.packages.activatePackages()
+        loadedPackages = atom.packages.getLoadedPackages()
+        expect(loadedPackages.length).toBeGreaterThan 0
+        hasTheme = false
+        for pack in loadedPackages
+          if pack.isTheme()
+            hasTheme = true
+            break
+
+        expect(hasTheme).toBeTruthy()
+
+        activatedPackages = atom.packages.getActivePackages()
+        expect(activatedPackages.length).toBeGreaterThan 0
+        expect(pack.isTheme()).toBeFalsy() for pack in activatedPackages

src/package-manager.coffee

@@ -97,11 +97,15 @@ class PackageManager
       return pack if pack = @getLoadedPackage(name)
 
       pack = Package.load(packagePath, options)
-      @loadedPackages[pack.name] = pack
+      @loadedPackages[pack.name] = pack if pack?
       pack
     else
       throw new Error("Could not resolve '#{name}' to a package path")
 
+  unloadPackages: ->
+    for name in _.keys(@loadedPackages)
+      @unloadPackage(name)
+
   unloadPackage: (name) ->
     if @isPackageActive(name)
       throw new Error("Tried to unload active package '#{name}'")

src/package.coffee

@@ -10,17 +10,22 @@ class Package
     ThemePackage = require './theme-package'
 
     if TextMatePackage.testName(path)
-      new TextMatePackage(path)
+      pack = new TextMatePackage(path)
     else
-      metadata = @loadMetadata(path)
-      if metadata.theme
-        new ThemePackage(path, {metadata})
-      else
-        new AtomPackage(path, {metadata})
+      try
+        metadata = @loadMetadata(path)
+        if metadata.theme
+          pack = new ThemePackage(path, {metadata})
+        else
+          pack = new AtomPackage(path, {metadata})
+      catch e
+        console.warn "Failed to load package.json '#{basename(path)}'", e.stack ? e
+
+    pack
 
   @load: (path, options) ->
     pack = @build(path)
-    pack.load(options)
+    pack?.load(options)
     pack
 
   @loadMetadata: (path, ignoreErrors=false) ->

src/theme-manager.coffee

@@ -24,11 +24,11 @@ class ThemeManager
     @getLoadedNames()
 
   getLoadedNames: ->
-    name for theme.name in @getLoadedThemes()
+    theme.name for theme in @getLoadedThemes()
 
   # Internal-only:
   getActiveNames: ->
-    name for theme.name in @getActiveThemes()
+    theme.name for theme in @getActiveThemes()
 
   # Internal-only:
   getActiveThemes: ->

src/window.coffee

@@ -51,8 +51,8 @@ window.startEditorWindow = ->
   atom.keymap.loadBundledKeymaps()
   atom.themes.loadBaseStylesheets()
   atom.packages.loadPackages()
-  atom.themes.load()
   deserializeEditorWindow()
+  atom.themes.activateThemes()
   atom.packages.activatePackages()
   atom.keymap.loadUserKeymaps()
   atom.requireUserInitScript()