Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

typings(selenium): try out new version of typings #5084

Merged
merged 2 commits into from
Dec 15, 2018
+6,605 −86
Merged

typings(selenium): try out new version of typings #5084

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9334b51
typings(selenium): try out new version of typings
cnishina Dec 11, 2018
0e6d775
fix travis with a wait
cnishina Dec 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -36,13 +36,13 @@ addons:
- g++-4.8

before_install:
- g++-4.8 --version
- travis_wait g++-4.8 --version

before_script:
- npm run install_testapp
- npm run pretest
- mkdir -p $LOGS_DIR
- ./scripts/travis_setup.sh
- travis_wait ./scripts/travis_setup.sh


script:
126 changes: 54 additions & 72 deletions lib/locators.ts
View file
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ export class ProtractorBy extends WebdriverBy {
this[name] = (...args: any[]): ProtractorLocator => {
const locatorArguments = args;
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
findElementsOverride: async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
let findElementArguments: any[] = [script];
for (let i = 0; i < locatorArguments.length; i++) {
@@ -89,9 +89,7 @@ export class ProtractorBy extends WebdriverBy {
findElementArguments.push(using);
findElementArguments.push(rootSelector);

// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js.apply(By, findElementArguments)) as
Promise<WebElement[]>;
return await driver.findElements(By.js.apply(By, findElementArguments));
},
toString: (): string => {
return 'by.' + name + '("' + Array.prototype.join.call(locatorArguments, '", "') + '")';
@@ -132,12 +130,10 @@ export class ProtractorBy extends WebdriverBy {
*/
binding(bindingDescriptor: string): ProtractorLocator {
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
findElementsOverride: async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js(
clientSideScripts.findBindings, bindingDescriptor, false, using,
rootSelector)) as Promise<WebElement[]>;
return await driver.findElements(By.js(
clientSideScripts.findBindings, bindingDescriptor, false, using, rootSelector));
},
toString: (): string => {
return 'by.binding("' + bindingDescriptor + '")';
@@ -166,13 +162,11 @@ export class ProtractorBy extends WebdriverBy {
*/
exactBinding(bindingDescriptor: string): ProtractorLocator {
return {
findElementsOverride: (
driver: WebDriver, using: WebElement, rootSelector: string): Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js(
clientSideScripts.findBindings, bindingDescriptor, true, using, rootSelector)) as
Promise<WebElement[]>;
},
findElementsOverride: async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
return await driver.findElements(By.js(
clientSideScripts.findBindings, bindingDescriptor, true, using, rootSelector));
},
toString: (): string => {
return 'by.exactBinding("' + bindingDescriptor + '")';
}
@@ -196,12 +190,10 @@ export class ProtractorBy extends WebdriverBy {
*/
model(model: string): ProtractorLocator {
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
findElementsOverride: async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(
By.js(clientSideScripts.findByModel, model, using, rootSelector)) as
Promise<WebElement[]>;
return await driver.findElements(
By.js(clientSideScripts.findByModel, model, using, rootSelector));
},
toString: (): string => {
return 'by.model("' + model + '")';
@@ -223,12 +215,10 @@ export class ProtractorBy extends WebdriverBy {
*/
buttonText(searchText: string): ProtractorLocator {
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
findElementsOverride: async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js(
clientSideScripts.findByButtonText, searchText, using, rootSelector)) as
Promise<WebElement[]>;
return driver.findElements(
By.js(clientSideScripts.findByButtonText, searchText, using, rootSelector));
},
toString: (): string => {
return 'by.buttonText("' + searchText + '")';
@@ -250,13 +240,11 @@ export class ProtractorBy extends WebdriverBy {
*/
partialButtonText(searchText: string): ProtractorLocator {
return {
findElementsOverride: (
driver: WebDriver, using: WebElement, rootSelector: string): Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js(
clientSideScripts.findByPartialButtonText, searchText, using, rootSelector)) as
Promise<WebElement[]>;
},
findElementsOverride: async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
return driver.findElements(
By.js(clientSideScripts.findByPartialButtonText, searchText, using, rootSelector));
},
toString: (): string => {
return 'by.partialButtonText("' + searchText + '")';
}
@@ -267,36 +255,34 @@ export class ProtractorBy extends WebdriverBy {
private byRepeaterInner(exact: boolean, repeatDescriptor: string): ProtractorLocator {
let name = 'by.' + (exact ? 'exactR' : 'r') + 'epeater';
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js(
clientSideScripts.findAllRepeaterRows, repeatDescriptor, exact, using,
rootSelector)) as Promise<WebElement[]>;
},
findElementsOverride: async(
driver: WebDriver, using: WebElement, rootSelector: string): Promise<WebElement[]> => {
return driver.findElements(By.js(
clientSideScripts.findAllRepeaterRows, repeatDescriptor, exact, using, rootSelector));
},
toString: (): string => {
return name + '("' + repeatDescriptor + '")';
},
row: (index: number): ProtractorLocator => {
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
findElementsOverride: async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
return driver.findElements(By.js(
clientSideScripts.findRepeaterRows, repeatDescriptor, exact, index,
using, rootSelector)) as Promise<WebElement[]>;
return await driver.findElements(By.js(
clientSideScripts.findRepeaterRows, repeatDescriptor, exact, index, using,
rootSelector));
},
toString: (): string => {
return name + '(' + repeatDescriptor + '").row("' + index + '")"';
},
column: (binding: string): ProtractorLocator => {
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js(
clientSideScripts.findRepeaterElement, repeatDescriptor, exact,
index, binding, using, rootSelector)) as Promise<WebElement[]>;
},
findElementsOverride:
async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
return driver.findElements(By.js(
clientSideScripts.findRepeaterElement, repeatDescriptor, exact, index,
binding, using, rootSelector));
},
toString: (): string => {
return name + '("' + repeatDescriptor + '").row("' + index + '").column("' +
binding + '")';
@@ -307,25 +293,24 @@ export class ProtractorBy extends WebdriverBy {
},
column: (binding: string): ProtractorLocator => {
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
findElementsOverride: async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js(
clientSideScripts.findRepeaterColumn, repeatDescriptor, exact, binding,
using, rootSelector)) as Promise<WebElement[]>;
clientSideScripts.findRepeaterColumn, repeatDescriptor, exact, binding, using,
rootSelector));
},
toString: (): string => {
return name + '("' + repeatDescriptor + '").column("' + binding + '")';
},
row: (index: number): ProtractorLocator => {
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js(
clientSideScripts.findRepeaterElement, repeatDescriptor, exact,
index, binding, using, rootSelector)) as Promise<WebElement[]>;
},
findElementsOverride:
async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
return driver.findElements(By.js(
clientSideScripts.findRepeaterElement, repeatDescriptor, exact, index,
binding, using, rootSelector));
},
toString: (): string => {
return name + '("' + repeatDescriptor + '").column("' + binding + '").row("' +
index + '")';
@@ -437,12 +422,11 @@ export class ProtractorBy extends WebdriverBy {
cssContainingText(cssSelector: string, searchText: string|RegExp): ProtractorLocator {
searchText = (searchText instanceof RegExp) ? '__REGEXP__' + searchText.toString() : searchText;
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
findElementsOverride: async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js(
clientSideScripts.findByCssContainingText, cssSelector, searchText, using,
rootSelector)) as Promise<WebElement[]>;
return await driver.findElements(By.js(
clientSideScripts.findByCssContainingText, cssSelector, searchText, using,
rootSelector));
},
toString: (): string => {
return 'by.cssContainingText("' + cssSelector + '", "' + searchText + '")';
@@ -471,12 +455,10 @@ export class ProtractorBy extends WebdriverBy {
*/
options(optionsDescriptor: string): ProtractorLocator {
return {
findElementsOverride: (driver: WebDriver, using: WebElement, rootSelector: string):
findElementsOverride: async(driver: WebDriver, using: WebElement, rootSelector: string):
Promise<WebElement[]> => {
// TODO(selenium4): clean up cast to native Promise.
return driver.findElements(By.js(
clientSideScripts.findByOptions, optionsDescriptor, using, rootSelector)) as
Promise<WebElement[]>;
return await driver.findElements(
By.js(clientSideScripts.findByOptions, optionsDescriptor, using, rootSelector));
},
toString: (): string => {
return 'by.option("' + optionsDescriptor + '")';
34 changes: 24 additions & 10 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@
"author": "Julie Ralph <[email protected]>",
"dependencies": {
"@types/node": "^6.0.46",
"@types/selenium-webdriver": "^3.0.0",
"blocking-proxy": "^1.0.0",
"browserstack": "^1.5.1",
"chalk": "^1.1.3",
3 changes: 2 additions & 1 deletion tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
"website",
"scripts",
"exampleTypescript",
"spec/**/*"
"spec/**/*",
"typings"
]
}
Loading