diff --git a/README.md b/README.md index 1d1515438..97b3c5369 100644 --- a/README.md +++ b/README.md @@ -115,4 +115,4 @@ A script is included to do the download for you - run with (add the --nocd optio Start the selenium standalone with - java -jar selenium/selenium-server-standalone-2.33.0.jar -Dwebdriver.chrome.driver=./selenium/chromedriver + java -jar selenium/selenium-server-standalone-2.34.0.jar -Dwebdriver.chrome.driver=./selenium/chromedriver diff --git a/bin/install_selenium_standalone b/bin/install_selenium_standalone index 130fd424f..e895d4f57 100755 --- a/bin/install_selenium_standalone +++ b/bin/install_selenium_standalone @@ -11,7 +11,7 @@ var AdmZip = require('adm-zip') // Thanks to http://www.hacksparrow.com/using-node-js-to-download-files.html // for the outline of this code. var SELENIUM_URL = - 'http://selenium.googlecode.com/files/selenium-server-standalone-2.33.0.jar'; + 'http://selenium.googlecode.com/files/selenium-server-standalone-2.34.0.jar'; var CHROMEDRIVER_URL_MAC = 'https://chromedriver.googlecode.com/files/chromedriver_mac32_2.0.zip'; var CHROMEDRIVER_URL_LINUX32 = diff --git a/conf.js b/conf.js index 83bf8fd81..a75507e2e 100644 --- a/conf.js +++ b/conf.js @@ -9,7 +9,7 @@ exports.config = { // 3. sauceUser/sauceKey - to use remote Selenium servers via SauceLabs. // The location of the selenium standalone server .jar file. - seleniumServerJar: './selenium/selenium-server-standalone-2.33.0.jar', + seleniumServerJar: './selenium/selenium-server-standalone-2.34.0.jar', // The port to start the selenium server on, or null if the server should // find its own unused port. seleniumPort: null, @@ -39,6 +39,8 @@ exports.config = { // ----- Capabilities to be passed to the webdriver instance. // For a full list of available capabilities, see // https://code.google.com/p/selenium/wiki/DesiredCapabilities + // and + // https://code.google.com/p/selenium/source/browse/javascript/webdriver/capabilities.js capabilities: { 'browserName': 'chrome' }, diff --git a/example/onJasmineNodeSpec.js b/example/onJasmineNodeSpec.js index f52bd5fd1..974fb6f23 100644 --- a/example/onJasmineNodeSpec.js +++ b/example/onJasmineNodeSpec.js @@ -14,12 +14,7 @@ describe('angularjs homepage', function() { var driver = new webdriver.Builder(). usingServer('http://localhost:4444/wd/hub'). - withCapabilities({ - 'browserName': 'chrome', - 'version': '', - 'platform': 'ANY', - 'javascriptEnabled': true - }).build(); + withCapabilities(webdriver.Capabilities.chrome()).build(); driver.manage().timeouts().setScriptTimeout(10000); var ptor = protractor.wrapDriver(driver); diff --git a/example/onMocha.js b/example/onMocha.js index 0cc570788..e2fe20f5b 100644 --- a/example/onMocha.js +++ b/example/onMocha.js @@ -18,12 +18,7 @@ describe('angularjs.org homepage', function() { before(function() { driver = new webdriver.Builder(). usingServer('http://localhost:4444/wd/hub'). - withCapabilities({ - 'browserName': 'chrome', - 'version': '', - 'platform': 'ANY', - 'javascriptEnabled': true - }).build(); + withCapabilities(webdriver.Capabilities.chrome()).build(); driver.manage().timeouts().setScriptTimeout(10000); ptor = protractor.wrapDriver(driver); diff --git a/package.json b/package.json index de11b1ed7..10412d153 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ ], "author": "Julie Ralph ", "dependencies": { - "selenium-webdriver": ">2.32.1", + "selenium-webdriver": "~2.34.0", "minijasminenode": "~0.2.0", "saucelabs": "~0.1.0", "glob": ">=3.1.14",