Address PR feedback

elastic · Sep 6, 2023 · 46a7566 · 46a7566
1 parent a1c6678
commit 46a7566
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 24 deletions.
diff --git a/test/functional/services/dashboard/panel_settings.ts b/test/functional/services/dashboard/panel_settings.ts
@@ -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';
@@ -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();
       }
     }
@@ -115,10 +122,18 @@ export function DashboardCustomizePanelProvider({ getService, getPageObject }: F
       });
     }
 
-    public async clickToggleShowCustomTimeRange(enable?: boolean) {
-      log.debug('clickToggleShowCustomTimeRange');
+    public async enableCustomTimeRange() {
+      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();
       }
     }

diff --git a/x-pack/test/functional/apps/dashboard/group2/panel_time_range.ts b/x-pack/test/functional/apps/dashboard/group2/panel_time_range.ts
@@ -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();
@@ -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();
@@ -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();
@@ -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();

diff --git a/x-pack/test/functional/apps/dashboard/group3/drilldowns/explore_data_panel_action.ts b/x-pack/test/functional/apps/dashboard/group3/drilldowns/explore_data_panel_action.ts
@@ -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');
     });
@@ -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();
 

diff --git a/x-pack/test/functional/apps/discover/saved_searches.ts b/x-pack/test/functional/apps/discover/saved_searches.ts
@@ -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();
@@ -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();
 

diff --git a/x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts b/x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts
@@ -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();
@@ -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();