From 58bc966053e400e2caaccb1c0a79d9afb7ebf156 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Thu, 12 Nov 2015 09:59:31 -0700
Subject: [PATCH 1/3] 1.2.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f446ac6f6..4d1fbbf22 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "1.2.0-beta3",
+  "version": "1.2.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {

From 7c6fcea44173b1273f448b26dd114cacc3de7330 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 2/3] Set initialLoadComplete to true only in test mode

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

diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index 004cfbc80..dcd7ca0ea 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -116,7 +116,7 @@ class AtomEnvironment extends Model
 
   # Call .loadOrCreate instead
   constructor: (params={}) ->
-    {@applicationDelegate, @window, @document, configDirPath, @enablePersistence} = params
+    {@applicationDelegate, @window, @document, configDirPath, @enablePersistence, onlyLoadBaseStyleSheets} = params
 
     @state = {version: @constructor.version}
 
@@ -182,7 +182,7 @@ class AtomEnvironment extends Model
 
     @themes.loadBaseStylesheets()
     @initialStyleElements = @styles.getSnapshot()
-    @themes.initialLoadComplete = true
+    @themes.initialLoadComplete = true if onlyLoadBaseStyleSheets
     @setBodyPlatformClass()
 
     @stylesElement = @styles.buildStylesElement()
diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee
index 27ef46acc..3033ede18 100644
--- a/src/initialize-test-window.coffee
+++ b/src/initialize-test-window.coffee
@@ -6,6 +6,11 @@ exitWithStatusCode = (status) ->
   remote.require('app').emit('will-quit')
   remote.process.exit(status)
 
+cloneObject = (object) ->
+  clone = {}
+  clone[key] = value for key, value of object
+  clone
+
 try
   path = require 'path'
   ipc = require 'ipc'
@@ -53,7 +58,10 @@ try
 
   testRunner = require(testRunnerPath)
   legacyTestRunner = require(legacyTestRunnerPath)
-  buildAtomEnvironment = (params) -> new AtomEnvironment(params)
+  buildAtomEnvironment = (params) ->
+    params = cloneObject(params)
+    params.onlyLoadBaseStyleSheets = true unless params.hasOwnProperty("onlyLoadBaseStyleSheets")
+    new AtomEnvironment(params)
   buildDefaultApplicationDelegate = (params) -> new ApplicationDelegate()
 
   promise = testRunner({

From 7e902bc31ee4ad446c25d5d64c46871645be0dbb Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Fri, 13 Nov 2015 16:14:25 -0700
Subject: [PATCH 3/3] 1.2.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4d1fbbf22..0186d9948 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {