Export a function in windowInitializationScript

...so that we can pass BlobStore to AtomEnvironment

spec/atom-environment-spec.coffee

@@ -215,6 +215,17 @@ describe "AtomEnvironment", ->
       expect(atom.project.getPaths()).toEqual(initialPaths)
 
   describe "::unloadEditorWindow()", ->
+    it "saves the BlobStore so it can be loaded after reload", ->
+      configDirPath = temp.mkdirSync()
+      fakeBlobStore = jasmine.createSpyObj("blob store", ["save"])
+      atomEnvironment = new AtomEnvironment({applicationDelegate: atom.applicationDelegate, enablePersistence: true, configDirPath, blobStore: fakeBlobStore, window, document})
+
+      atomEnvironment.unloadEditorWindow()
+
+      expect(fakeBlobStore.save).toHaveBeenCalled()
+
+      atomEnvironment.destroy()
+
     it "saves the serialized state of the window so it can be deserialized after reload", ->
       atomEnvironment = new AtomEnvironment({applicationDelegate: atom.applicationDelegate, window, document})
       spyOn(atomEnvironment, 'saveStateSync')

src/atom-environment.coffee

@@ -116,7 +116,7 @@ class AtomEnvironment extends Model
 
   # Call .loadOrCreate instead
   constructor: (params={}) ->
-    {@applicationDelegate, @window, @document, configDirPath, @enablePersistence} = params
+    {@blobStore, @applicationDelegate, @window, @document, configDirPath, @enablePersistence} = params
 
     @state = {version: @constructor.version}
 
@@ -306,6 +306,7 @@ class AtomEnvironment extends Model
     @project = null
     @commands.clear()
     @stylesElement.remove()
+    @config.destroy()
 
     @uninstallWindowEventHandler()
 
@@ -763,7 +764,7 @@ class AtomEnvironment extends Model
   saveBlobStoreSync: ->
     return unless @enablePersistence
 
-    @window.blobStore.save()
+    @blobStore.save()
 
   saveStateSync: ->
     return unless @enablePersistence

src/config.coffee

@@ -360,6 +360,10 @@ class Config
       @save()
     debouncedSave = _.debounce(save, 100)
 
+  destroy: ->
+    @clear()
+    @unobserveUserConfig()
+
   shouldNotAccessFileSystem: -> not @enablePersistence
 
   ###

src/initialize-application-window.coffee

@@ -1,34 +1,34 @@
 # Like sands through the hourglass, so are the days of our lives.
+module.exports = ({blobStore}) ->
+  path = require 'path'
+  require './window'
+  {getWindowLoadSettings} = require './window-load-settings-helpers'
 
-path = require 'path'
-require './window'
-{getWindowLoadSettings} = require './window-load-settings-helpers'
+  {resourcePath, isSpec, devMode} = getWindowLoadSettings()
 
-{resourcePath, isSpec, devMode} = getWindowLoadSettings()
+  # Add application-specific exports to module search path.
+  exportsPath = path.join(resourcePath, 'exports')
+  require('module').globalPaths.push(exportsPath)
+  process.env.NODE_PATH = exportsPath
 
-# Add application-specific exports to module search path.
-exportsPath = path.join(resourcePath, 'exports')
-require('module').globalPaths.push(exportsPath)
-process.env.NODE_PATH = exportsPath
+  # Make React faster
+  process.env.NODE_ENV ?= 'production' unless devMode
 
-# Make React faster
-process.env.NODE_ENV ?= 'production' unless devMode
+  AtomEnvironment = require './atom-environment'
+  ApplicationDelegate = require './application-delegate'
+  window.atom = new AtomEnvironment({
+    window, document, blobStore,
+    applicationDelegate: new ApplicationDelegate,
+    configDirPath: process.env.ATOM_HOME
+    enablePersistence: true
+  })
 
-AtomEnvironment = require './atom-environment'
-ApplicationDelegate = require './application-delegate'
-window.atom = new AtomEnvironment({
-  window, document,
-  applicationDelegate: new ApplicationDelegate,
-  configDirPath: process.env.ATOM_HOME
-  enablePersistence: true
-})
+  atom.displayWindow()
+  atom.loadStateSync()
+  atom.startEditorWindow()
 
