Check for submit button to be disabled

kertal · kertal · commit 460d2943e154 · 2020-07-30T08:31:22.000+02:00
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
@@ -51,11 +51,16 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
     public async saveSearch(searchName: string) {
       await this.clickSaveSearchButton();
       // preventing an occasional flakiness when the saved object wasn't set and the form can't be submitted
-      await retry.waitFor(`saved search can be persisted name ${searchName}`, async () => {
-        await testSubjects.setValue('savedObjectTitle', searchName);
-        await testSubjects.click('confirmSaveSavedObjectButton');
-        return (await header.isGlobalLoadingIndicatorVisible()) === true;
-      });
+      await retry.waitFor(
+        `saved search title is set to ${searchName} and save button is clickable`,
+        async () => {
+          const saveButton = await testSubjects.find('confirmSaveSavedObjectButton');
+          await testSubjects.setValue('savedObjectTitle', searchName);
+          return (await saveButton.getAttribute('disabled')) !== 'true';
+        }
+      );
+      await testSubjects.click('confirmSaveSavedObjectButton');
+      await header.waitUntilLoadingHasFinished();
       // LeeDr - this additional checking for the saved search name was an attempt
       // to cause this method to wait for the reloading of the page to complete so
       // that the next action wouldn't have to retry.  But it doesn't really solve
