mgr/dashboard: Updated existing E2E tests to match new format

Fixes: https://tracker.ceph.com/issues/38245
Signed-off-by: Nathan Weinberg <nweinber@redhat.com>
(cherry picked from commit f35bef2506192451392c9e48715e669e1247fbec)

 Conflicts:
	src/pybind/mgr/dashboard/frontend/e2e/block/iscsi.e2e-spec.ts
	src/pybind/mgr/dashboard/frontend/e2e/cluster/configuration.e2e-spec.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/logs.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/pools/pools.e2e-spec.ts

`getBreadcrumbText` renamed to `getBreadcrumb` to be used with
`Helper.waitTextToBePresent`

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 b3227fe9c35fedc41b52e208d8117d1fea654155..82d1d482d808f5dabfd964ce53da11e6fa2aaa32 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
@@ -12,8 +12,13 @@ describe('Iscsi Page', () => {
     Helper.checkConsole();
   });
 
-  it('should open and show breadcrumb', () => {
-    page.navigateTo();
-    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Overview');
+  describe('breadcrumb test', () => {
+    beforeAll(() => {
+      page.navigateTo();
+    });
+
+    it('should open and show breadcrumb', () => {
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Overview');
+    });
   });
 });

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 91303fb3e276cc9c7984d4e1c7920ec9e1271da9..e8cc711337a38f9ac6afc61523e3ae87f4ec6cbf 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
@@ -12,8 +12,13 @@ describe('Configuration page', () => {
     Helper.checkConsole();
   });
 