-atom.displayWindow()
-atom.loadStateSync()
-atom.startEditorWindow()
-
-# Workaround for focus getting cleared upon window creation
-windowFocused = ->
-  window.removeEventListener('focus', windowFocused)
-  setTimeout (-> document.querySelector('atom-workspace').focus()), 0
-window.addEventListener('focus', windowFocused)
+  # Workaround for focus getting cleared upon window creation
+  windowFocused = ->
+    window.removeEventListener('focus', windowFocused)
+    setTimeout (-> document.querySelector('atom-workspace').focus()), 0
+  window.addEventListener('focus', windowFocused)

src/initialize-test-window.coffee

@@ -1,69 +1,78 @@
-# Start the crash reporter before anything else.
-require('crash-reporter').start(productName: 'Atom', companyName: 'GitHub')
-remote = require 'remote'
+cloneObject = (object) ->
+  clone = {}
+  clone[key] = value for key, value of object
+  clone
 
-exitWithStatusCode = (status) ->
-  remote.require('app').emit('will-quit')
-  remote.process.exit(status)
+module.exports = ({blobStore}) ->
+  # Start the crash reporter before anything else.
+  require('crash-reporter').start(productName: 'Atom', companyName: 'GitHub')
+  remote = require 'remote'
 
-try
-  path = require 'path'
-  ipc = require 'ipc'
-  {getWindowLoadSettings} = require './window-load-settings-helpers'
-  AtomEnvironment = require '../src/atom-environment'
-  ApplicationDelegate = require '../src/application-delegate'
+  exitWithStatusCode = (status) ->
+    remote.require('app').emit('will-quit')
+    remote.process.exit(status)
 
-  {testRunnerPath, legacyTestRunnerPath, headless, logFile, testPaths} = getWindowLoadSettings()
+  try
+    path = require 'path'
+    ipc = require 'ipc'
+    {getWindowLoadSettings} = require './window-load-settings-helpers'
+    AtomEnvironment = require '../src/atom-environment'
+    ApplicationDelegate = require '../src/application-delegate'
 
-  if headless
-    # Override logging in headless mode so it goes to the console, regardless
-    # of the --enable-logging flag to Electron.
-    console.log = (args...) ->
-      ipc.send 'write-to-stdout', args.join(' ') + '\n'
-    console.warn = (args...) ->
-      ipc.send 'write-to-stderr', args.join(' ') + '\n'
-    console.error = (args...) ->
-      ipc.send 'write-to-stderr', args.join(' ') + '\n'
-  else
-    # Show window synchronously so a focusout doesn't fire on input elements
-    # that are focused in the very first spec run.
-    remote.getCurrentWindow().show()
+    {testRunnerPath, legacyTestRunnerPath, headless, logFile, testPaths} = getWindowLoadSettings()
 
-  handleKeydown = (event) ->
-    # Reload: cmd-r / ctrl-r
-    if (event.metaKey or event.ctrlKey) and event.keyCode is 82
-      ipc.send('call-window-method', 'restart')
+    if headless
+      # Override logging in headless mode so it goes to the console, regardless
+      # of the --enable-logging flag to Electron.
+      console.log = (args...) ->
+        ipc.send 'write-to-stdout', args.join(' ') + '\n'
+      console.warn = (args...) ->
+        ipc.send 'write-to-stderr', args.join(' ') + '\n'
+      console.error = (args...) ->
+        ipc.send 'write-to-stderr', args.join(' ') + '\n'
+    else
+      # Show window synchronously so a focusout doesn't fire on input elements
+      # that are focused in the very first spec run.
+      remote.getCurrentWindow().show()
 
-    # Toggle Dev Tools: cmd-alt-i / ctrl-alt-i
-    if (event.metaKey or event.ctrlKey) and event.altKey and event.keyCode is 73
-      ipc.send('call-window-method', 'toggleDevTools')
+    handleKeydown = (event) ->
+      # Reload: cmd-r / ctrl-r
+      if (event.metaKey or event.ctrlKey) and event.keyCode is 82
+        ipc.send('call-window-method', 'restart')
 
