From cb223fa03e9015fbfb5bb8a46a535d12d4690d7c Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Wed, 13 May 2015 15:55:17 -0700
Subject: [PATCH] Don't check for updates in test mode

---
 src/browser/application-menu.coffee    |  4 ++--
 src/browser/atom-application.coffee    | 16 ++++++----------
 src/browser/auto-update-manager.coffee |  4 ++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/browser/application-menu.coffee b/src/browser/application-menu.coffee
index e3885de00..74da80e43 100644
--- a/src/browser/application-menu.coffee
+++ b/src/browser/application-menu.coffee
@@ -12,7 +12,7 @@ class ApplicationMenu
   constructor: (@version, @autoUpdateManager) ->
     @windowTemplates = new WeakMap()
     @setActiveTemplate(@getDefaultTemplate())
-    @autoUpdateManager?.on 'state-changed', (state) => @showUpdateMenuItem(state)
+    @autoUpdateManager.on 'state-changed', (state) => @showUpdateMenuItem(state)
 
   # Public: Updates the entire menu with the given keybindings.
   #
@@ -32,7 +32,7 @@ class ApplicationMenu
       @menu = Menu.buildFromTemplate(_.deepClone(template))
       Menu.setApplicationMenu(@menu)
 
-    @showUpdateMenuItem(@autoUpdateManager?.getState())
+    @showUpdateMenuItem(@autoUpdateManager.getState())
 
   # Register a BrowserWindow with this application menu.
   addWindow: (window) ->
diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee
index 0dc269080..09738b452 100644
--- a/src/browser/atom-application.coffee
+++ b/src/browser/atom-application.coffee
@@ -1,6 +1,7 @@
 AtomWindow = require './atom-window'
 ApplicationMenu = require './application-menu'
 AtomProtocolHandler = require './atom-protocol-handler'
+AutoUpdateManager = require './auto-update-manager'
 BrowserWindow = require 'browser-window'
 StorageFolder = require '../storage-folder'
 Menu = require 'menu'
@@ -70,10 +71,7 @@ class AtomApplication
     @pathsToOpen ?= []
     @windows = []
 
-    unless options.test
-      AutoUpdateManager = require './auto-update-manager'
-      @autoUpdateManager = new AutoUpdateManager(@version)
-
+    @autoUpdateManager = new AutoUpdateManager(@version, options.test)
     @applicationMenu = new ApplicationMenu(@version, @autoUpdateManager)
     @atomProtocolHandler = new AtomProtocolHandler(@resourcePath, @safeMode)
 
@@ -113,9 +111,8 @@ class AtomApplication
     @windows.push window
     @applicationMenu?.addWindow(window.browserWindow)
 
-    if @autoUpdateManager?
-      window.once 'window:loaded', =>
-        @autoUpdateManager.emitUpdateAvailableEvent(window)
+    window.once 'window:loaded', =>
+      @autoUpdateManager.emitUpdateAvailableEvent(window)
 
     unless window.isSpec
       focusHandler = => @lastFocusedWindow = window
@@ -189,9 +186,8 @@ class AtomApplication
     @on 'application:report-issue', -> require('shell').openExternal('https://github.com/atom/atom/blob/master/CONTRIBUTING.md#submitting-issues')
     @on 'application:search-issues', -> require('shell').openExternal('https://github.com/issues?q=+is%3Aissue+user%3Aatom')
 
-    if @autoUpdateManager?
-      @on 'application:install-update', => @autoUpdateManager.install()
-      @on 'application:check-for-update', => @autoUpdateManager.check()
+    @on 'application:install-update', => @autoUpdateManager.install()
+    @on 'application:check-for-update', => @autoUpdateManager.check()
 
     if process.platform is 'darwin'
       @on 'application:about', -> Menu.sendActionToFirstResponder('orderFrontStandardAboutPanel:')
diff --git a/src/browser/auto-update-manager.coffee b/src/browser/auto-update-manager.coffee
index 358390889..7c8613be5 100644
--- a/src/browser/auto-update-manager.coffee
+++ b/src/browser/auto-update-manager.coffee
@@ -15,7 +15,7 @@ module.exports =
 class AutoUpdateManager
   _.extend @prototype, EventEmitter.prototype
 
-  constructor: (@version) ->
+  constructor: (@version, @testMode) ->
     @state = IdleState
     if process.platform is 'win32'
       # Squirrel for Windows can't handle query params
@@ -80,7 +80,7 @@ class AutoUpdateManager
       autoUpdater.once 'update-not-available', @onUpdateNotAvailable
       autoUpdater.once 'error', @onUpdateError
 
-    autoUpdater.checkForUpdates()
+    autoUpdater.checkForUpdates() unless @testMode
 
   install: ->
     autoUpdater.quitAndInstall()