Merge branch 'master' into greenkeeper/@types/node-7.0.23

SUMMARY.md

@@ -23,10 +23,10 @@
   * [it](docs/api-reference/exports/it.md)
 
 * Interfaces
-  * [Test](docs/api-reference/interfaces/test.md)
-  * [Browser](docs/api-reference/interfaces/browser.md)
-  * [Element](docs/api-reference/interfaces/element.md)
   * [PredicateBuilder](docs/api-reference/interfaces/predicate-builder.md)
+  * [SeleniumBrowser](docs/api-reference/interfaces/selenium-browser.md)
+  * [SeleniumElement](docs/api-reference/interfaces/selenium-element.md)
+  * [SeleniumTestContext](docs/api-reference/interfaces/selenium-test-context.md)
 
 ## Contributing
 

docs/api-reference/exports/browser.md

@@ -2,8 +2,8 @@
 
 Type definition:
 
-* **`browser: Browser`**
-* [`Browser`](../interfaces/browser.md)
+* **`browser: SeleniumBrowser`**
+* [`SeleniumBrowser`](../interfaces/selenium-browser.md)
 
 Example usage:
 

docs/api-reference/exports/define-element.md

@@ -2,8 +2,8 @@
 
 Type definition:
 
-* **`defineElement(name: string, selector: string, index: number = 0): Element`**
-* [`Element`](../interfaces/element.md)
+* **`defineElement(name: string, selector: string, index: number = 0): SeleniumElement`**
+* [`SeleniumElement`](../interfaces/selenium-element.md)
 
 Example usage:
 

docs/api-reference/exports/skip.md

@@ -2,10 +2,12 @@
 
 Type definition:
 
-* **`skip(name: string, implementation: Implementation): void`**
-* `Implementation: (t: Test<WebDriver>, config: Config) => Promise<void>`
-* [`Test`](../interfaces/test.md)
-* [`Config`](../../overview/configuring-cybernaut.md)
+* **`skip(name: string, implementation: SeleniumTest): void`**
+* `SeleniumTest: (t: SeleniumTestContext, config: SeleniumConfig) => Promise<void>`
+* [`SeleniumTestContext`](../interfaces/selenium-test-context.md)
+* `SeleniumConfig: {capabilities: Capabilities, timeouts: Timeouts, retries: number, retryDelay: number}`
+* `Capabilities: {browserName: string}`
+* `Timeouts: {element: number, page: number, script: number}`
 
 Example usage:
 

docs/api-reference/exports/test.md

@@ -2,10 +2,12 @@
 
 Type definition:
 
-* **`test(name: string, implementation?: Implementation): void`**
-* `Implementation: (t: Test<WebDriver>, config: Config) => Promise<void>`
-* [`Test`](../interfaces/test.md)
-* [`Config`](../../overview/configuring-cybernaut.md)
+* **`test(name: string, implementation?: SeleniumTest): void`**
+* `SeleniumTest: (t: SeleniumTestContext, config: SeleniumConfig) => Promise<void>`
+* [`SeleniumTestContext`](../interfaces/selenium-test-context.md)
+* `SeleniumConfig: {capabilities: Capabilities, timeouts: Timeouts, retries: number, retryDelay: number}`
+* `Capabilities: {browserName: string}`
+* `Timeouts: {element: number, page: number, script: number}`
 
 Example usage:
 

docs/api-reference/interfaces/browser.md → docs/api-reference/interfaces/selenium-browser.md

@@ -1,4 +1,4 @@
-# Interface: `Browser`
+# Interface: `SeleniumBrowser`
 
 ## Accessor properties
 
@@ -30,7 +30,7 @@
 
 Type definition:
 
-* **`pageTitle: Accessor<WebDriver, string>`**
+* **`pageTitle: SeleniumAccessor<string>`**
 
 Example usage:
 
@@ -48,7 +48,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`pageUrl: Accessor<WebDriver, string>`**
+* **`pageUrl: SeleniumAccessor<string>`**
 
 Example usage:
 
@@ -66,7 +66,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`windowXPosition: Accessor<WebDriver, number>`**
+* **`windowXPosition: SeleniumAccessor<number>`**
 
 Example usage:
 
@@ -84,7 +84,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`windowYPosition: Accessor<WebDriver, number>`**
+* **`windowYPosition: SeleniumAccessor<number>`**
 
 Example usage:
 
@@ -102,7 +102,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`windowWidth: Accessor<WebDriver, number>`**
+* **`windowWidth: SeleniumAccessor<number>`**
 
 Example usage:
 
@@ -120,7 +120,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`windowHeight: Accessor<WebDriver, number>`**
+* **`windowHeight: SeleniumAccessor<number>`**
 
 Example usage:
 
@@ -138,7 +138,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`elementCount(selector: string): Accessor<WebDriver, number>`**
+* **`elementCount(selector: string): SeleniumAccessor<number>`**
 
 Example usage:
 
@@ -156,7 +156,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`scriptResult<T>(scriptName: string, script: AccessorScript<T>): Accessor<WebDriver, T>`**
+* **`scriptResult<T>(scriptName: string, script: AccessorScript<T>): SeleniumAccessor<T>`**
 * `AccessorScript<T>: (callback: (result: T) => void) => void`
 
 Example usage:
@@ -182,7 +182,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`executeScript(scriptName: string, script: ActionScript): Action<WebDriver>`**
+* **`executeScript(scriptName: string, script: ActionScript): SeleniumAction`**
 * `ActionScript: (callback: () => void) => void`
 
 Example usage:
