Merge branch '7.9' into backport/7.9/pr-72863

elastic · Jul 23, 2020 · 5627e0c · 5627e0c
2 parents a7ed59b + 89c17fd
commit 5627e0c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/test/functional/apps/visualize/_tsvb_chart.ts b/test/functional/apps/visualize/_tsvb_chart.ts
@@ -25,11 +25,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const log = getService('log');
   const inspector = getService('inspector');
+  const retry = getService('retry');
   const security = getService('security');
   const PageObjects = getPageObjects(['visualize', 'visualBuilder', 'timePicker', 'visChart']);
 
-  // FLAKY: https://github.com/elastic/kibana/issues/71979
-  describe.skip('visual builder', function describeIndexTests() {
+  describe('visual builder', function describeIndexTests() {
     this.tags('includeFirefox');
     beforeEach(async () => {
       await security.testUser.setRoles([
@@ -129,9 +129,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await PageObjects.visualBuilder.clickPanelOptions('metric');
         const fromTime = 'Oct 22, 2018 @ 00:00:00.000';
         const toTime = 'Oct 28, 2018 @ 23:59:59.999';
-        await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
-        await PageObjects.visualBuilder.setIndexPatternValue('kibana_sample_data_flights');
-        await PageObjects.visualBuilder.selectIndexPatternTimeField('timestamp');
+        // Sometimes popovers take some time to appear in Firefox (#71979)
+        await retry.try(async () => {
+          await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
+          await PageObjects.visualBuilder.setIndexPatternValue('kibana_sample_data_flights');
+          await PageObjects.visualBuilder.selectIndexPatternTimeField('timestamp');
+        });
         const newValue = await PageObjects.visualBuilder.getMetricValue();
         expect(newValue).to.eql('10');
       });

diff --git a/...est_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx b/...est_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
@@ -152,7 +152,6 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentCo
       title: i18n.translate('xpack.ingestManager.agentEnrollment.stepCheckForDataTitle', {
         defaultMessage: 'Check for data',
       }),
-      status: 'incomplete',
       children: (
         <>
           <EuiText>