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

Fix flakiness on custom time range saved searches #165454

Merged
merged 16 commits into from
Sep 25, 2023
Merged

Fix flakiness on custom time range saved searches #165454

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e61629a
Wait for the custom time range toggle animation
gsoldevila Sep 1, 2023
f74edaa
Use existing common.sleep() when possible
gsoldevila Sep 1, 2023
fb9d771
[CI] Auto-commit changed files from 'node scripts/precommit_hook.js -…
kibanamachine Sep 1, 2023
49027fa
Make sure we toggle to the right state
gsoldevila Sep 5, 2023
b960129
Merge branch 'main' into fix-flakiness-on-custom-time-range-saved-sea…
gsoldevila Sep 5, 2023
a1c6678
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Sep 5, 2023
46a7566
Address PR feedback
gsoldevila Sep 6, 2023
5869890
Add retry mechanism for toggles' missed clicks
gsoldevila Sep 6, 2023
cc323cc
Merge branch 'main' into fix-flakiness-on-custom-time-range-saved-sea…
gsoldevila Sep 6, 2023
5b47af8
Fix custom time range state detection
gsoldevila Sep 7, 2023
83d14d2
Fix logic using isSelected incorrectly
gsoldevila Sep 14, 2023
76ab208
Merge branch 'main' into fix-flakiness-on-custom-time-range-saved-sea…
gsoldevila Sep 14, 2023
5b033d2
Misc enhancements
gsoldevila Sep 14, 2023
3fc0ccc
Use a retry block to make logic resilient to lost clicks
gsoldevila Sep 21, 2023
5bf114e
Merge branch 'main' into fix-flakiness-on-custom-time-range-saved-sea…
gsoldevila Sep 21, 2023
28132c7
Rely on #166239 for handling the opening of the super date picker
gsoldevila Sep 21, 2023
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
29 changes: 22 additions & 7 deletions test/functional/services/dashboard/panel_settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export function DashboardCustomizePanelProvider({ getService, getPageObject }: F
const retry = getService('retry');
const toasts = getService('toasts');
const testSubjects = getService('testSubjects');
const common = getPageObject('common');

return new (class DashboardCustomizePanel {
public readonly FLYOUT_TEST_SUBJ = 'customizePanel';
Expand Down Expand Up @@ -56,10 +55,18 @@ export function DashboardCustomizePanelProvider({ getService, getPageObject }: F
return await this.findFlyoutTestSubject('superDatePickerToggleQuickMenuButton');
}

public async clickToggleQuickMenuButton(open?: boolean) {
log.debug('clickToggleQuickMenuButton');
public async openDatePickerQuickMenu() {
log.debug('openDatePickerQuickMenu');
const button = await this.findToggleQuickMenuButton();
if (typeof open === 'undefined' || open !== (await button.isSelected())) {
if (!(await button.isSelected())) {
await button.click();
}
}

public async closeDatePickerQuickMenu() {
log.debug('closeDatePickerQuickMenu');
const button = await this.findToggleQuickMenuButton();
if (await button.isSelected()) {
await button.click();
}
}
Expand Down Expand Up @@ -115,10 +122,18 @@ export function DashboardCustomizePanelProvider({ getService, getPageObject }: F
});
}

public async clickToggleShowCustomTimeRange(enable?: boolean) {
log.debug('clickToggleShowCustomTimeRange');
public async enableCustomTimeRange() {
Copy link
Contributor

@nreese nreese Sep 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great. One more thing, since it sounds like missing clicks is one cause of flakyness, how about adding a retry

const toggle = await testSubjects.find(this.TOGGLE_TIME_RANGE_TEST_SUBJ);
await retry.try(async () => {
  if (!(await toggle.isSelected())) {
    await toggle.click();
    if (!(await toggle.isSelected())) {
      throw new Error('Switch click missed');
    }
  }
});

log.debug('enableCustomTimeRange');
const toggle = await testSubjects.find(this.TOGGLE_TIME_RANGE_TEST_SUBJ);
if (!(await toggle.isSelected())) {
await toggle.click();
}
}

public async disableCustomTimeRange() {
log.debug('disableCustomTimeRange');
const toggle = await testSubjects.find(this.TOGGLE_TIME_RANGE_TEST_SUBJ);
if (typeof enable !== 'undefined' || enable !== toggle.isSelected()) {
if (await toggle.isSelected()) {
await toggle.click();
}
}
Expand Down
12 changes: 6 additions & 6 deletions x-pack/test/functional/apps/dashboard/group2/panel_time_range.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('can add a custom time range to a panel', async () => {
await PageObjects.lens.createAndAddLensFromDashboard({});
await dashboardPanelActions.customizePanel();
await dashboardCustomizePanel.clickToggleShowCustomTimeRange(true);
await dashboardCustomizePanel.clickToggleQuickMenuButton(true);
await dashboardCustomizePanel.enableCustomTimeRange();
await dashboardCustomizePanel.openDatePickerQuickMenu();
await dashboardCustomizePanel.clickCommonlyUsedTimeRange('Last_30 days');
await dashboardCustomizePanel.clickSaveButton();
await PageObjects.dashboard.waitForRenderComplete();
Expand All @@ -56,7 +56,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

it('can remove a custom time range from a panel', async () => {
await dashboardBadgeActions.clickTimeRangeBadgeAction();
await dashboardCustomizePanel.clickToggleShowCustomTimeRange(false);
await dashboardCustomizePanel.disableCustomTimeRange();
await dashboardCustomizePanel.clickSaveButton();
await PageObjects.dashboard.waitForRenderComplete();
await dashboardBadgeActions.expectMissingTimeRangeBadgeAction();
Expand All @@ -68,8 +68,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
it('can add a custom time range to panel', async () => {
await dashboardPanelActions.saveToLibrary('My by reference visualization');
await dashboardPanelActions.customizePanel();
await dashboardCustomizePanel.clickToggleShowCustomTimeRange(true);
await dashboardCustomizePanel.clickToggleQuickMenuButton(true);
await dashboardCustomizePanel.enableCustomTimeRange();
await dashboardCustomizePanel.openDatePickerQuickMenu();
await dashboardCustomizePanel.clickCommonlyUsedTimeRange('Last_30 days');
await dashboardCustomizePanel.clickSaveButton();
await PageObjects.dashboard.waitForRenderComplete();
Expand All @@ -80,7 +80,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

it('can remove a custom time range from a panel', async () => {
await dashboardBadgeActions.clickTimeRangeBadgeAction();
await dashboardCustomizePanel.clickToggleShowCustomTimeRange(false);
await dashboardCustomizePanel.disableCustomTimeRange();
await dashboardCustomizePanel.clickSaveButton();
await PageObjects.dashboard.waitForRenderComplete();
await dashboardBadgeActions.expectMissingTimeRangeBadgeAction();
Expand Down
6 changes: 3 additions & 3 deletions x-pack/test/functional/apps/dashboard/group3/drilldowns/explore_data_panel_action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await dashboard.gotoDashboardEditMode(drilldowns.DASHBOARD_WITH_PIE_CHART_NAME);

await panelActions.customizePanel();
await dashboardCustomizePanel.clickToggleShowCustomTimeRange(false);
await dashboardCustomizePanel.disableCustomTimeRange();
await dashboardCustomizePanel.clickSaveButton();
await dashboard.saveDashboard('Dashboard with Pie Chart');
});
Expand Down Expand Up @@ -80,8 +80,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await dashboard.gotoDashboardEditMode(drilldowns.DASHBOARD_WITH_PIE_CHART_NAME);

await panelActions.customizePanel();
await dashboardCustomizePanel.clickToggleShowCustomTimeRange(true);
await dashboardCustomizePanel.clickToggleQuickMenuButton(true);
await dashboardCustomizePanel.enableCustomTimeRange();
await dashboardCustomizePanel.openDatePickerQuickMenu();
await dashboardCustomizePanel.clickCommonlyUsedTimeRange('Last_90 days');
await dashboardCustomizePanel.clickSaveButton();

Expand Down
7 changes: 3 additions & 4 deletions x-pack/test/functional/apps/discover/saved_searches.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await PageObjects.common.unsetTime();
});

// FLAKY: https://github.com/elastic/kibana/issues/104578
describe.skip('Customize time range', () => {
describe('Customize time range', () => {
it('should be possible to customize time range for saved searches on dashboards', async () => {
await PageObjects.common.navigateToApp('dashboard');
await PageObjects.dashboard.clickNewDashboard();
Expand All @@ -55,8 +54,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
expect(await dataGrid.getDocCount()).to.be(500);

await panelActions.customizePanel();
await dashboardCustomizePanel.clickToggleShowCustomTimeRange(true);
await dashboardCustomizePanel.clickToggleQuickMenuButton(true);
await dashboardCustomizePanel.enableCustomTimeRange();
await dashboardCustomizePanel.openDatePickerQuickMenu();
await dashboardCustomizePanel.clickCommonlyUsedTimeRange('Last_90 days');
await dashboardCustomizePanel.clickSaveButton();

Expand Down
8 changes: 4 additions & 4 deletions x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
await dashboard.waitForRenderComplete();
const originalEmbeddableCount = await canvas.getEmbeddableCount();
await dashboardPanelActions.customizePanel();
await dashboardCustomizePanel.clickToggleShowCustomTimeRange(true);
await dashboardCustomizePanel.clickToggleQuickMenuButton(true);
await dashboardCustomizePanel.enableCustomTimeRange();
await dashboardCustomizePanel.openDatePickerQuickMenu();
await dashboardCustomizePanel.clickCommonlyUsedTimeRange('Last_30 days');
await dashboardCustomizePanel.clickSaveButton();
await dashboard.waitForRenderComplete();
Expand Down Expand Up @@ -80,8 +80,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
await dashboard.waitForRenderComplete();
const originalEmbeddableCount = await canvas.getEmbeddableCount();
await dashboardPanelActions.customizePanel();
await dashboardCustomizePanel.clickToggleShowCustomTimeRange(true);
await dashboardCustomizePanel.clickToggleQuickMenuButton(true);
await dashboardCustomizePanel.enableCustomTimeRange();
await dashboardCustomizePanel.openDatePickerQuickMenu();
await dashboardCustomizePanel.clickCommonlyUsedTimeRange('Last_30 days');
await dashboardCustomizePanel.clickSaveButton();
await dashboard.waitForRenderComplete();
Expand Down