fix functional 3 and 4

Signed-off-by: abbyhu2000 <[email protected]>
abbyhu2000 · Feb 6, 2024 · e8f6843 · e8f6843
1 parent ac2f7dd
commit e8f6843
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.js b/test/functional/apps/dashboard/dashboard_filter_bar.js
@@ -192,13 +192,15 @@ export default function ({ getService, getPageObjects }) {
     describe('saved search filtering', function () {
       before(async () => {
         await filterBar.ensureFieldEditorModalIsClosed();
+        await PageObjects.common.navigateToApp('discover');
+        await PageObjects.discover.switchDiscoverTable('new');
+        await PageObjects.common.navigateToApp('dashboard');
         await PageObjects.dashboard.gotoDashboardLandingPage();
         await PageObjects.dashboard.clickNewDashboard();
         await PageObjects.timePicker.setDefaultDataRange();
       });
 
       it('are added when a cell magnifying glass is clicked', async function () {
-        await PageObjects.discover.switchDiscoverTable('new');
         await dashboardAddPanel.addSavedSearch('Rendering-Test:-saved-search');
         await PageObjects.dashboard.waitForRenderComplete();
 

diff --git a/test/functional/apps/dashboard/dashboard_filtering.js b/test/functional/apps/dashboard/dashboard_filtering.js
@@ -79,6 +79,10 @@ export default function ({ getService, getPageObjects }) {
 
     describe('adding a filter that excludes all data', () => {
       before(async () => {
+        await PageObjects.common.navigateToApp('discover');
+        await PageObjects.discover.switchDiscoverTable('new');
+        await PageObjects.common.navigateToApp('dashboard');
+        await PageObjects.dashboard.gotoDashboardLandingPage();
         await PageObjects.dashboard.clickNewDashboard();
         await PageObjects.timePicker.setDefaultDataRange();
         await dashboardAddPanel.addEveryVisualization('"Filter Bytes Test"');
@@ -189,7 +193,6 @@ export default function ({ getService, getPageObjects }) {
     describe('disabling a filter unfilters the data on', function () {
       before(async () => {
         await filterBar.toggleFilterEnabled('bytes');
-        await PageObjects.discover.switchDiscoverTable('new');
         await PageObjects.header.waitUntilLoadingHasFinished();
         await PageObjects.dashboard.waitForRenderComplete();
       });
@@ -227,7 +230,7 @@ export default function ({ getService, getPageObjects }) {
       });
 
       it('saved searches', async () => {
-        await dashboardExpect.savedSearchRowCount(1);
+        await dashboardExpect.savedSearchRowCountFromLegacyTable(1);
       });
 
       it('vega', async () => {

diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js
@@ -56,6 +56,9 @@ export default function ({ getService, getPageObjects }) {
 
   describe('dashboard state', function describeIndexTests() {
     before(async function () {
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.switchDiscoverTable('new');
+      await PageObjects.common.navigateToApp('dashboard');
       await PageObjects.dashboard.initTests();
       await PageObjects.dashboard.preserveCrossAppState();
       await browser.refresh();

diff --git a/test/functional/apps/dashboard/dashboard_time_picker.js b/test/functional/apps/dashboard/dashboard_time_picker.js
@@ -68,14 +68,14 @@ export default function ({ getService, getPageObjects }) {
         fields: ['bytes', 'agent'],
       });
       // Current data grid loads 100 rows per page by default with inspect button and time range
-      await dashboardExpect.dataGridTableCellCount(400);
+      await dashboardExpect.savedSearchRowCountFromLegacyTable(100);
 
       // Set to time range with no data
       await PageObjects.timePicker.setAbsoluteRange(
         'Jan 1, 2000 @ 00:00:00.000',
         'Jan 1, 2000 @ 01:00:00.000'
       );
-      await dashboardExpect.dataGridTableCellCount(0);
+      await dashboardExpect.savedSearchRowCountFromLegacyTable(0);
     });
 
     it('Timepicker start, end, interval values are set by url', async () => {