Merge branch 'keep_field_list_until_field_caps_sees_fields' of github…

….com:mattkime/kibana into keep_field_list_until_field_caps_sees_fields
elastic · Dec 16, 2020 · db95d0e · db95d0e
2 parents f4bf382 + 6398378
commit db95d0e
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/resolver.ts
@@ -13,19 +13,31 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const browser = getService('browser');
 
+  /**
+   * Navigating to the hosts page must be done after data is loaded into ES otherwise
+   * the hosts page will display the empty default page and if we load data after that
+   * we'd have to set the source filter on the page.
+   */
+  const navigateToHostsAndSetDate = async () => {
+    await pageObjects.hosts.navigateToSecurityHostsPage();
+    await pageObjects.common.dismissBanner();
+    const fromTime = 'Jan 1, 2018 @ 00:00:00.000';
+    const toTime = 'now';
+    await pageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
+  };
+
   describe('Endpoint Event Resolver', function () {
     before(async () => {
-      await pageObjects.hosts.navigateToSecurityHostsPage();
-      await pageObjects.common.dismissBanner();
-      const fromTime = 'Jan 1, 2018 @ 00:00:00.000';
-      const toTime = 'now';
-      await pageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
       await browser.setWindowSize(1800, 1200);
     });
+    after(async () => {
+      await pageObjects.hosts.deleteDataStreams();
+    });
     describe('Endpoint Resolver Tree', function () {
       before(async () => {
         await esArchiver.load('empty_kibana');
         await esArchiver.load('endpoint/resolver_tree/functions', { useCreate: true });
+        await navigateToHostsAndSetDate();
         await pageObjects.hosts.executeQueryAndOpenResolver('event.dataset : endpoint.events.file');
       });
       after(async () => {
@@ -213,6 +225,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         await esArchiver.load('empty_kibana');
         await esArchiver.load('endpoint/resolver_tree/alert_events', { useCreate: true });
+        await navigateToHostsAndSetDate();
       });
       after(async () => {
         await pageObjects.hosts.deleteDataStreams();