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

[services/testSubjects] fix isDisplayed/isEnabled/isSelected, add waitForEnabled #66538

Merged
merged 6 commits into from
May 18, 2020
Merged

[services/testSubjects] fix isDisplayed/isEnabled/isSelected, add waitForEnabled #66538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ca671f2
[services/testSubjects] reduce retry usage, add waitForEnabled
dmlemeshko May 14, 2020
fcb66fd
Merge branch 'master' into ftr/remove-retry-usage-in-testSubjects
elasticmachine May 14, 2020
1bcf567
Merge branch 'master' into ftr/remove-retry-usage-in-testSubjects
elasticmachine May 15, 2020
a811206
Merge remote-tracking branch 'upstream/master' into ftr/remove-retry-…
dmlemeshko May 15, 2020
250a96b
Merge branch 'ftr/remove-retry-usage-in-testSubjects' of github.com:d…
dmlemeshko May 15, 2020
3b8b1d7
Merge branch 'master' into ftr/remove-retry-usage-in-testSubjects
elasticmachine May 18, 2020
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
3 changes: 1 addition & 2 deletions test/functional/page_objects/home_page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ export function HomePageProvider({ getService, getPageObjects }: FtrProviderCont

async removeSampleDataSet(id: string) {
// looks like overkill but we're hitting flaky cases where we click but it doesn't remove
await testSubjects.isDisplayed(`removeSampleDataSet${id}`);
await testSubjects.isEnabled(`removeSampleDataSet${id}`);
await testSubjects.waitForEnabled(`removeSampleDataSet${id}`);
await testSubjects.click(`removeSampleDataSet${id}`);
await this._waitForSampleDataLoadingAction(id);
}
Expand Down
59 changes: 27 additions & 32 deletions test/functional/services/common/test_subjects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,10 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
}

public async append(selector: string, text: string): Promise<void> {
return await retry.try(async () => {
log.debug(`TestSubjects.append(${selector}, ${text})`);
const input = await this.find(selector);
await input.click();
await input.type(text);
});
log.debug(`TestSubjects.append(${selector}, ${text})`);
const input = await this.find(selector);
await input.click();
await input.type(text);
}

public async clickWhenNotDisabled(
Expand All @@ -119,12 +117,10 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
}

public async doubleClick(selector: string, timeout: number = FIND_TIME): Promise<void> {
return await retry.try(async () => {
log.debug(`TestSubjects.doubleClick(${selector})`);
const element = await this.find(selector, timeout);
await element.moveMouseTo();
await element.doubleClick();
});
log.debug(`TestSubjects.doubleClick(${selector})`);
const element = await this.find(selector, timeout);
await element.moveMouseTo();
await element.doubleClick();
}

async descendantExists(selector: string, parentElement: WebElementWrapper): Promise<boolean> {
Expand Down Expand Up @@ -210,27 +206,21 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
}

public async isEnabled(selector: string): Promise<boolean> {
return await retry.try(async () => {
log.debug(`TestSubjects.isEnabled(${selector})`);
const element = await this.find(selector);
return await element.isEnabled();
});
log.debug(`TestSubjects.isEnabled(${selector})`);
const element = await this.find(selector);
return await element.isEnabled();
}

public async isDisplayed(selector: string): Promise<boolean> {
return await retry.try(async () => {
log.debug(`TestSubjects.isDisplayed(${selector})`);
const element = await this.find(selector);
return await element.isDisplayed();
});
log.debug(`TestSubjects.isDisplayed(${selector})`);
const element = await this.find(selector);
return await element.isDisplayed();
}

public async isSelected(selector: string): Promise<boolean> {
return await retry.try(async () => {
log.debug(`TestSubjects.isSelected(${selector})`);
const element = await this.find(selector);
return await element.isSelected();
});
log.debug(`TestSubjects.isSelected(${selector})`);
const element = await this.find(selector);
return await element.isSelected();
}

public async isSelectedAll(selectorAll: string): Promise<boolean[]> {
Expand All @@ -241,11 +231,9 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
}

public async getVisibleText(selector: string): Promise<string> {
return await retry.try(async () => {
log.debug(`TestSubjects.getVisibleText(${selector})`);
const element = await this.find(selector);
return await element.getVisibleText();
});
log.debug(`TestSubjects.getVisibleText(${selector})`);
const element = await this.find(selector);
return await element.getVisibleText();
}

async getVisibleTextAll(selectorAll: string): Promise<string[]> {
Expand Down Expand Up @@ -298,6 +286,13 @@ export function TestSubjectsProvider({ getService }: FtrProviderContext) {
await find.waitForElementHidden(element, timeout);
}

public async waitForEnabled(selector: string, timeout: number = TRY_TIME): Promise<void> {
await retry.tryForTime(timeout, async () => {
const element = await this.find(selector);
return (await element.isDisplayed()) && (await element.isEnabled());
});
}

public getCssSelector(selector: string): string {
return testSubjSelector(selector);
}
Expand Down