From 21d45bab1087b2a64c84a706ab934d3c573f539c Mon Sep 17 00:00:00 2001
From: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
Date: Mon, 9 May 2022 16:23:09 +0300
Subject: [PATCH] Fix more pie related tests

---
 test/functional/apps/dashboard/group1/legacy_urls.ts      | 4 ++++
 .../apps/dashboard/group2/dashboard_filtering.ts          | 8 ++++++--
 test/functional/apps/dashboard/group3/bwc_shared_urls.ts  | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/test/functional/apps/dashboard/group1/legacy_urls.ts b/test/functional/apps/dashboard/group1/legacy_urls.ts
index e11da2d82fe478..54834bf8969b70 100644
--- a/test/functional/apps/dashboard/group1/legacy_urls.ts
+++ b/test/functional/apps/dashboard/group1/legacy_urls.ts
@@ -25,6 +25,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const listingTable = getService('listingTable');
   const kibanaServer = getService('kibanaServer');
   const security = getService('security');
+  const elasticChart = getService('elasticChart');
 
   let kibanaLegacyBaseUrl: string;
   let kibanaVisualizeBaseUrl: string;
@@ -63,6 +64,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         const url = `${kibanaLegacyBaseUrl}#/dashboard/${testDashboardId}`;
         await browser.get(url, true);
         await PageObjects.header.waitUntilLoadingHasFinished();
+        await elasticChart.setNewChartUiDebugFlag(true);
         await PageObjects.timePicker.setDefaultDataRange();
 
         await PageObjects.dashboard.waitForRenderComplete();
@@ -72,6 +74,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       it('redirects from legacy hash in wrong app', async () => {
         const url = `${kibanaVisualizeBaseUrl}#/dashboard/${testDashboardId}`;
         await browser.get(url, true);
+        await elasticChart.setNewChartUiDebugFlag(true);
         await PageObjects.header.waitUntilLoadingHasFinished();
         await PageObjects.timePicker.setDefaultDataRange();
 
@@ -111,6 +114,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await dashboardAddPanel.addVisualization('legacy url markdown');
         (await find.byLinkText('abc')).click();
         await PageObjects.header.waitUntilLoadingHasFinished();
+        await elasticChart.setNewChartUiDebugFlag(true);
         await PageObjects.timePicker.setDefaultDataRange();
 
         await PageObjects.dashboard.waitForRenderComplete();
diff --git a/test/functional/apps/dashboard/group2/dashboard_filtering.ts b/test/functional/apps/dashboard/group2/dashboard_filtering.ts
index 09acbd5965020e..7cebd74e0829f6 100644
--- a/test/functional/apps/dashboard/group2/dashboard_filtering.ts
+++ b/test/functional/apps/dashboard/group2/dashboard_filtering.ts
@@ -18,6 +18,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const dashboardExpect = getService('dashboardExpect');
   const pieChart = getService('pieChart');
   const queryBar = getService('queryBar');
+  const elasticChart = getService('elasticChart');
   const dashboardAddPanel = getService('dashboardAddPanel');
   const renderable = getService('renderable');
   const testSubjects = getService('testSubjects');
@@ -47,6 +48,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await queryBar.clickQuerySubmitButton();
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.dashboard.waitForRenderComplete();
+      await elasticChart.setNewChartUiDebugFlag(true);
     };
 
     before(async () => {
@@ -85,7 +87,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('filters on pie charts', async () => {
-        await pieChart.expectPieSliceCount(0);
+        await pieChart.expectEmptyPieChart();
       });
 
       it('area, bar and heatmap charts filtered', async () => {
@@ -150,7 +152,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('filters on pie charts', async () => {
-        await pieChart.expectPieSliceCount(0);
+        await pieChart.expectEmptyPieChart();
       });
 
       it('area, bar and heatmap charts filtered', async () => {
@@ -253,6 +255,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     describe('nested filtering', () => {
       before(async () => {
         await PageObjects.dashboard.gotoDashboardLandingPage();
+        await elasticChart.setNewChartUiDebugFlag(true);
       });
 
       it('visualization saved with a query filters data', async () => {
@@ -323,6 +326,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await dashboardAddPanel.addVisualization(
           'Filter Test: animals: linked to search with filter'
         );
+        await elasticChart.setNewChartUiDebugFlag(true);
         await pieChart.expectPieSliceCount(7);
       });
 
diff --git a/test/functional/apps/dashboard/group3/bwc_shared_urls.ts b/test/functional/apps/dashboard/group3/bwc_shared_urls.ts
index 56c5640156167a..c35ec2770168d5 100644
--- a/test/functional/apps/dashboard/group3/bwc_shared_urls.ts
+++ b/test/functional/apps/dashboard/group3/bwc_shared_urls.ts
@@ -119,6 +119,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await elasticChart.setNewChartUiDebugFlag(true);
 
         const query = await queryBar.getQueryString();
+        await queryBar.submitQuery();
         expect(query).to.equal('memory:>220000');
 
         await pieChart.expectPieSliceCount(5);
@@ -137,6 +138,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         const query = await queryBar.getQueryString();
+        await queryBar.submitQuery();
         expect(query).to.equal('boop');
 
         await dashboardExpect.panelCount(2);