From d1b470c7978518c1c06443fb7bb77c990906778f Mon Sep 17 00:00:00 2001 From: Brian Seeders Date: Mon, 18 Apr 2022 11:31:34 -0400 Subject: [PATCH] Remove clickWithRetries stuff for now --- test/functional/page_objects/time_picker.ts | 2 +- test/functional/services/common/find.ts | 23 ------------------- .../services/common/test_subjects.ts | 15 ------------ .../web_element_wrapper.ts | 13 ----------- 4 files changed, 1 insertion(+), 52 deletions(-) diff --git a/test/functional/page_objects/time_picker.ts b/test/functional/page_objects/time_picker.ts index f15672a782744..5c3c0d81890dd 100644 --- a/test/functional/page_objects/time_picker.ts +++ b/test/functional/page_objects/time_picker.ts @@ -110,7 +110,7 @@ export class TimePickerPageObject extends FtrService { timeout: 50, }); if (isShowDatesButton) { - await this.testSubjects.clickWithRetries('superDatePickerShowDatesButton', 0, 50); + await this.testSubjects.click('superDatePickerShowDatesButton', 50); } await this.testSubjects.exists('superDatePickerstartDatePopoverButton', { timeout: 1000 }); // Close the start date popover which opens automatically if `superDatePickerShowDatesButton` is clicked diff --git a/test/functional/services/common/find.ts b/test/functional/services/common/find.ts index 1280d65804e23..978060e9423f2 100644 --- a/test/functional/services/common/find.ts +++ b/test/functional/services/common/find.ts @@ -376,29 +376,6 @@ export class FindService extends FtrService { }); } - public async clickByCssSelectorWithRetries( - selector: string, - timeout: number = this.defaultFindTimeout, - topOffset?: number, - retries?: number - ): Promise { - this.log.debug( - `Find.clickByCssSelectorWithRetries('${selector}') with timeout=${timeout}, retries=${retries}` - ); - await this.retry.tryForTime(1000, async () => { - const element = await this.byCssSelector(selector, timeout); - if (element) { - if (typeof retries === 'number') { - await element.clickWithRetries(retries, topOffset); - } else { - await element.click(topOffset); - } - } else { - throw new Error(`Element with css='${selector}' is not found`); - } - }); - } - public async clickByDisplayedLinkText( linkText: string, timeout: number = this.defaultFindTimeout diff --git a/test/functional/services/common/test_subjects.ts b/test/functional/services/common/test_subjects.ts index 3553d9a0bdcac..09c54af7b8811 100644 --- a/test/functional/services/common/test_subjects.ts +++ b/test/functional/services/common/test_subjects.ts @@ -104,21 +104,6 @@ export class TestSubjects extends FtrService { await this.findService.clickByCssSelector(testSubjSelector(selector), timeout, topOffset); } - public async clickWithRetries( - selector: string, - retries: number, - timeout: number = this.FIND_TIME, - topOffset?: number - ): Promise { - this.log.debug(`TestSubjects.clickWithRetries(${selector})`); - await this.findService.clickByCssSelectorWithRetries( - testSubjSelector(selector), - timeout, - topOffset, - retries - ); - } - public async doubleClick(selector: string, timeout: number = this.FIND_TIME): Promise { this.log.debug(`TestSubjects.doubleClick(${selector})`); const element = await this.find(selector, timeout); diff --git a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts index 5c7b5c31b2a9f..ae03721a6e7b8 100644 --- a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts +++ b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts @@ -190,19 +190,6 @@ export class WebElementWrapper { }); } - /** - * Clicks on this element, with the specified number of retries. - * https://seleniumhq.github.io/selenium/docs/api/javascript/module/selenium-webdriver/lib/webdriver_exports_WebElement.html#click - * - * @return {Promise} - */ - public async clickWithRetries(retries: number, topOffset?: number) { - await this.retryCall(async function click(wrapper) { - await wrapper.scrollIntoViewIfNecessary(topOffset); - await wrapper._webElement.click(); - }, retries); - } - /** * Focuses this element. *