From d4f5588ed8f7fed988d34337b73bfd5476c3b0ee Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Tue, 28 Jul 2020 11:37:37 +0300
Subject: [PATCH] Fix App status  flaky test (#72853)

* wait for link to be updated

* await, please!

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../plugins/core_app_status/public/plugin.tsx    |  3 +--
 .../core_plugins/application_status.ts           | 16 +++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/plugin_functional/plugins/core_app_status/public/plugin.tsx b/test/plugin_functional/plugins/core_app_status/public/plugin.tsx
index af23bfbe1f8f5..bdc08c03c1912 100644
--- a/test/plugin_functional/plugins/core_app_status/public/plugin.tsx
+++ b/test/plugin_functional/plugins/core_app_status/public/plugin.tsx
@@ -26,6 +26,7 @@ import {
   CoreStart,
   AppMountParameters,
 } from 'kibana/public';
+import { renderApp } from './application';
 import './types';
 
 export class CoreAppStatusPlugin implements Plugin<{}, CoreAppStatusPluginStart> {
@@ -36,7 +37,6 @@ export class CoreAppStatusPlugin implements Plugin<{}, CoreAppStatusPluginStart>
       id: 'app_status_start',
       title: 'App Status Start Page',
       async mount(params: AppMountParameters) {
-        const { renderApp } = await import('./application');
         return renderApp('app_status_start', params);
       },
     });
@@ -47,7 +47,6 @@ export class CoreAppStatusPlugin implements Plugin<{}, CoreAppStatusPluginStart>
       euiIconType: 'snowflake',
       updater$: this.appUpdater,
       async mount(params: AppMountParameters) {
-        const { renderApp } = await import('./application');
         return renderApp('app_status', params);
       },
     });
diff --git a/test/plugin_functional/test_suites/core_plugins/application_status.ts b/test/plugin_functional/test_suites/core_plugins/application_status.ts
index 31a1c28b50842..a4c2db733b894 100644
--- a/test/plugin_functional/test_suites/core_plugins/application_status.ts
+++ b/test/plugin_functional/test_suites/core_plugins/application_status.ts
@@ -41,6 +41,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
   const PageObjects = getPageObjects(['common']);
   const browser = getService('browser');
   const appsMenu = getService('appsMenu');
+  const retry = getService('retry');
   const testSubjects = getService('testSubjects');
 
   const setAppStatus = async (s: Partial<AppUpdatableFields>) => {
@@ -50,15 +51,14 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
     }, s);
   };
 
-  const navigateToApp = async (i: string) => {
+  const navigateToApp = async (id: string) => {
     return await browser.executeAsync(async (appId, cb) => {
       await window.__coreAppStatus.navigateToApp(appId);
       cb();
-    }, i);
+    }, id);
   };
 
-  // FLAKY: https://github.com/elastic/kibana/issues/65423
-  describe.skip('application status management', () => {
+  describe('application status management', () => {
     beforeEach(async () => {
       await PageObjects.common.navigateToApp('app_status_start');
     });
@@ -101,15 +101,17 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
     });
 
     it('allows to change the defaultPath of an application', async () => {
-      let link = await appsMenu.getLink('App Status');
+      const link = await appsMenu.getLink('App Status');
       expect(link!.href).to.eql(getKibanaUrl('/app/app_status'));
 
       await setAppStatus({
         defaultPath: '/arbitrary/path',
       });
 
-      link = await appsMenu.getLink('App Status');
-      expect(link!.href).to.eql(getKibanaUrl('/app/app_status/arbitrary/path'));
+      await retry.waitFor('link url updated with "defaultPath"', async () => {
+        const updatedLink = await appsMenu.getLink('App Status');
+        return updatedLink?.href === getKibanaUrl('/app/app_status/arbitrary/path');
+      });
 
       await navigateToApp('app_status');
       expect(await testSubjects.exists('appStatusApp')).to.eql(true);