mgr/dashboard: Wait for breadcrumb text is present in e2e tests

When the cluster is busy it might take some time until the tested component has loaded it's data and is rendered in the browser. Waiting for the breadcrumb text to be present might help to fix errors in the e2e tests.

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit e28d7287bd109b5c1682dc832c4a77ea47505165)

 Conflicts:
	src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.po.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.po.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts
	src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/pools/pools.po.ts
	src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.po.ts
	src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/rgw/users.po.ts
	src/pybind/mgr/dashboard/frontend/e2e/user-mgmt.e2e-spec.ts

Conflicts are caused by E2E refactoring in master branch.

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts
index f962258f502d261c8ee85ccacbee1bc4a61ad024..10d71fccb709ceacdbf352f6ca2133b61e3e2342 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/block/images.e2e-spec.ts
@@ -18,7 +18,7 @@ describe('Images page', () => {
     });
 
     it('should open and show breadcrumb', () => {
-      expect(Helper.getBreadcrumbText()).toEqual('Images');
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Images');
     });
 
     it('should show three tabs', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
index 8a3a03b06371d3c4b485f15ce6ae2ce919a23463..b3227fe9c35fedc41b52e208d8117d1fea654155 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
@@ -14,6 +14,6 @@ describe('Iscsi Page', () => {
 
   it('should open and show breadcrumb', () => {
     page.navigateTo();
-    expect(Helper.getBreadcrumbText()).toEqual('Overview');
+    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Overview');
   });
 });

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts
index a8f819cc874444bc7b1f6b7a2f0dc657945d3ada..e15cb53efba5516c371b0e4bf03d304c5fe538c2 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/block/mirroring.e2e-spec.ts
@@ -18,7 +18,7 @@ describe('Mirroring page', () => {
     });
 
     it('should open and show breadcrumb', () => {
-      expect(Helper.getBreadcrumbText()).toEqual('Mirroring');
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Mirroring');
     });
 
     it('should show three tabs', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts
index 2600a83ab849d44ec65955d9470263a1dfc4b1c3..2f438f8dd20fda70f9e3807a24b01582ae92497f 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/alerts.e2e-spec.ts
@@ -18,7 +18,7 @@ describe('Alerts page', () => {
     });
 
     it('should open and show breadcrumb', () => {
-      expect(Helper.getBreadcrumbText()).toEqual('Alerts');
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Alerts');
     });
   });
 });

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts
index 9afe5405ab0bd86d10bfe45d43099194fd76b9d3..91303fb3e276cc9c7984d4e1c7920ec9e1271da9 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.ts
@@ -14,6 +14,6 @@ describe('Configuration page', () => {
 
   it('should open and show breadcrumb', () => {
     page.navigateTo();
-    expect(Helper.getBreadcrumbText()).toEqual('Configuration');
+    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Configuration');
   });
 });

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts
index c4335ff62192836a0823a363d50e23e3747bcb0b..d64fdee552760f1051ae2b31eb80c33cc7a9b81d 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/crush-map.e2e-spec.ts
@@ -14,6 +14,6 @@ describe('CRUSH map page', () => {
 
   it('should open and show breadcrumb', () => {
     page.navigateTo();
-    expect(Helper.getBreadcrumbText()).toEqual('CRUSH map');
+    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'CRUSH map');
   });
 });

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts
index 605b63d4d96fd0de0eac0546bae8603940888e70..913d01bfa98a319311d9aed87b0495686b36ff21 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/hosts.e2e-spec.ts
@@ -14,7 +14,7 @@ describe('Hosts page', () => {
 
   it('should open and show breadcrumb', () => {
     page.navigateTo();
-    expect(Helper.getBreadcrumbText()).toEqual('Hosts');
+    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Hosts');
   });
 
   it('should show two tabs', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts
index 243582ee0cee45820b82e5e86e18643ead378b63..13658619d03a7a776f1c664140be2e59eb625b73 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/logs.e2e-spec.ts
@@ -14,7 +14,7 @@ describe('Logs page', () => {
 
   it('should open and show breadcrumb', () => {
     page.navigateTo();
-    expect(Helper.getBreadcrumbText()).toEqual('Logs');
+    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Logs');
   });
 
   it('should show two tabs', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts
index 6bc71747b280a13943ef6ffa75c52789263766cb..629b791f6217685903c0460614d783b1fe81d358 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/mgr-modules.e2e-spec.ts
@@ -18,7 +18,7 @@ describe('Manager modules page', () => {
     });
 
     it('should open and show breadcrumb', () => {
-      expect(Helper.getBreadcrumbText()).toEqual('Manager modules');
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Manager modules');
     });
   });
 });

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
index 7eb19f2ecd01a2272d9230c8d1d87ca6d32481b2..529763b6be2e1a5860bb89880e4da90ce23b8fb1 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
@@ -14,6 +14,6 @@ describe('Monitors page', () => {
 
   it('should open and show breadcrumb', () => {
     page.navigateTo();
-    expect(Helper.getBreadcrumbText()).toEqual('Monitors');
+    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Monitors');
   });
 });

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
index 41fd52f346e26160a78351e9a560b1a3b585ae8c..3301001041831c8ad3c74b460d5535bdbaba2af9 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
@@ -14,7 +14,7 @@ describe('OSDs page', () => {
 
   it('should open and show breadcrumb', () => {
     page.navigateTo();
-    expect(Helper.getBreadcrumbText()).toEqual('OSDs');
+    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'OSDs');
   });
 
   it('should show two tabs', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts
index d5306858423eff67052db4ed42592201bb3a1e6c..9c39a925b6bb7cc2c24dbffa0b4bc905da9429ea 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/filesystems/filesystems.e2e-spec.ts
@@ -18,7 +18,7 @@ describe('Filesystems page', () => {
     });
 
     it('should open and show breadcrumb', () => {
-      expect(Helper.getBreadcrumbText()).toEqual('Filesystems');
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Filesystems');
     });
   });
 });

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
index 7ff26b315b9402f931b56b4652a16149e2a15e4e..cd6b8f673383299a438dd67295f219d31129b474 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
@@ -1,4 +1,4 @@
-import { $, $$, browser } from 'protractor';
+import { $, $$, browser, ElementFinder } from 'protractor';
 
 export class Helper {
   static EC = browser.ExpectedConditions;
@@ -28,8 +28,8 @@ export class Helper {
       });
   }
 
