[Discover] Unskip functional test of saved queries (#94705) (#95450)

elastic · Mar 25, 2021 · e5c5875 · e5c5875
1 parent 7e196a0
commit e5c5875
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/test/functional/apps/discover/_saved_queries.ts b/test/functional/apps/discover/_saved_queries.ts
@@ -26,8 +26,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const savedQueryManagementComponent = getService('savedQueryManagementComponent');
   const testSubjects = getService('testSubjects');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/89477
-  describe.skip('saved queries saved objects', function describeIndexTests() {
+  describe('saved queries saved objects', function describeIndexTests() {
     before(async function () {
       log.debug('load kibana index with default index pattern');
       await esArchiver.load('discover');
@@ -120,6 +119,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('does not allow saving a query with a non-unique name', async () => {
+        // this check allows this test to run stand alone, also should fix occacional flakiness
+        const savedQueryExists = await savedQueryManagementComponent.savedQueryExist('OkResponse');
+        if (!savedQueryExists) {
+          await savedQueryManagementComponent.saveNewQuery(
+            'OkResponse',
+            '200 responses for .jpg over 24 hours',
+            true,
+            true
+          );
+          await savedQueryManagementComponent.clearCurrentlyLoadedQuery();
+        }
         await savedQueryManagementComponent.saveNewQueryWithNameError('OkResponse');
       });
 

diff --git a/test/functional/services/saved_query_management_component.ts b/test/functional/services/saved_query_management_component.ts
@@ -139,6 +139,13 @@ export function SavedQueryManagementComponentProvider({
       await testSubjects.click('savedQueryFormSaveButton');
     }
 
+    async savedQueryExist(title: string) {
+      await this.openSavedQueryManagementComponent();
+      const exists = testSubjects.exists(`~load-saved-query-${title}-button`);
+      await this.closeSavedQueryManagementComponent();
+      return exists;
+    }
+
     async savedQueryExistOrFail(title: string) {
       await this.openSavedQueryManagementComponent();
       await testSubjects.existOrFail(`~load-saved-query-${title}-button`);