-    # Reload: cmd-w / ctrl-w
-    if (event.metaKey or event.ctrlKey) and event.keyCode is 87
-      ipc.send('call-window-method', 'close')
+      # Toggle Dev Tools: cmd-alt-i / ctrl-alt-i
+      if (event.metaKey or event.ctrlKey) and event.altKey and event.keyCode is 73
+        ipc.send('call-window-method', 'toggleDevTools')
 
-  window.addEventListener('keydown', handleKeydown, true)
+      # Reload: cmd-w / ctrl-w
+      if (event.metaKey or event.ctrlKey) and event.keyCode is 87
+        ipc.send('call-window-method', 'close')
 
-  # Add 'exports' to module search path.
-  exportsPath = path.join(getWindowLoadSettings().resourcePath, 'exports')
-  require('module').globalPaths.push(exportsPath)
-  process.env.NODE_PATH = exportsPath # Set NODE_PATH env variable since tasks may need it.
+    window.addEventListener('keydown', handleKeydown, true)
 
-  document.title = "Spec Suite"
+    # Add 'exports' to module search path.
+    exportsPath = path.join(getWindowLoadSettings().resourcePath, 'exports')
+    require('module').globalPaths.push(exportsPath)
+    process.env.NODE_PATH = exportsPath # Set NODE_PATH env variable since tasks may need it.
 
-  testRunner = require(testRunnerPath)
-  legacyTestRunner = require(legacyTestRunnerPath)
-  buildAtomEnvironment = (params) -> new AtomEnvironment(params)
-  buildDefaultApplicationDelegate = (params) -> new ApplicationDelegate()
+    document.title = "Spec Suite"
 
-  promise = testRunner({
-    logFile, headless, testPaths, buildAtomEnvironment, buildDefaultApplicationDelegate, legacyTestRunner
-  })
+    testRunner = require(testRunnerPath)
+    legacyTestRunner = require(legacyTestRunnerPath)
+    buildDefaultApplicationDelegate = -> new ApplicationDelegate()
+    buildAtomEnvironment = (params) ->
+      params = cloneObject(params)
+      params.blobStore = blobStore unless params.hasOwnProperty("blobStore")
+      new AtomEnvironment(params)
 
-  promise.then(exitWithStatusCode) if getWindowLoadSettings().headless
-catch error
-  if getWindowLoadSettings().headless
-    console.error(error.stack ? error)
-    exitWithStatusCode(1)
-  else
-    throw error
+    promise = testRunner({
+      logFile, headless, testPaths, buildAtomEnvironment, buildDefaultApplicationDelegate, legacyTestRunner
+    })
+
+    promise.then(exitWithStatusCode) if getWindowLoadSettings().headless
+  catch error
+    if getWindowLoadSettings().headless
+      console.error(error.stack ? error)
+      exitWithStatusCode(1)
+    else
+      throw error

static/index.js

@@ -6,7 +6,7 @@
 
   var loadSettings = null
   var loadSettingsError = null
-  window.blobStore = null
+  var blobStore = null
 
   window.onload = function () {
     try {
@@ -19,10 +19,10 @@
       // Ensure ATOM_HOME is always set before anything else is required
       setupAtomHome()
 
-      window.blobStore = FileSystemBlobStore.load(
+      blobStore = FileSystemBlobStore.load(
         path.join(process.env.ATOM_HOME, 'blob-store/')
       )
-      NativeCompileCache.setCacheStore(window.blobStore)
+      NativeCompileCache.setCacheStore(blobStore)
       NativeCompileCache.install()
 
       // Normalize to make sure drive letter case is consistent on Windows
@@ -85,7 +85,8 @@
     setupVmCompatibility()
     setupCsonCache(CompileCache.getCacheDirectory())
 
-    require(loadSettings.windowInitializationScript)
+    var initialize = require(loadSettings.windowInitializationScript)
+    initialize({blobStore: blobStore})
     require('ipc').sendChannel('window-command', 'window:loaded')
   }