From 5fdf3f894c3b45a963087f129d88f9ff138fe3b1 Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Wed, 24 Sep 2014 14:53:24 -0700
Subject: [PATCH] Load the config from Atom class so as not to duplicate

---
 spec/atom-spec.coffee   | 3 ---
 spec/spec-helper.coffee | 6 +++---
 src/atom.coffee         | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/spec/atom-spec.coffee b/spec/atom-spec.coffee
index 4add78e3d..b277a6efa 100644
--- a/spec/atom-spec.coffee
+++ b/spec/atom-spec.coffee
@@ -49,8 +49,5 @@ describe "the `atom` global", ->
         expect(version).toBe 'version'
 
   describe "loading default config", ->
-    beforeEach ->
-      atom.loadConfig()
-
     it 'loads the default core config', ->
       expect(atom.config.get('core.excludeVcsIgnoredPaths')).toBe true
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index b94d33f0d..a427f21a6 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -91,16 +91,16 @@ beforeEach ->
   config = new Config({resourcePath, configDirPath: atom.getConfigDirPath()})
   spyOn(config, 'load')
   spyOn(config, 'save')
-  config.setDefaults('core', WorkspaceView.configDefaults)
-  config.setDefaults('editor', TextEditorView.configDefaults)
+  atom.config = config
+  atom.loadConfig()
   config.set "core.destroyEmptyPanes", false
   config.set "editor.fontFamily", "Courier"
   config.set "editor.fontSize", 16
   config.set "editor.autoIndent", false
   config.set "core.disabledPackages", ["package-that-throws-an-exception",
     "package-with-broken-package-json", "package-with-broken-keymap"]
+  config.load.reset()
   config.save.reset()
-  atom.config = config
 
   # make editor display updates synchronous
   spyOn(TextEditorView.prototype, 'requestDisplayUpdate').andCallFake -> @updateDisplay()
diff --git a/src/atom.coffee b/src/atom.coffee
index 35c5e9ae1..8cf823ba1 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -603,9 +603,9 @@ class Atom extends Model
     @deserializeWorkspaceView()
 
   loadConfig: ->
-    @config.load()
     @config.setSchema('core', {type: 'object', properties: require('./workspace-view').config})
     @config.setDefaults('editor', require('./editor-view').configDefaults)
+    @config.load()
 
   loadThemes: ->
     @themes.load()