[Flaky test fix] Turn back on data_shared_attributes test (#25156) (#…

…25554) * Turn back on data_shared_attributes test and run 20x * Add some clean up * Be more determinism, less refactoring. * Go back to a single test run
elastic · Nov 13, 2018 · 4d4c159 · 4d4c159
1 parent f3e9e8a
commit 4d4c159
Show file tree

Hide file tree

Showing 13 changed files with 90 additions and 129 deletions.
diff --git a/src/core_plugins/kibana/public/dashboard/panel/__snapshots__/dashboard_panel.test.js.snap b/src/core_plugins/kibana/public/dashboard/panel/__snapshots__/dashboard_panel.test.js.snap
@@ -22,6 +22,7 @@ exports[`DashboardPanel matches snapshot 1`] = `
     >
       <div
         class="euiPopover euiPopover--anchorDownRight euiPopover--withTitle dshPanel_optionsMenuPopover"
+        data-test-subj="dashboardPanelContextMenuClosed"
         id="dashboardPanelContextMenu"
       >
         <div

diff --git a/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu.tsx b/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu.tsx
@@ -61,6 +61,9 @@ export function PanelOptionsMenu({
       closePopover={closeContextMenu}
       panelPaddingSize="none"
       anchorPosition="downRight"
+      data-test-subj={
+        isPopoverOpen ? 'dashboardPanelContextMenuOpen' : 'dashboardPanelContextMenuClosed'
+      }
       withTitle
     >
       <EuiContextMenu initialPanelId="mainMenu" panels={panels} />

diff --git a/test/functional/apps/dashboard/_dashboard_filtering.js b/test/functional/apps/dashboard/_dashboard_filtering.js
@@ -240,6 +240,7 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.dashboard.waitForRenderComplete();
         await dashboardExpect.pieSliceCount(5);
 
+        await dashboardPanelActions.openContextMenu();
         await dashboardPanelActions.clickEdit();
         await queryBar.setQuery('weightLbs:>50');
         await queryBar.submitQuery();
@@ -259,6 +260,7 @@ export default function ({ getService, getPageObjects }) {
       });
 
       it('Nested visualization filter pills filters data as expected', async () => {
+        await dashboardPanelActions.openContextMenu();
         await dashboardPanelActions.clickEdit();
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();
@@ -273,6 +275,7 @@ export default function ({ getService, getPageObjects }) {
       });
 
       it('Removing filter pills and query unfiters data as expected', async () => {
+        await dashboardPanelActions.openContextMenu();
         await dashboardPanelActions.clickEdit();
         await PageObjects.header.waitUntilLoadingHasFinished();
         await renderable.waitForRender();

diff --git a/test/functional/apps/dashboard/_dashboard_snapshots.js b/test/functional/apps/dashboard/_dashboard_snapshots.js
@@ -50,7 +50,8 @@ export default function ({ getService, getPageObjects, updateBaselines }) {
       await PageObjects.common.closeToast();
 
       await PageObjects.dashboard.clickFullScreenMode();
-      await dashboardPanelActions.toggleExpandPanel();
+      await dashboardPanelActions.openContextMenu();
+      await dashboardPanelActions.clickExpandPanelToggle();
 
       await PageObjects.dashboard.waitForRenderComplete();
       const percentSimilar = await screenshot.compareAgainstBaseline('tsvb_dashboard', updateBaselines);
@@ -70,7 +71,8 @@ export default function ({ getService, getPageObjects, updateBaselines }) {
       await PageObjects.common.closeToast();
 
       await PageObjects.dashboard.clickFullScreenMode();
-      await dashboardPanelActions.toggleExpandPanel();
+      await dashboardPanelActions.openContextMenu();
+      await dashboardPanelActions.clickExpandPanelToggle();
 
       await PageObjects.dashboard.waitForRenderComplete();
       const percentSimilar = await screenshot.compareAgainstBaseline('area_chart', updateBaselines);

diff --git a/test/functional/apps/dashboard/_dashboard_state.js b/test/functional/apps/dashboard/_dashboard_state.js
@@ -130,6 +130,7 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.visualize.closeInspector();
 
       await PageObjects.dashboard.switchToEditMode();
+      await dashboardPanelActions.openContextMenu();
       await dashboardPanelActions.clickEdit();
 
       await PageObjects.visualize.clickMapZoomIn();

diff --git a/test/functional/apps/dashboard/_data_shared_attributes.js b/test/functional/apps/dashboard/_data_shared_attributes.js
@@ -89,8 +89,7 @@ export default function ({ getService, getPageObjects }) {
       });
     });
 
-    // TODO: flaky https://github.com/elastic/kibana/issues/24287
-    it.skip('data-shared-item title should update a saved search when using a custom panel title', async () => {
+    it('data-shared-item title should update a saved search when using a custom panel title', async () => {
       const CUSTOM_SEARCH_TITLE = 'ima custom title for a search!';
       await dashboardPanelActions.setCustomPanelTitle(CUSTOM_SEARCH_TITLE, 'Rendering Test: saved search');
       await retry.try(async () => {

diff --git a/test/functional/apps/dashboard/_full_screen_mode.js b/test/functional/apps/dashboard/_full_screen_mode.js
@@ -60,7 +60,8 @@ export default function ({ getService, getPageObjects }) {
     });
 
     it('displays exit full screen logo button when panel is expanded', async () => {
-      await dashboardPanelActions.toggleExpandPanel();
+      await dashboardPanelActions.openContextMenu();
+      await dashboardPanelActions.clickExpandPanelToggle();
 
       const exists = await PageObjects.dashboard.exitFullScreenTextButtonExists();
       expect(exists).to.be(true);

diff --git a/test/functional/apps/dashboard/_panel_controls.js b/test/functional/apps/dashboard/_panel_controls.js
@@ -61,11 +61,8 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.dashboard.saveDashboard(dashboardName);
 
         await dashboardPanelActions.openContextMenu();
-        const editLinkExists = await dashboardPanelActions.editPanelActionExists();
-        const removeExists = await dashboardPanelActions.removePanelActionExists();
-
-        expect(editLinkExists).to.equal(false);
-        expect(removeExists).to.equal(false);
+        await dashboardPanelActions.expectMissingEditPanelAction();
+        await dashboardPanelActions.expectMissingRemovePanelAction();
       });
 
       it('are shown in edit mode', async function () {
@@ -75,11 +72,8 @@ export default function ({ getService, getPageObjects }) {
         expect(isContextMenuIconVisible).to.equal(true);
         await dashboardPanelActions.openContextMenu();
 
-        const editLinkExists = await dashboardPanelActions.editPanelActionExists();
-        const removeExists = await dashboardPanelActions.removePanelActionExists();
-
-        expect(editLinkExists).to.equal(true);
-        expect(removeExists).to.equal(true);
+        await dashboardPanelActions.expectExistsEditPanelAction();
+        await dashboardPanelActions.expectExistsRemovePanelAction();
       });
 
       // Based off an actual bug encountered in a PR where a hard refresh in edit mode did not show the edit mode
@@ -91,11 +85,8 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         await dashboardPanelActions.openContextMenu();
-        const editLinkExists = await dashboardPanelActions.editPanelActionExists();
-        expect(editLinkExists).to.equal(true);
-
-        const removeExists = await dashboardPanelActions.removePanelActionExists();
-        expect(removeExists).to.equal(true);
+        await dashboardPanelActions.expectExistsEditPanelAction();
+        await dashboardPanelActions.expectExistsRemovePanelAction();
 
         // Get rid of the timestamp in the url.
         await remote.get(currentUrl.toString(), false);
@@ -104,26 +95,19 @@ export default function ({ getService, getPageObjects }) {
       describe('on an expanded panel', function () {
         it('are hidden in view mode', async function () {
           await PageObjects.dashboard.saveDashboard(dashboardName);
-          await dashboardPanelActions.toggleExpandPanel();
-
           await dashboardPanelActions.openContextMenu();
-          const editLinkExists = await dashboardPanelActions.editPanelActionExists();
-          const removeExists = await dashboardPanelActions.removePanelActionExists();
-
-          expect(editLinkExists).to.equal(false);
-          expect(removeExists).to.equal(false);
+          await dashboardPanelActions.clickExpandPanelToggle();
+          await dashboardPanelActions.openContextMenu();
+          await dashboardPanelActions.expectMissingEditPanelAction();
+          await dashboardPanelActions.expectMissingRemovePanelAction();
         });
 
         it('in edit mode hides remove icons ', async function () {
           await PageObjects.dashboard.switchToEditMode();
           await dashboardPanelActions.openContextMenu();
-          const editLinkExists = await dashboardPanelActions.editPanelActionExists();
-          const removeExists = await dashboardPanelActions.removePanelActionExists();
-
-          expect(editLinkExists).to.equal(true);
-          expect(removeExists).to.equal(false);
-
-          await dashboardPanelActions.toggleExpandPanel();
+          await dashboardPanelActions.expectExistsEditPanelAction();
+          await dashboardPanelActions.expectMissingRemovePanelAction();
+          await dashboardPanelActions.clickExpandPanelToggle();
         });
       });
 
@@ -160,6 +144,7 @@ export default function ({ getService, getPageObjects }) {
         });
 
         it('opens a saved search when edit link is clicked', async () => {
+          await dashboardPanelActions.openContextMenu();
           await dashboardPanelActions.clickEdit();
           await PageObjects.header.waitUntilLoadingHasFinished();
           const queryName = await PageObjects.discover.getCurrentQueryName();
@@ -182,8 +167,7 @@ export default function ({ getService, getPageObjects }) {
       it('shown in edit mode', async function () {
         await PageObjects.dashboard.gotoDashboardEditMode(dashboardName);
         await dashboardPanelActions.openContextMenu();
-        const expandExists = await dashboardPanelActions.toggleExpandActionExists();
-        expect(expandExists).to.equal(true);
+        await dashboardPanelActions.expectExistsToggleExpandAction();
       });
     });
   });

diff --git a/test/functional/apps/dashboard/_panel_expand_toggle.js b/test/functional/apps/dashboard/_panel_expand_toggle.js
@@ -30,7 +30,8 @@ export default function ({ getService, getPageObjects }) {
     });
 
     it('hides other panels', async () => {
-      await dashboardPanelActions.toggleExpandPanel();
+      await dashboardPanelActions.openContextMenu();
+      await dashboardPanelActions.clickExpandPanelToggle();
       await retry.try(async () => {
         const panelCount = await PageObjects.dashboard.getPanelCount();
         expect(panelCount).to.eql(1);
@@ -40,8 +41,10 @@ export default function ({ getService, getPageObjects }) {
     it('shows other panels after being minimized', async () => {
       const panelCount = await PageObjects.dashboard.getPanelCount();
       // Panels are all minimized on a fresh open of a dashboard, so we need to re-expand in order to then minimize.
-      await dashboardPanelActions.toggleExpandPanel();
-      await dashboardPanelActions.toggleExpandPanel();
+      await dashboardPanelActions.openContextMenu();
+      await dashboardPanelActions.clickExpandPanelToggle();
+      await dashboardPanelActions.openContextMenu();
+      await dashboardPanelActions.clickExpandPanelToggle();
 
 
       // Add a retry to fix https://github.com/elastic/kibana/issues/14574.  Perhaps the recent changes to this

diff --git a/test/functional/page_objects/dashboard_page.js b/test/functional/page_objects/dashboard_page.js
@@ -125,24 +125,25 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
      */
     async onDashboardLandingPage() {
       log.debug(`onDashboardLandingPage`);
-      const exists = await testSubjects.exists('dashboardLandingPage');
-      return exists;
+      return await testSubjects.exists('dashboardLandingPage', 5000);
+    }
+
+    async expectExistsDashboardLandingPage() {
+      log.debug(`expectExistsDashboardLandingPage`);
+      await testSubjects.existOrFail('dashboardLandingPage');
     }
 
     async clickDashboardBreadcrumbLink() {
       log.debug('clickDashboardBreadcrumbLink');
       await find.clickByCssSelector(`a[href="#${DashboardConstants.LANDING_PAGE_PATH}"]`);
+      await this.expectExistsDashboardLandingPage();
     }
 
     async gotoDashboardLandingPage() {
       log.debug('gotoDashboardLandingPage');
       const onPage = await this.onDashboardLandingPage();
       if (!onPage) {
-        await retry.try(async () => {
-          await this.clickDashboardBreadcrumbLink();
-          const onDashboardLandingPage = await this.onDashboardLandingPage();
-          if (!onDashboardLandingPage) throw new Error('Not on the landing page.');
-        });
+        await this.clickDashboardBreadcrumbLink();
       }
     }
 
@@ -432,16 +433,10 @@ export function DashboardPageProvider({ getService, getPageObjects }) {
 
       await this.gotoDashboardLandingPage();
 
-      await retry.try(async () => {
-        await this.searchForDashboardWithName(dashName);
-        await this.selectDashboard(dashName);
-        await PageObjects.header.waitUntilLoadingHasFinished();
+      await this.searchForDashboardWithName(dashName);
+      await this.selectDashboard(dashName);
+      await PageObjects.header.waitUntilLoadingHasFinished();
 
-        const onDashboardLandingPage = await this.onDashboardLandingPage();
-        if (onDashboardLandingPage) {
-          throw new Error('Failed to open the dashboard up');
-        }
-      });
     }
 
     async getPanelTitles() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ exports[`DashboardPanel matches snapshot 1`] = ` @@
         >
           <div
             class="euiPopover euiPopover--anchorDownRight euiPopover--withTitle dshPanel_optionsMenuPopover"
+            data-test-subj="dashboardPanelContextMenuClosed"
             id="dashboardPanelContextMenu"
           >
             <div
@@ Expand Down @@