protractor
Advanced tools
Comparing version 5.4.0 to 5.4.1
import { BPClient } from 'blocking-proxy'; | ||
import { promise as wdpromise, WebDriver, WebElement, WebElementPromise } from 'selenium-webdriver'; | ||
import { Navigation, promise as wdpromise, WebDriver, WebElement, WebElementPromise } from 'selenium-webdriver'; | ||
import { ExtendedWebDriver } from 'webdriver-js-extender'; | ||
@@ -442,3 +442,3 @@ import { DebugHelper } from './debugger'; | ||
*/ | ||
navigate(): any; | ||
navigate(): Navigation; | ||
/** | ||
@@ -445,0 +445,0 @@ * Browse to another page using in-page navigation. |
@@ -0,1 +1,2 @@ | ||
import { WebDriver } from 'selenium-webdriver'; | ||
import { PluginConfig } from './plugins'; | ||
@@ -183,2 +184,3 @@ export interface Config { | ||
firefoxPath?: string; | ||
seleniumWebDriver?: WebDriver; | ||
/** | ||
@@ -185,0 +187,0 @@ * Use default globals: 'protractor', 'browser', '$', '$$', 'element', 'by'. |
@@ -11,2 +11,3 @@ export * from './attachSession'; | ||
export * from './kobiton'; | ||
export * from './useExistingWebDriver'; | ||
import { DriverProvider } from './driverProvider'; | ||
@@ -13,0 +14,0 @@ import { Config } from '../config'; |
@@ -16,2 +16,3 @@ "use strict"; | ||
__export(require("./kobiton")); | ||
__export(require("./useExistingWebDriver")); | ||
const attachSession_1 = require("./attachSession"); | ||
@@ -26,2 +27,3 @@ const browserStack_1 = require("./browserStack"); | ||
const kobiton_1 = require("./kobiton"); | ||
const useExistingWebDriver_1 = require("./useExistingWebDriver"); | ||
const logger_1 = require("../logger"); | ||
@@ -35,2 +37,6 @@ let logger = new logger_1.Logger('driverProviders'); | ||
} | ||
else if (config.seleniumWebDriver) { | ||
driverProvider = new useExistingWebDriver_1.UseExistingWebDriver(config); | ||
exports.logWarnings('useExistingWebDriver', config); | ||
} | ||
else if (config.seleniumAddress) { | ||
@@ -119,2 +125,5 @@ if (config.seleniumSessionId) { | ||
} | ||
if ('useExistingWebDriver' !== providerType && config.seleniumWebDriver) { | ||
warnList.push('seleniumWebDriver'); | ||
} | ||
if (warnList.length !== 0) { | ||
@@ -121,0 +130,0 @@ logger.warn(warnInto + warnList.join(', ')); |
@@ -167,3 +167,3 @@ import { ProtractorBrowser } from './browser'; | ||
* | ||
* @alias ExpectedConditions.textToBePresentInElement | ||
* @alias ExpectedConditions.textToBePresentInElementValue | ||
* @param {!ElementFinder} elementFinder The element to check | ||
@@ -170,0 +170,0 @@ * @param {!string} text The text to verify against |
@@ -223,3 +223,3 @@ "use strict"; | ||
* | ||
* @alias ExpectedConditions.textToBePresentInElement | ||
* @alias ExpectedConditions.textToBePresentInElementValue | ||
* @param {!ElementFinder} elementFinder The element to check | ||
@@ -226,0 +226,0 @@ * @param {!string} text The text to verify against |
@@ -29,3 +29,3 @@ { | ||
"source-map-support": "~0.4.0", | ||
"webdriver-js-extender": "2.0.0", | ||
"webdriver-js-extender": "2.1.0", | ||
"webdriver-manager": "^12.0.6" | ||
@@ -86,3 +86,3 @@ }, | ||
}, | ||
"version": "5.4.0" | ||
"version": "5.4.1" | ||
} |
Sorry, the diff of this file is too big to display
716154
113
13666
+ Addedwebdriver-js-extender@2.1.0(transitive)
- Removedwebdriver-js-extender@2.0.0(transitive)
Updatedwebdriver-js-extender@2.1.0