Set chromedriver path in integration spec helper

This commit is contained in:
Kevin Sawicki 2015-02-12 15:04:33 -08:00
parent 96fff054e5
commit a372c892f0
2 changed files with 2 additions and 4 deletions

View File

@ -85,7 +85,6 @@ module.exports = (grunt) ->
appPath = getAppPath()
resourcePath = process.cwd()
coreSpecsPath = path.resolve('spec')
chromedriverPath = path.join(resourcePath, "atom-shell", "chromedriver")
if process.platform in ['darwin', 'linux']
options =
@ -94,7 +93,6 @@ module.exports = (grunt) ->
opts:
env: _.extend({}, process.env,
ATOM_INTEGRATION_TESTS_ENABLED: true
PATH: [process.env.path, chromedriverPath].join(path.delimiter)
)
else if process.platform is 'win32'
@ -104,7 +102,6 @@ module.exports = (grunt) ->
opts:
env: _.extend({}, process.env,
ATOM_INTEGRATION_TESTS_ENABLED: true
PATH: [process.env.path, chromedriverPath].join(";")
)
spawn options, (error, results, code) ->

View File

@ -8,12 +8,13 @@ async = require "async"
AtomPath = remote.process.argv[0]
AtomLauncherPath = path.join(__dirname, "..", "helpers", "atom-launcher.sh")
ChromedriverPath = path.resolve(__dirname, '..', '..', '..', 'atom-shell', 'chromedriver', 'chromedriver')
SocketPath = path.join(temp.mkdirSync("socket-dir"), "atom.sock")
ChromedriverPort = 9515
module.exports =
driverTest: (fn) ->
chromedriver = spawn("chromedriver", [
chromedriver = spawn(ChromedriverPath, [
"--verbose",
"--port=#{ChromedriverPort}",
"--url-base=/wd/hub"