[Dashboard] Fixes dashboard_save functional test (#98830)

Co-authored-by: Kibana Machine <[email protected]>
elastic · May 17, 2021 · 9aa7892 · 9aa7892
1 parent 49b1ccd
commit 9aa7892
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/test/functional/apps/dashboard/dashboard_save.ts b/test/functional/apps/dashboard/dashboard_save.ts
@@ -9,12 +9,12 @@
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
-  const PageObjects = getPageObjects(['dashboard', 'header']);
+  const PageObjects = getPageObjects(['dashboard', 'header', 'visualize']);
   const listingTable = getService('listingTable');
   const testSubjects = getService('testSubjects');
+  const dashboardAddPanel = getService('dashboardAddPanel');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/89476
-  describe.skip('dashboard save', function describeIndexTests() {
+  describe('dashboard save', function describeIndexTests() {
     this.tags('includeFirefox');
     const dashboardName = 'Dashboard Save Test';
     const dashboardNameEnterKey = 'Dashboard Save Test with Enter Key';
@@ -127,6 +127,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       await PageObjects.dashboard.switchToEditMode();
       await PageObjects.dashboard.expectExistsQuickSaveOption();
+      await dashboardAddPanel.clickMarkdownQuickButton();
+      await PageObjects.visualize.saveVisualizationAndReturn();
+      await PageObjects.dashboard.waitForRenderComplete();
       await PageObjects.dashboard.clickQuickSave();
 
       await testSubjects.existOrFail('saveDashboardSuccess');

diff --git a/test/functional/page_objects/dashboard_page.ts b/test/functional/page_objects/dashboard_page.ts
@@ -277,6 +277,7 @@ export function DashboardPageProvider({ getService, getPageObjects }: FtrProvide
     }
 
     public async clickQuickSave() {
+      await this.expectQuickSaveButtonEnabled();
       log.debug('clickQuickSave');
       await testSubjects.click('dashboardQuickSaveMenuItem');
     }
@@ -630,6 +631,15 @@ export function DashboardPageProvider({ getService, getPageObjects }: FtrProvide
       await testSubjects.existOrFail('dashboardQuickSaveMenuItem');
     }
 
+    public async expectQuickSaveButtonEnabled() {
+      log.debug('expectQuickSaveButtonEnabled');
+      const quickSaveButton = await testSubjects.find('dashboardQuickSaveMenuItem');
+      const isDisabled = await quickSaveButton.getAttribute('disabled');
+      if (isDisabled) {
+        throw new Error('Quick save button disabled');
+      }
+    }
+
     public async getNotLoadedVisualizations(vizList: string[]) {
       const checkList = [];
       for (const name of vizList) {