From 52c43a71d3deae35dc3f0790a8197b130be30893 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Wed, 7 Oct 2015 09:22:38 +0200
Subject: [PATCH] Pass legacyTestRunner parameter

---
 src/browser/atom-application.coffee | 6 +++++-
 src/initialize-test-window.coffee   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee
index 6612d257a..c5242c5aa 100644
--- a/src/browser/atom-application.coffee
+++ b/src/browser/atom-application.coffee
@@ -512,11 +512,12 @@ class AtomApplication
       process.stderr.write 'Error: Specify at least one test path\n\n'
       process.exit(1)
 
+    legacyTestRunnerPath = @resolveLegacyTestRunnerPath()
     testRunnerPath = @resolveTestRunnerPath(testPaths[0])
     isSpec = true
     devMode = true
     safeMode ?= false
-    new AtomWindow({windowInitializationScript, resourcePath, headless, isSpec, devMode, testRunnerPath, testPaths, logFile, safeMode})
+    new AtomWindow({windowInitializationScript, resourcePath, headless, isSpec, devMode, testRunnerPath, legacyTestRunnerPath, testPaths, logFile, safeMode})
 
   resolveTestRunnerPath: (testPath) ->
     FindParentDir ?= require 'find-parent-dir'
@@ -531,6 +532,9 @@ class AtomApplication
           process.stderr.write "Error: Could not resolve test runner path '#{packageMetadata.atomTestRunner}'"
           process.exit(1)
 
+    @resolveLegacyTestRunnerPath()
+
+  resolveLegacyTestRunnerPath: ->
     try
       require.resolve(path.resolve(@devResourcePath, 'spec', 'jasmine-test-runner'))
     catch error
diff --git a/src/initialize-test-window.coffee b/src/initialize-test-window.coffee
index ff30da4ac..337c48744 100644
--- a/src/initialize-test-window.coffee
+++ b/src/initialize-test-window.coffee
@@ -32,12 +32,14 @@ try
 
   document.title = "Spec Suite"
 
+  legacyTestRunner = require(getWindowLoadSettings().legacyTestRunnerPath)
   testRunner = require(getWindowLoadSettings().testRunnerPath)
   testRunner({
     logFile: getWindowLoadSettings().logFile
     headless: getWindowLoadSettings().headless
     testPaths: getWindowLoadSettings().testPaths
     buildAtomEnvironment: -> new AtomEnvironment
+    legacyTestRunner: legacyTestRunner
   })
 
 catch error