From 3fab3e80a2001f991f2f66c2422c529706cc2ee0 Mon Sep 17 00:00:00 2001
From: Patrick Seidensal <pseidensal@suse.com>
Date: Mon, 19 Aug 2019 11:44:30 +0200
Subject: [PATCH] mgr/dashboard: migrate E2E nfs to async/await

Fixes: https://tracker.ceph.com/issues/40693

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
---
 src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts   |  3 +++
 .../mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts   | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
index ab3324a030e..b0feafd232e 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
@@ -1,5 +1,6 @@
 import { browser } from 'protractor';
 import { ImagesPageHelper } from './block/images.po';
+import { NfsPageHelper } from './nfs/nfs.po';
 import { PoolPageHelper } from './pools/pools.po';
 import { BucketsPageHelper } from './rgw/buckets.po';
 import { DaemonsPageHelper } from './rgw/daemons.po';
@@ -19,6 +20,7 @@ export class Helper {
   usermgmt: UserMgmtPageHelper;
   daemons: DaemonsPageHelper;
   users: UsersPageHelper;
+  nfs: NfsPageHelper;
 
   constructor() {
     this.pools = new PoolPageHelper();
@@ -30,6 +32,7 @@ export class Helper {
     this.usermgmt = new UserMgmtPageHelper();
     this.daemons = new DaemonsPageHelper();
     this.users = new UsersPageHelper();
+    this.nfs = new NfsPageHelper();
   }
 
   /**
diff --git a/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
index ea6ac7df74d..976e9824bca 100644
--- a/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
@@ -7,17 +7,17 @@ describe('Nfs page', () => {
     nfs = new Helper().nfs;
   });
 
-  afterEach(() => {
-    Helper.checkConsole();
+  afterEach(async () => {
+    await Helper.checkConsole();
   });
 
   describe('breadcrumb test', () => {
-    beforeAll(() => {
-      nfs.navigateTo();
+    beforeAll(async () => {
+      await nfs.navigateTo();
     });
 
-    it('should open and show breadcrumb', () => {
-      expect(nfs.getBreadcrumbText()).toEqual('NFS');
+    it('should open and show breadcrumb', async () => {
+      expect(await nfs.getBreadcrumbText()).toEqual('NFS');
     });
   });
 });
-- 
2.39.5