Update _filters.js

elastic · Jun 2, 2020 · 866dd65 · 866dd65
1 parent 9b3c997
commit 866dd65
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/test/functional/apps/context/_filters.js b/test/functional/apps/context/_filters.js
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-import expect from '@kbn/expect';
-
 const TEST_INDEX_PATTERN = 'logstash-*';
 const TEST_ANCHOR_ID = 'AU_x3_BrGFA8no6QjjaI';
 const TEST_ANCHOR_FILTER_FIELD = 'geo.src';
@@ -40,20 +38,19 @@ export default function({ getService, getPageObjects }) {
     });
 
     it('inclusive filter should be addable via expanded doc table rows', async function() {
-      await docTable.toggleRowExpanded({ isAnchorRow: true });
-
-      await retry.try(async () => {
+      await retry.waitFor(`filter ${TEST_ANCHOR_FILTER_FIELD} in filterbar`, async () => {
+        await docTable.toggleRowExpanded({ isAnchorRow: true });
         const anchorDetailsRow = await docTable.getAnchorDetailsRow();
         await docTable.addInclusiveFilter(anchorDetailsRow, TEST_ANCHOR_FILTER_FIELD);
         await PageObjects.context.waitUntilContextLoadingHasFinished();
-        expect(
-          await filterBar.hasFilter(TEST_ANCHOR_FILTER_FIELD, TEST_ANCHOR_FILTER_VALUE, true)
-        ).to.be(true);
+
+        return await filterBar.hasFilter(TEST_ANCHOR_FILTER_FIELD, TEST_ANCHOR_FILTER_VALUE, true);
+      });
+      await retry.waitFor(`filter matching docs in docTable`, async () => {
         const fields = await docTable.getFields();
-        const hasOnlyFilteredRows = fields
+        return fields
           .map(row => row[2])
           .every(fieldContent => fieldContent === TEST_ANCHOR_FILTER_VALUE);
-        expect(hasOnlyFilteredRows).to.be(true);
       });
     });
 
@@ -64,26 +61,29 @@ export default function({ getService, getPageObjects }) {
       await filterBar.toggleFilterEnabled(TEST_ANCHOR_FILTER_FIELD);
       await PageObjects.context.waitUntilContextLoadingHasFinished();
 
-      retry.try(async () => {
-        expect(
-          await filterBar.hasFilter(TEST_ANCHOR_FILTER_FIELD, TEST_ANCHOR_FILTER_VALUE, false)
-        ).to.be(true);
+      await retry.waitFor(`a disabled filter in filterbar`, async () => {
+        return await filterBar.hasFilter(TEST_ANCHOR_FILTER_FIELD, TEST_ANCHOR_FILTER_VALUE, false);
+      });
+
+      await retry.waitFor('filters are disabled', async () => {
         const fields = await docTable.getFields();
         const hasOnlyFilteredRows = fields
           .map(row => row[2])
           .every(fieldContent => fieldContent === TEST_ANCHOR_FILTER_VALUE);
-        expect(hasOnlyFilteredRows).to.be(false);
+        return hasOnlyFilteredRows === false;
       });
+
+      retry.try(async () => {});
     });
 
     it('filter for presence should be addable via expanded doc table rows', async function() {
       await docTable.toggleRowExpanded({ isAnchorRow: true });
 
-      await retry.try(async () => {
+      await retry.waitFor('an exists filter in the filterbar', async () => {
         const anchorDetailsRow = await docTable.getAnchorDetailsRow();
         await docTable.addExistsFilter(anchorDetailsRow, TEST_ANCHOR_FILTER_FIELD);
         await PageObjects.context.waitUntilContextLoadingHasFinished();
-        expect(await filterBar.hasFilter(TEST_ANCHOR_FILTER_FIELD, 'exists', true)).to.be(true);
+        return await filterBar.hasFilter(TEST_ANCHOR_FILTER_FIELD, 'exists', true);
       });
     });
   });