@@ -208,7 +208,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`loadPage(url: string): Action<WebDriver>`**
+* **`loadPage(url: string): SeleniumAction`**
 
 Example usage:
 
@@ -226,7 +226,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`navigateBack(): Action<WebDriver>`**
+* **`navigateBack(): SeleniumAction`**
 
 Example usage:
 
@@ -244,7 +244,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`navigateForward(): Action<WebDriver>`**
+* **`navigateForward(): SeleniumAction`**
 
 Example usage:
 
@@ -262,7 +262,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`reloadPage(): Action<WebDriver>`**
+* **`reloadPage(): SeleniumAction`**
 
 Example usage:
 
@@ -280,7 +280,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`setWindowPosition(x: number, y: number): Action<WebDriver>`**
+* **`setWindowPosition(x: number, y: number): SeleniumAction`**
 
 Example usage:
 
@@ -298,7 +298,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`setWindowSize(width: number, height: number): Action<WebDriver>`**
+* **`setWindowSize(width: number, height: number): SeleniumAction`**
 
 Example usage:
 

docs/api-reference/interfaces/element.md → docs/api-reference/interfaces/selenium-element.md

@@ -1,4 +1,4 @@
-# Interface: `Element`
+# Interface: `SeleniumElement`
 
 ## Factory methods
 
@@ -32,7 +32,7 @@
 
 Type definition:
 
-* **`defineDescendantElement(name: string, selector: string, index: number = 0): Element`**
+* **`defineDescendantElement(name: string, selector: string, index: number = 0): SeleniumElement`**
 
 Example usage:
 
@@ -53,7 +53,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`existence: Accessor<WebDriver, boolean>`**
+* **`existence: SeleniumAccessor<boolean>`**
 
 Example usage:
 
@@ -73,7 +73,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`visibility: Accessor<WebDriver, boolean>`**
+* **`visibility: SeleniumAccessor<boolean>`**
 
 Example usage:
 
@@ -95,7 +95,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`tagName: Accessor<WebDriver, string>`**
+* **`tagName: SeleniumAccessor<string>`**
 
 Example usage:
 
@@ -115,7 +115,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`text: Accessor<WebDriver, string>`**
+* **`text: SeleniumAccessor<string>`**
 
 Example usage:
 
@@ -135,7 +135,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`xPosition: Accessor<WebDriver, number>`**
+* **`xPosition: SeleniumAccessor<number>`**
 
 Example usage:
 
@@ -155,7 +155,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`yPosition: Accessor<WebDriver, number>`**
+* **`yPosition: SeleniumAccessor<number>`**
 
 Example usage:
 
@@ -175,7 +175,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`width: Accessor<WebDriver, number>`**
+* **`width: SeleniumAccessor<number>`**
 
 Example usage:
 
@@ -195,7 +195,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`height: Accessor<WebDriver, number>`**
+* **`height: SeleniumAccessor<number>`**
 
 Example usage:
 
@@ -215,7 +215,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`attributeValue(attributeName: string): Accessor<WebDriver, string | null>`**
+* **`attributeValue(attributeName: string): SeleniumAccessor<string | null>`**
 
 Example usage:
 
@@ -235,7 +235,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`cssValue(cssName: string): Accessor<WebDriver, string>`**
+* **`cssValue(cssName: string): SeleniumAccessor<string>`**
 
 Example usage:
 
@@ -255,7 +255,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`descendantElementCount(selector: string): Accessor<WebDriver, number>`**
+* **`descendantElementCount(selector: string): SeleniumAccessor<number>`**
 
 Example usage:
 
@@ -275,7 +275,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`clearValue(): Action<WebDriver>`**
+* **`clearValue(): SeleniumAction`**
 
 Example usage:
 
@@ -295,7 +295,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`click(): Action<WebDriver>`**
+* **`click(): SeleniumAction`**
 
 Example usage:
 
@@ -315,7 +315,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`sendKeys(...keys: string[]): Action<WebDriver>`**
+* **`sendKeys(...keys: string[]): SeleniumAction`**
 
 Example usage:
 
@@ -347,7 +347,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`submitForm(): Action<WebDriver>`**
+* **`submitForm(): SeleniumAction`**
 
 Example usage:
 

docs/api-reference/interfaces/test.md → docs/api-reference/interfaces/selenium-test-context.md

@@ -1,4 +1,4 @@
-# Interface: `Test<T>`
+# Interface: `SeleniumTestContext`
 
 ## Methods
 
@@ -10,7 +10,7 @@
 
 Type definition:
 
-* **`assert<S>(accessor: Accessor<T, S>, predicate: Predicate<S>, options?: Options): Promise<void>`**
+* **`assert<T>(accessor: SeleniumAccessor<T>, predicate: Predicate<T>, options?: Options): Promise<void>`**
 * `Options: {retries?: number, retryDelay?: number}`
 
 Example usage:
@@ -30,7 +30,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`perform(action: Action<T>, options?: Options): Promise<void>`**
+* **`perform(action: SeleniumAction, options?: Options): Promise<void>`**
 * `Options: {retries?: number, retryDelay?: number}`
 
 Example usage:
@@ -50,7 +50,7 @@ test('Example', async t => {
 
 Type definition:
 
-* **`verify<S>(accessor: Accessor<T, S>, predicate: Predicate<S>, options?: Options): Promise<boolean>`**
+* **`verify<T>(accessor: SeleniumAccessor<T>, predicate: Predicate<T>, options?: Options): Promise<boolean>`**
 * `Options: {retries?: number, retryDelay?: number}`
 
 Example usage: