Merge branch 'master' into jl-std-docs-3

This commit is contained in:
Jessica Lord 2015-08-25 06:09:45 -07:00
commit ba9c47eb7e
3 changed files with 13 additions and 12 deletions

View file

@ -72,7 +72,7 @@ driver.quit();
## Setting up with WebdriverIO ## Setting up with WebdriverIO
[WebdriverIO](http://webdriver.io/) provided a Node package for testing with web driver. [WebdriverIO](http://webdriver.io/) provides a Node package for testing with web driver.
### 1. Start chrome driver ### 1. Start chrome driver
@ -86,7 +86,7 @@ Only local connections are allowed.
Remember the port number `9515`, which will be used later Remember the port number `9515`, which will be used later
### 2. Install WebDriverJS ### 2. Install WebdriverIO
```bash ```bash
$ npm install webdriverio $ npm install webdriverio
@ -96,22 +96,23 @@ $ npm install webdriverio
```javascript ```javascript
var webdriverio = require('webdriverio'); var webdriverio = require('webdriverio');
var options = { var options = {
host: "localhost", // Use localhost as chrome driver server host: "localhost", // Use localhost as chrome driver server
port: 9515, // "9515" is the port opened by chrome driver. port: 9515, // "9515" is the port opened by chrome driver.
desiredCapabilities: { desiredCapabilities: {
browserName: 'chrome', browserName: 'chrome',
chromeOptions: {binary: '/Path-to-Your-App.app/Electron'} // Path to your Electron binary. chromeOptions: {binary: '/Path-to-Your-App.app/Electron'} // Path to your Electron binary.
} }
}; };
webdriverio var client = webdriverio.remote(options);
.remote(options)
client
.init() .init()
.url('http://google.com') .url('http://google.com')
.setValue('#q', 'webdriverio') .setValue('#q', 'webdriverio')
.click('#btnG') .click('#btnG')
.title(function(err, res) { .getTitle().then(function(title) {
console.log('Title was: ' + res.value); console.log('Title was: ' + title);
}) })
.end(); .end();
``` ```

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 939a7b814282a6433b8d7e3c9cfc74451360c07f Subproject commit 5b2a73c68a986780e67eb2e738327d35c7c1c21e

2
vendor/node vendored

@ -1 +1 @@
Subproject commit 205b013ac86e5500678a791cd54f305580fa4f4b Subproject commit b9b6dd9f3fc095e66a3b89d3efd50f7c576da2c8