-  it('should open and show breadcrumb', () => {
-    page.navigateTo();
-    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Configuration');
+  describe('breadcrumb test', () => {
+    beforeAll(() => {
+      page.navigateTo();
+    });
+
+    it('should open and show breadcrumb', () => {
+      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 d64fdee552760f1051ae2b31eb80c33cc7a9b81d..2c1b004be9f13f64a0f1bb8a87dfd0e98dc071cd 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
@@ -12,8 +12,13 @@ describe('CRUSH map page', () => {
     Helper.checkConsole();
   });
 
-  it('should open and show breadcrumb', () => {
-    page.navigateTo();
-    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'CRUSH map');
+  describe('breadcrumb test', () => {
+    beforeAll(() => {
+      page.navigateTo();
+    });
+
+    it('should open and show breadcrumb', () => {
+      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 913d01bfa98a319311d9aed87b0495686b36ff21..f0b8a0e2cf85ed019d02ac569ccd3ad74d650569 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
@@ -12,23 +12,25 @@ describe('Hosts page', () => {
     Helper.checkConsole();
   });
 
-  it('should open and show breadcrumb', () => {
-    page.navigateTo();
-    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Hosts');
-  });
+  describe('breadcrumb and tab tests', () => {
+    beforeAll(() => {
+      page.navigateTo();
+    });
 
-  it('should show two tabs', () => {
-    page.navigateTo();
-    expect(Helper.getTabsCount()).toEqual(2);
-  });
+    it('should open and show breadcrumb', () => {
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Hosts');
+    });
 
-  it('should show hosts list tab at first', () => {
-    page.navigateTo();
-    expect(Helper.getTabText(0)).toEqual('Hosts List');
-  });
+    it('should show two tabs', () => {
+      expect(Helper.getTabsCount()).toEqual(2);
+    });
+
+    it('should show hosts list tab at first', () => {
+      expect(Helper.getTabText(0)).toEqual('Hosts List');
+    });
 
-  it('should show overall performance as a second tab', () => {
-    page.navigateTo();
-    expect(Helper.getTabText(1)).toEqual('Overall Performance');
+    it('should show overall performance as a second tab', () => {
+      expect(Helper.getTabText(1)).toEqual('Overall Performance');
+    });
   });
 });

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 13658619d03a7a776f1c664140be2e59eb625b73..45076e66baf6e4ad518fe7310b5fb1686601e1a3 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
@@ -12,23 +12,25 @@ describe('Logs page', () => {
     Helper.checkConsole();
   });
 
-  it('should open and show breadcrumb', () => {
-    page.navigateTo();
-    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Logs');
-  });
+  describe('breadcrumb and tab tests', () => {
+    beforeAll(() => {
+      page.navigateTo();
+    });
 
-  it('should show two tabs', () => {
-    page.navigateTo();
-    expect(Helper.getTabsCount()).toEqual(2);
-  });
+    it('should open and show breadcrumb', () => {
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Logs');
+    });
 
-  it('should show cluster logs tab at first', () => {
-    page.navigateTo();
-    expect(Helper.getTabText(0)).toEqual('Cluster Logs');
-  });
+    it('should show two tabs', () => {
+      expect(Helper.getTabsCount()).toEqual(2);
+    });
+
+    it('should show cluster logs tab at first', () => {
+      expect(Helper.getTabText(0)).toEqual('Cluster Logs');
+    });
 
-  it('should show audit logs as a second tab', () => {
-    page.navigateTo();
-    expect(Helper.getTabText(1)).toEqual('Audit Logs');
+    it('should show audit logs as a second tab', () => {
+      expect(Helper.getTabText(1)).toEqual('Audit Logs');
+    });
   });
 });

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 529763b6be2e1a5860bb89880e4da90ce23b8fb1..5b2676faa73ab471153b8f63b5e9b219694d5344 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
@@ -12,8 +12,13 @@ describe('Monitors page', () => {
     Helper.checkConsole();
   });
 
-  it('should open and show breadcrumb', () => {
-    page.navigateTo();
-    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Monitors');
+  describe('breadcrumb test', () => {
+    beforeAll(() => {
+      page.navigateTo();
+    });
+
+    it('should open and show breadcrumb', () => {
+      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 3301001041831c8ad3c74b460d5535bdbaba2af9..61cb0c033c3856c4bab015d32771f9bc29a9e952 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
@@ -12,23 +12,25 @@ describe('OSDs page', () => {
     Helper.checkConsole();
   });
 
-  it('should open and show breadcrumb', () => {
-    page.navigateTo();
-    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'OSDs');
-  });
+  describe('breadcrumb and tab tests', () => {
+    beforeAll(() => {
+      page.navigateTo();
+    });
 
-  it('should show two tabs', () => {
-    page.navigateTo();
-    expect(Helper.getTabsCount()).toEqual(2);
-  });
+    it('should open and show breadcrumb', () => {
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'OSDs');
+    });
 
-  it('should show OSDs list tab at first', () => {
-    page.navigateTo();
-    expect(Helper.getTabText(0)).toEqual('OSDs List');
-  });
+    it('should show two tabs', () => {
+      expect(Helper.getTabsCount()).toEqual(2);
+    });
+
+    it('should show OSDs list tab at first', () => {
+      expect(Helper.getTabText(0)).toEqual('OSDs List');
+    });
 
-  it('should show overall performance as a second tab', () => {
-    page.navigateTo();
-    expect(Helper.getTabText(1)).toEqual('Overall Performance');
+    it('should show overall performance as a second tab', () => {
+      expect(Helper.getTabText(1)).toEqual('Overall Performance');
+    });
   });
 });

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 7ce4c81dce0bf322d4c347493625f262a9d93545..5d68b0fe3f0493716e83fb90f4fd617247a86a76 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
@@ -12,23 +12,25 @@ describe('Pools page', () => {
     Helper.checkConsole();
   });
 
-  it('should open and show breadcrumb', () => {
-    page.navigateTo();
-    Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Pools');
-  });
+  describe('breadcrumb and tab tests', () => {
+    beforeAll(() => {
+      page.navigateTo();
+    });
 
-  it('should show two tabs', () => {
-    page.navigateTo();
-    expect(Helper.getTabsCount()).toEqual(2);
-  });
+    it('should open and show breadcrumb', () => {
+      Helper.waitTextToBePresent(Helper.getBreadcrumb(), 'Pools');
+    });
 
-  it('should show pools list tab at first', () => {
-    page.navigateTo();
-    expect(Helper.getTabText(0)).toEqual('Pools List');
-  });
+    it('should show two tabs', () => {
+      expect(Helper.getTabsCount()).toEqual(2);
+    });
+
+    it('should show pools list tab at first', () => {
+      expect(Helper.getTabText(0)).toEqual('Pools List');
+    });
 
-  it('should show overall performance as a second tab', () => {
-    page.navigateTo();
-    expect(Helper.getTabText(1)).toEqual('Overall Performance');
+    it('should show overall performance as a second tab', () => {
+      expect(Helper.getTabText(1)).toEqual('Overall Performance');
+    });
   });
 });