From cca907611623e14aead320c27db8d0b4437d05ae Mon Sep 17 00:00:00 2001
From: sulemanof <sul-dan@mail.ru>
Date: Thu, 2 Apr 2020 17:19:17 +0300
Subject: [PATCH] Use alternative flaky fix

---
 test/functional/apps/discover/_field_visualize.ts |  3 ---
 test/functional/page_objects/discover_page.ts     | 14 ++++++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/test/functional/apps/discover/_field_visualize.ts b/test/functional/apps/discover/_field_visualize.ts
index 01dd9f692c2b02..67a44d076ad355 100644
--- a/test/functional/apps/discover/_field_visualize.ts
+++ b/test/functional/apps/discover/_field_visualize.ts
@@ -52,7 +52,6 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
 
     it('should visualize a field in area chart', async () => {
       await PageObjects.discover.findFieldByName('phpmemory');
-      await PageObjects.discover.clickFieldListItem('phpmemory');
       log.debug('visualize a phpmemory field');
       await PageObjects.discover.clickFieldListItemVisualize('phpmemory');
       await PageObjects.header.waitUntilLoadingHasFinished();
@@ -86,7 +85,6 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
     it('should preserve app filters in visualize', async () => {
       await filterBar.addFilter('bytes', 'is between', '3500', '4000');
       await PageObjects.discover.findFieldByName('geo.src');
-      await PageObjects.discover.clickFieldListItem('geo.src');
       log.debug('visualize a geo.src field with filter applied');
       await PageObjects.discover.clickFieldListItemVisualize('geo.src');
       await PageObjects.header.waitUntilLoadingHasFinished();
@@ -123,7 +121,6 @@ export default function({ getService, getPageObjects }: FtrProviderContext) {
       await queryBar.setQuery('machine.os : ios');
       await queryBar.submitQuery();
       await PageObjects.discover.findFieldByName('geo.dest');
-      await PageObjects.discover.clickFieldListItem('geo.dest');
       log.debug('visualize a geo.dest field with query applied');
       await PageObjects.discover.clickFieldListItemVisualize('geo.dest');
       await PageObjects.header.waitUntilLoadingHasFinished();
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index b270889939f33a..c66562d22270ab 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -244,10 +244,16 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
       await testSubjects.click(`fieldToggle-${field}`);
     }
 
-    public async clickFieldListItemVisualize(field: string) {
-      return await retry.try(async () => {
-        await testSubjects.click(`fieldVisualize-${field}`);
-      });
+    public async clickFieldListItemVisualize(fieldName: string) {
+      const field = await testSubjects.find(`field-${fieldName}`);
+      const isActive = await field.elementHasClass('dscSidebarItem--active');
+
+      if (!isActive) {
+        // expand the field to show the "Visualize" button
+        await field.click();
+      }
+
+      await testSubjects.click(`fieldVisualize-${fieldName}`);
     }
 
     public async expectFieldListItemVisualize(field: string) {