protractor
Advanced tools
Comparing version 0.4.1 to 0.5.0
@@ -21,2 +21,6 @@ // An example configuration file. | ||
chromeDriver: './selenium/chromedriver', | ||
// Additional command line options to pass to selenium. For example, | ||
// if you need to change the browser timeout, use | ||
// seleniumArgs: [-browserTimeout=60], | ||
seleniumArgs: [], | ||
@@ -28,3 +32,3 @@ // If sauceUser and sauceKey are specified, seleniumServerJar will be ignored. | ||
// The address of a running selenium server. | ||
seleniumAddress: 'http://localhost:4444/wd/hub', | ||
// seleniumAddress: 'http://localhost:4444/wd/hub', | ||
@@ -31,0 +35,0 @@ // ----- Capabilities to be passed to the webdriver instance. |
@@ -15,2 +15,3 @@ var util = require('util'); | ||
seleniumServerJar: null, | ||
seleniumArgs: [], | ||
seleniumPort: null, | ||
@@ -81,7 +82,16 @@ seleniumAddress: null, | ||
util.puts('Starting selenium standalone server...'); | ||
if (config.chromeDriver) { | ||
if (!fs.existsSync(config.chromeDriver)) { | ||
if (fs.existsSync(config.chromeDriver + '.exe')) { | ||
config.chromeDriver += '.exe'; | ||
} else { | ||
throw 'Could not find chromedriver at ' + config.chromeDriver; | ||
} | ||
} | ||
config.seleniumArgs.push( | ||
'-Dwebdriver.chrome.driver=' + config.chromeDriver); | ||
} | ||
server = new remote.SeleniumServer({ | ||
jar: config.seleniumServerJar, | ||
args: config.chromeDriver ? | ||
['-Dwebdriver.chrome.driver=' + config.chromeDriver] : | ||
[], | ||
args: config.seleniumArgs, | ||
port: config.seleniumPort | ||
@@ -88,0 +98,0 @@ }); |
@@ -23,3 +23,3 @@ { | ||
"main" : "lib/protractor.js", | ||
"version" : "0.4.1" | ||
"version" : "0.5.0" | ||
} |
@@ -117,2 +117,1 @@ Protractor | ||
java -jar selenium/selenium-server-standalone-2.33.0.jar -Dwebdriver.chrome.driver=./selenium/chromedriver | ||
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
199876
1046
117