remove skiploading flag

elastic · Aug 10, 2023 · 9972f69 · 9972f69
1 parent 72ed819
commit 9972f69
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 95 deletions.
diff --git a/test/functional/page_objects/dashboard_page.ts b/test/functional/page_objects/dashboard_page.ts
@@ -454,8 +454,7 @@ export class DashboardPageObject extends FtrService {
    */
   public async saveDashboard(
     dashboardName: string,
-    saveOptions: SaveDashboardOptions = { waitDialogIsClosed: true, exitFromEditMode: true },
-    skipLoadingIndicatorHiddenCheck?: boolean
+    saveOptions: SaveDashboardOptions = { waitDialogIsClosed: true, exitFromEditMode: true }
   ) {
     await this.retry.try(async () => {
       await this.enterDashboardTitleAndClickSave(dashboardName, saveOptions);
@@ -470,9 +469,7 @@ export class DashboardPageObject extends FtrService {
     });
     const message = await this.common.closeToast();
 
-    if (!skipLoadingIndicatorHiddenCheck) {
-      await this.header.waitUntilLoadingHasFinished();
-    }
+    await this.header.waitUntilLoadingHasFinished();
 
     await this.common.waitForSaveModalToClose();
 
@@ -481,9 +478,7 @@ export class DashboardPageObject extends FtrService {
       await this.clickCancelOutOfEditMode();
     }
 
-    if (!skipLoadingIndicatorHiddenCheck) {
-      await this.header.waitUntilLoadingHasFinished();
-    }
+    await this.header.waitUntilLoadingHasFinished();
 
     return message;
   }
@@ -566,8 +561,7 @@ export class DashboardPageObject extends FtrService {
   // use the search filter box to narrow the results down to a single
   // entry, or at least to a single page of results
   public async loadSavedDashboard(
-    dashboardName: string,
-    skipLoadingIndicatorHiddenCheck?: boolean
+    dashboardName: string
   ) {
     this.log.debug(`Load Saved Dashboard ${dashboardName}`);
 
@@ -577,9 +571,7 @@ export class DashboardPageObject extends FtrService {
     await this.retry.try(async () => {
       await this.listingTable.clickItemLink('dashboard', dashboardName);
 
-      if (!skipLoadingIndicatorHiddenCheck) {
-        await this.header.waitUntilLoadingHasFinished();
-      }
+      await this.header.waitUntilLoadingHasFinished();
 
       // check Dashboard landing page is not present
       await this.testSubjects.missingOrFail('dashboardLandingPage', { timeout: 10000 });

diff --git a/test/functional/page_objects/time_picker.ts b/test/functional/page_objects/time_picker.ts
@@ -132,8 +132,7 @@ export class TimePickerPageObject extends FtrService {
   public async setAbsoluteRange(
     fromTime: string,
     toTime: string,
-    force = false,
-    skipLoadingIndicatorHiddenCheck = false
+    force = false
   ) {
     if (!force) {
       const currentUrl = decodeURI(await this.browser.getCurrentUrl());
@@ -197,9 +196,7 @@ export class TimePickerPageObject extends FtrService {
       await this.testSubjects.click('querySubmitButton');
     }
 
-    if (!skipLoadingIndicatorHiddenCheck) {
-      await this.header.awaitGlobalLoadingIndicatorHidden();
-    }
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   public async isOff() {

diff --git a/test/functional/services/dashboard/add_panel.ts b/test/functional/services/dashboard/add_panel.ts
@@ -24,17 +24,15 @@ export class DashboardAddPanelService extends FtrService {
     await this.common.sleep(500);
   }
 
-  async clickCreateNewLink(skipLoadingIndicatorHiddenCheck?: boolean) {
+  async clickCreateNewLink() {
     this.log.debug('DashboardAddPanel.clickAddNewPanelButton');
     await this.retry.try(async () => {
       // prevent query bar auto suggest from blocking button
       await this.browser.pressKeys(this.browser.keys.ESCAPE);
       await this.testSubjects.click('dashboardAddNewPanelButton');
       await this.testSubjects.waitForDeleted('dashboardAddNewPanelButton');
 
-      if (!skipLoadingIndicatorHiddenCheck) {
-        await this.header.waitUntilLoadingHasFinished();
-      }
+      await this.header.waitUntilLoadingHasFinished();
 
       await this.testSubjects.existOrFail('lnsApp', {
         timeout: 5000,

diff --git a/x-pack/test_serverless/functional/test_suites/observability/cases/attachment_framework.ts b/x-pack/test_serverless/functional/test_suites/observability/cases/attachment_framework.ts
@@ -12,10 +12,8 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 import { createCase } from './helper/api';
 
 export default ({ getPageObject, getService }: FtrProviderContext) => {
-  const common = getPageObject('common');
   const dashboard = getPageObject('dashboard');
   const lens = getPageObject('lens');
-  const timePicker = getPageObject('timePicker');
   const svlCommonNavigation = getPageObject('svlCommonNavigation');
   const svlObltNavigation = getService('svlObltNavigation');
   const testSubjects = getService('testSubjects');
@@ -24,29 +22,10 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
   const dashboardAddPanel = getService('dashboardAddPanel');
   const cases = getService('cases');
   const find = getService('find');
-  const listingTable = getService('listingTable');
   const supertest = getService('supertest');
 
-  // duplicated from x-pack/test/functional/page_objects/lens_page.ts to convert args into object for better readability
-  const goToTimeRange = async ({
-    fromTime,
-    toTime,
-    skipLoadingIndicatorHiddenCheck,
-  }: {
-    fromTime?: string;
-    toTime?: string;
-    skipLoadingIndicatorHiddenCheck?: boolean;
-  }) => {
-    await timePicker.ensureHiddenNoDataPopover();
-    fromTime = fromTime || timePicker.defaultStartTime;
-    toTime = toTime || timePicker.defaultEndTime;
-    await timePicker.setAbsoluteRange(fromTime, toTime, false, skipLoadingIndicatorHiddenCheck);
-    await common.sleep(500);
-  };
-
   describe('persistable attachment', () => {
     describe('lens visualization', () => {
-      const skipLoadingIndicatorHiddenCheck = true;
       const myDashboardName = `My-dashboard-${uuidv4()}`;
 
       before(async () => {
@@ -61,9 +40,9 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
 
         await dashboard.clickNewDashboard();
 
-        await dashboardAddPanel.clickCreateNewLink(skipLoadingIndicatorHiddenCheck);
+        await dashboardAddPanel.clickCreateNewLink();
 
-        await goToTimeRange({ skipLoadingIndicatorHiddenCheck });
+        await lens.goToTimeRange();
 
         await lens.configureDimension({
           dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
@@ -85,7 +64,7 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
 
         await lens.saveAndReturn();
         await dashboard.waitForRenderComplete();
-        await dashboard.saveDashboard(myDashboardName, {}, skipLoadingIndicatorHiddenCheck);
+        await dashboard.saveDashboard(myDashboardName);
       });
 
       after(async () => {

diff --git a/x-pack/test_serverless/functional/test_suites/search/cases/attachment_framework.ts b/x-pack/test_serverless/functional/test_suites/search/cases/attachment_framework.ts
@@ -11,35 +11,14 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
   const testSubjects = getService('testSubjects');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
-  const common = getPageObject('common');
   const dashboard = getPageObject('dashboard');
   const lens = getPageObject('lens');
-  const timePicker = getPageObject('timePicker');
   const svlSearchNavigation = getService('svlSearchNavigation');
   const svlCommonNavigation = getPageObject('svlCommonNavigation');
   const dashboardAddPanel = getService('dashboardAddPanel');
 
-  // duplicated from x-pack/test/functional/page_objects/lens_page.ts to convert args into object for better readability
-  const goToTimeRange = async ({
-    fromTime,
-    toTime,
-    skipLoadingIndicatorHiddenCheck,
-  }: {
-    fromTime?: string;
-    toTime?: string;
-    skipLoadingIndicatorHiddenCheck?: boolean;
-  }) => {
-    await timePicker.ensureHiddenNoDataPopover();
-    fromTime = fromTime || timePicker.defaultStartTime;
-    toTime = toTime || timePicker.defaultEndTime;
-    await timePicker.setAbsoluteRange(fromTime, toTime, false, skipLoadingIndicatorHiddenCheck);
-    await common.sleep(500);
-  };
-
   describe('persistable attachment', () => {
     describe('lens visualization', () => {
-      const skipLoadingIndicatorHiddenCheck = true;
-
       before(async () => {
         await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
         await kibanaServer.importExport.load(
@@ -52,9 +31,9 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
 
         await dashboard.clickNewDashboard();
 
-        await dashboardAddPanel.clickCreateNewLink(skipLoadingIndicatorHiddenCheck);
+        await dashboardAddPanel.clickCreateNewLink();
 
-        await goToTimeRange({ skipLoadingIndicatorHiddenCheck });
+        await lens.goToTimeRange();
 
         await lens.configureDimension({
           dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',

diff --git a/x-pack/test_serverless/functional/test_suites/security/ftr/cases/attachment_framework.ts b/x-pack/test_serverless/functional/test_suites/security/ftr/cases/attachment_framework.ts
@@ -12,10 +12,8 @@ import { FtrProviderContext } from '../../../../ftr_provider_context';
 import { createCase } from './helper/api';
 
 export default ({ getPageObject, getService }: FtrProviderContext) => {
-  const common = getPageObject('common');
   const dashboard = getPageObject('dashboard');
   const lens = getPageObject('lens');
-  const timePicker = getPageObject('timePicker');
   const svlSecNavigation = getService('svlSecNavigation');
   const testSubjects = getService('testSubjects');
   const esArchiver = getService('esArchiver');
@@ -26,26 +24,8 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
   const listingTable = getService('listingTable');
   const supertest = getService('supertest');
 
-  // duplicated from x-pack/test/functional/page_objects/lens_page.ts to convert args into object for better readability
-  const goToTimeRange = async ({
-    fromTime,
-    toTime,
-    skipLoadingIndicatorHiddenCheck,
-  }: {
-    fromTime?: string;
-    toTime?: string;
-    skipLoadingIndicatorHiddenCheck?: boolean;
-  }) => {
-    await timePicker.ensureHiddenNoDataPopover();
-    fromTime = fromTime || timePicker.defaultStartTime;
-    toTime = toTime || timePicker.defaultEndTime;
-    await timePicker.setAbsoluteRange(fromTime, toTime, false, skipLoadingIndicatorHiddenCheck);
-    await common.sleep(500);
-  };
-
   describe('persistable attachment', () => {
     describe('lens visualization', () => {
-      const skipLoadingIndicatorHiddenCheck = true;
       const myDashboardName = `My-dashboard-${uuidv4()}`;
 
       before(async () => {
@@ -60,9 +40,9 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
 
         await dashboard.clickNewDashboard();
 
-        await dashboardAddPanel.clickCreateNewLink(skipLoadingIndicatorHiddenCheck);
+        await dashboardAddPanel.clickCreateNewLink();
 
-        await goToTimeRange({ skipLoadingIndicatorHiddenCheck });
+        await lens.goToTimeRange();
 
         await lens.configureDimension({
           dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
@@ -85,7 +65,7 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
         await lens.saveAndReturn();
 
         await dashboard.waitForRenderComplete();
-        await dashboard.saveDashboard(myDashboardName, {}, skipLoadingIndicatorHiddenCheck);
+        await dashboard.saveDashboard(myDashboardName);
       });
 
       after(async () => {
@@ -109,9 +89,7 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
 
         await testSubjects.setValue('input', caseTitle);
 
-        const descriptionArea = await find.byCssSelector('textarea.euiMarkdownEditorTextArea');
-        await descriptionArea.focus();
-        await descriptionArea.type('test description');
+        await testSubjects.setValue('euiMarkdownEditorTextArea', 'test description');
 
         // verify that solution picker is not visible
         await testSubjects.missingOrFail('caseOwnerSelector');