From c7ca50b2b685ea78881143ad09f3e15161aa4e38 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Fri, 13 Nov 2015 18:01:21 +0100
Subject: [PATCH] Set initialLoadComplete to true only in test mode

---
 src/atom-environment.coffee       | 4 ++--
 src/initialize-test-window.coffee | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index f98e1b835..77f8a6a2e 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -117,7 +117,7 @@ class AtomEnvironment extends Model
 
   # Call .loadOrCreate instead
   constructor: (params={}) ->
-    {@blobStore, @applicationDelegate, @window, @document, configDirPath, @enablePersistence} = params
+    {@blobStore, @applicationDelegate, @window, @document, configDirPath, @enablePersistence, loadBaseStylesheetsOnly} = params
 
     @state = {version: @constructor.version}
 
@@ -183,7 +183,7 @@ class AtomEnvironment extends Model
 
     @themes.loadBaseStylesheets()
     @initialStyleElements = @styles.getSnapshot()
-    @themes.initialLoadComplete = true
+    @themes.initialLoadComplete = true if loadBaseStylesheetsOnly
     @setBodyPlatformClass()
 
     @stylesElement = @styles.buildStylesElement()
diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee
index d80bc11f4..f7704f2d8 100644
--- a/src/initialize-test-window.coffee
+++ b/src/initialize-test-window.coffee
@@ -70,6 +70,7 @@ module.exports = ({blobStore}) ->
     buildAtomEnvironment = (params) ->
       params = cloneObject(params)
       params.blobStore = blobStore unless params.hasOwnProperty("blobStore")
+      params.loadBaseStylesheetsOnly = true unless params.hasOwnProperty("loadBaseStylesheetsOnly")
       new AtomEnvironment(params)
 
     promise = testRunner({