-  static getBreadcrumbText() {
-    return $('.breadcrumb-item.active').getText();
+  static getBreadcrumb() {
+    return $('.breadcrumb-item.active');
   }
 
   static getTabText(idx) {
@@ -41,4 +41,8 @@ export class Helper {
   static getTabsCount() {
     return $$('.nav.nav-tabs li').count();
   }
+
+  static waitTextToBePresent(elem: ElementFinder, text: string, message?: string) {
+    return browser.wait(Helper.EC.textToBePresentInElement(elem, text), Helper.TIMEOUT, message);
+  }
 }

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 de45daf0a51dd861ca90acfd3ab62219bfffa7c4..988737a67934d2416c9aeed44bdb071276bf8dc3 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/nfs/nfs.e2e-spec.ts
@@ -18,7 +18,7 @@ describe('Nfs page', () => {
     });
 
     it('should open and show breadcrumb', () => {
-      expect(Helper.getBreadcrumbText()).toEqual('NFS');
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'NFS');
     });
   });
 });

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts
index 3b826eb858300684d2828bf60364cf1b0162e033..7ce4c81dce0bf322d4c347493625f262a9d93545 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/pools/pools.e2e-spec.ts
@@ -14,7 +14,7 @@ describe('Pools page', () => {
 
   it('should open and show breadcrumb', () => {
     page.navigateTo();
-    expect(Helper.getBreadcrumbText()).toEqual('Pools');
+    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Pools');
   });
 
   it('should show two tabs', () => {