Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.x] [functional/services] import By/until from module (#66015) #66165

Merged
merged 1 commit into from
May 12, 2020
Merged

[7.x] [functional/services] import By/until from module (#66015) #66165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions test/functional/services/find.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,16 @@
* under the License.
*/

import { WebDriver, WebElement, By } from 'selenium-webdriver';
import { WebDriver, WebElement, By, until } from 'selenium-webdriver';
import { FtrProviderContext } from '../ftr_provider_context';
import { WebElementWrapper } from './lib/web_element_wrapper';

export async function FindProvider({ getService }: FtrProviderContext) {
const log = getService('log');
const config = getService('config');
const webdriver = await getService('__webdriver__').init();
const { driver, browserType } = await getService('__webdriver__').init();
const retry = getService('retry');

const driver = webdriver.driver;
const until = webdriver.until;
const browserType = webdriver.browserType;

const WAIT_FOR_EXISTS_TIME = config.get('timeouts.waitForExists');
const POLLING_TIME = 500;
const defaultFindTimeout = config.get('timeouts.find');
Expand All @@ -40,7 +36,7 @@ export async function FindProvider({ getService }: FtrProviderContext) {
WebElementWrapper.create(
webElement,
locator,
webdriver,
driver,
defaultFindTimeout,
fixedHeaderHeight,
log,
Expand Down
21 changes: 7 additions & 14 deletions test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

import { delay } from 'bluebird';
import { WebElement, WebDriver, By, Key, until } from 'selenium-webdriver';
import { WebElement, WebDriver, By, Key } from 'selenium-webdriver';
import { PNG } from 'pngjs';
// @ts-ignore not supported yet
import cheerio from 'cheerio';
Expand All @@ -29,12 +29,6 @@ import { CustomCheerio, CustomCheerioStatic } from './custom_cheerio_api';
import { scrollIntoViewIfNecessary } from './scroll_into_view_if_necessary';
import { Browsers } from '../../remote/browsers';

interface Driver {
driver: WebDriver;
By: typeof By;
until: typeof until;
}

interface TypeOptions {
charByChar: boolean;
}
Expand All @@ -51,16 +45,15 @@ const RETRY_CLICK_RETRY_ON_ERRORS = [
];

export class WebElementWrapper {
private By = this.webDriver.By;
private driver: WebDriver = this.webDriver.driver;
private By = By;
private Keys = Key;
public isW3CEnabled: boolean = (this.webDriver.driver as any).executor_.w3c === true;
public isW3CEnabled: boolean = (this.driver as any).executor_.w3c === true;
public isChromium: boolean = [Browsers.Chrome, Browsers.ChromiumEdge].includes(this.browserType);

public static create(
webElement: WebElement | WebElementWrapper,
locator: By | null,
webDriver: Driver,
driver: WebDriver,
timeout: number,
fixedHeaderHeight: number,
logger: ToolingLog,
Expand All @@ -73,7 +66,7 @@ export class WebElementWrapper {
return new WebElementWrapper(
webElement,
locator,
webDriver,
driver,
timeout,
fixedHeaderHeight,
logger,
Expand All @@ -84,7 +77,7 @@ export class WebElementWrapper {
constructor(
public _webElement: WebElement,
private locator: By | null,
private webDriver: Driver,
private driver: WebDriver,
private timeout: number,
private fixedHeaderHeight: number,
private logger: ToolingLog,
Expand All @@ -109,7 +102,7 @@ export class WebElementWrapper {
return WebElementWrapper.create(
otherWebElement,
locator,
this.webDriver,
this.driver,
this.timeout,
this.fixedHeaderHeight,
this.logger,
Expand Down
4 changes: 2 additions & 2 deletions test/functional/services/remote/remote.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
}
};

const { driver, By, until, consoleLog$ } = await initWebDriver(
const { driver, consoleLog$ } = await initWebDriver(
log,
browserType,
lifecycle,
Expand Down Expand Up @@ -98,5 +98,5 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
await driver.quit();
});

return { driver, By, until, browserType, consoleLog$ };
return { driver, browserType, consoleLog$ };
}
4 changes: 2 additions & 2 deletions test/functional/services/remote/webdriver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { delay } from 'bluebird';
import chromeDriver from 'chromedriver';
// @ts-ignore types not available
import geckoDriver from 'geckodriver';
import { Builder, Capabilities, By, logging, until } from 'selenium-webdriver';
import { Builder, Capabilities, logging } from 'selenium-webdriver';
import chrome from 'selenium-webdriver/chrome';
import firefox from 'selenium-webdriver/firefox';
import edge from 'selenium-webdriver/edge';
Expand Down Expand Up @@ -300,7 +300,7 @@ async function attemptToCreateCommand(
return;
} // abort

return { driver: session, By, until, consoleLog$ };
return { driver: session, consoleLog$ };
}

export async function initWebDriver(
Expand Down