kylefang/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/zhigang1992/DefinitelyTyped.git synced 2026-04-24 05:06:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update WebDriver#isElementPresent, #findElement and #findElements

Browse Source 
Related: https://github.com/SeleniumHQ/selenium.git dc974c4a760176d015a96196072b6fb728100903
TODO: Add webdriver.By.Hash
This commit is contained in:
Kuniwak
2015-07-09 19:08:44 +09:00
parent 3ea7cf7889
commit 33ae3d2f7b
2 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
selenium-webdriver/selenium-webdriver-tests.ts
View File

@@ -676,14 +676,14 @@ function TestWebDriver() {
var element: webdriver.WebElement;
element = driver.findElement(webdriver.By.id('ABC'));
element = driver.findElement({id: 'ABC'});
element = driver.findElement(webdriver.By.js('function(){}'), 1, 2, 3);
element = driver.findElement({js: 'function(){}'}, 1, 2, 3);
element = driver.findElement(webdriver.By.js('function(){}'));
element = driver.findElement({js: 'function(){}'});
// findElements
driver.findElements(webdriver.By.className('ABC')).then(function (elements: webdriver.WebElement[]) { });
driver.findElements({ className: 'ABC' }).then(function (elements: webdriver.WebElement[]) { });
driver.findElements(webdriver.By.js('function(){}'), 1, 2, 3).then(function (elements: webdriver.WebElement[]) { });
driver.findElements({ js: 'function(){}' }, 1, 2, 3).then(function (elements: webdriver.WebElement[]) { });
driver.findElements(webdriver.By.js('function(){}')).then(function (elements: webdriver.WebElement[]) { });
driver.findElements({ js: 'function(){}' }).then(function (elements: webdriver.WebElement[]) { });
voidPromise = driver.get('http://www.google.com');
driver.getAllWindowHandles().then(function (handles: string[]) { });
@@ -696,8 +696,8 @@ function TestWebDriver() {
booleanPromise = driver.isElementPresent(webdriver.By.className('ABC'));
booleanPromise = driver.isElementPresent({className: 'ABC'});
booleanPromise = driver.isElementPresent(webdriver.By.js('function(){}'), 1, 2, 3);
booleanPromise = driver.isElementPresent({js: 'function(){}'}, 1, 2, 3);
booleanPromise = driver.isElementPresent(webdriver.By.js('function(){}'));
booleanPromise = driver.isElementPresent({js: 'function(){}'});
var options: webdriver.WebDriverOptions = driver.manage();
var navigation: webdriver.WebDriverNavigation = driver.navigate();

40
selenium-webdriver/selenium-webdriver.d.ts vendored
View File

@@ -3867,6 +3867,7 @@ declare module webdriver {
* {@code webdriver.Locator} object, or a simple JSON object whose sole key
* is one of the accepted locator strategies, as defined by
* {@code webdriver.Locator.Strategy}. For example, the following two statements
* The search criteria for an element may be defined using one of the
* are equivalent:
* <code><pre>
* var e1 = driver.findElement(By.id('foo'));
@@ -3882,48 +3883,41 @@ declare module webdriver {
* one this instance is currently focused on), a
* {@link bot.ErrorCode.NO_SUCH_ELEMENT} error will be returned.
*
* @param {!(webdriver.Locator|Object.<string>|Element)} locatorOrElement The
* locator strategy to use when searching for the element, or the actual
* DOM element to be located by the server.
* @param {...} var_args Arguments to pass to {@code #executeScript} if using a
* JavaScript locator. Otherwise ignored.
* @param {!(webdriver.Locator|webdriver.By.Hash|Element|Function)} locator The
* locator to use.
* @return {!webdriver.WebElement} A WebElement that can be used to issue
* commands against the located element. If the element is not found, the
* element will be invalidated and all scheduled commands aborted.
*/
findElement(locatorOrElement: Locator, ...var_args: any[]): WebElementPromise;
findElement(locatorOrElement: any, ...var_args: any[]): WebElementPromise;
findElement(locatorOrElement: Locator): WebElementPromise;
findElement(locatorOrElement: any): WebElementPromise;
/**
* Schedules a command to test if an element is present on the page.
*
* <p>If given a DOM element, this function will check if it belongs to the
* If given a DOM element, this function will check if it belongs to the
* document the driver is currently focused on. Otherwise, the function will
* test if at least one element can be found with the given search criteria.
*
* @param {!(webdriver.Locator|Object.<string>|Element)} locatorOrElement The
* locator strategy to use when searching for the element, or the actual
* @param {!(webdriver.Locator|webdriver.By.Hash|Element|
* Function)} locatorOrElement The locator to use, or the actual
* DOM element to be located by the server.
* @param {...} var_args Arguments to pass to {@code #executeScript} if using a
* JavaScript locator. Otherwise ignored.
* @return {!webdriver.promise.Promise} A promise that will resolve to whether
* the element is present on the page.
* @return {!webdriver.promise.Promise.<boolean>} A promise that will resolve
* with whether the element is present on the page.
*/
isElementPresent(locatorOrElement: Locator, ...var_args: any[]): webdriver.promise.Promise<boolean>;
isElementPresent(locatorOrElement: any, ...var_args: any[]): webdriver.promise.Promise<boolean>;
isElementPresent(locatorOrElement: Locator): webdriver.promise.Promise<boolean>;
isElementPresent(locatorOrElement: any): webdriver.promise.Promise<boolean>;
/**
* Schedule a command to search for multiple elements on the page.
*
* @param {webdriver.Locator|Object.<string>} locator The locator
* @param {!(webdriver.Locator|webdriver.By.Hash|Function)} locator The locator
* strategy to use when searching for the element.
* @param {...} var_args Arguments to pass to {@code #executeScript} if using a
* JavaScript locator. Otherwise ignored.
* @return {!webdriver.promise.Promise} A promise that will be resolved to an
* array of the located {@link webdriver.WebElement}s.
* @return {!webdriver.promise.Promise.<!Array.<!webdriver.WebElement>>} A
* promise that will resolve to an array of WebElements.
*/
findElements(locator: Locator, ...var_args: any[]): webdriver.promise.Promise<WebElement[]>;
findElements(locator: any, ...var_args: any[]): webdriver.promise.Promise<WebElement[]>;
findElements(locator: Locator): webdriver.promise.Promise<WebElement[]>;
findElements(locator: any): webdriver.promise.Promise<WebElement[]>;
/**
* Schedule a command to take a screenshot. The driver makes a best effort to