mgr/dashboard: Remove helper.po.ts

Signed-off-by: Tiago Melo <tmelo@suse.com>

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 aee484a21a4f9194deca189398ac1f099cc752cd..142275ff40b66b734ccaaea86ad70bdab6c76f81 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { PoolPageHelper } from '../pools/pools.po';
 import { ImagesPageHelper } from './images.po';
 
@@ -12,7 +11,7 @@ describe('Images page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await ImagesPageHelper.checkConsole();
   });
 
   describe('breadcrumb and tab tests', () => {

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 f032c7657ca78b9a2ecd94c2dc37cfb6337f6b6c..79ea41db8480d1ab400cb2c806d54e8800334945 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { IscsiPageHelper } from './iscsi.po';
 
 describe('Iscsi Page', () => {
@@ -9,7 +8,7 @@ describe('Iscsi Page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await IscsiPageHelper.checkConsole();
   });
 
   describe('breadcrumb test', () => {

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 6daddf9317368548d6a908fc38c5bd56489e89f8..b6201019d2c801c3880f9a61b05ad948caf9e002 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { PoolPageHelper } from '../pools/pools.po';
 import { MirroringPageHelper } from './mirroring.po';
 
@@ -12,7 +11,7 @@ describe('Mirroring page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await MirroringPageHelper.checkConsole();
   });
 
   describe('breadcrumb and tab tests', () => {

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 e54f6dfca05d5deaf89ca08c3e6d4a9eaee94e75..51639d2fca758d8db1914422d15fedf67d782b97 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { AlertsPageHelper } from './alerts.po';
 
 describe('Alerts page', () => {
@@ -9,7 +8,7 @@ describe('Alerts page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await AlertsPageHelper.checkConsole();
   });
 
   describe('breadcrumb test', () => {

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 d4e10e49136db3db20c5bd07be09b88de23a7fd3..23da2a70233433b11b0553b8baa359feddb5a3df 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
@@ -1,5 +1,4 @@
 import { $ } from 'protractor';
-import { Helper } from '../helper.po';
 import { ConfigurationPageHelper } from './configuration.po';
 
 describe('Configuration page', () => {
@@ -10,7 +9,7 @@ describe('Configuration page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await ConfigurationPageHelper.checkConsole();
   });
 
   describe('breadcrumb test', () => {

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 315c5ed4a2928035f3976ba0b523111a88acede8..07687bdc15dccfd15da34e50f8db0219ed6b3348 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
@@ -1,5 +1,4 @@
 import { $ } from 'protractor';
-import { Helper } from '../helper.po';
 import { CrushMapPageHelper } from './crush-map.po';
 
 describe('CRUSH map page', () => {
@@ -10,7 +9,7 @@ describe('CRUSH map page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await CrushMapPageHelper.checkConsole();
   });
 
   describe('breadcrumb test', () => {

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 347ba502315daf6be154b2abc912f0c83c388cb1..1b64cdbfa83b596d420615ba8999e65b4acf9301 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { HostsPageHelper } from './hosts.po';
 
 describe('Hosts page', () => {
@@ -9,7 +8,7 @@ describe('Hosts page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await HostsPageHelper.checkConsole();
   });
 
   describe('breadcrumb and tab tests', () => {

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 bd4ac4484e5c85470936dfe5577765c24c9643bf..47c95a39bdcf70b058294ecbfa32576e8570e18d 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { PoolPageHelper } from '../pools/pools.po';
 import { ConfigurationPageHelper } from './configuration.po';
 import { LogsPageHelper } from './logs.po';
@@ -24,7 +23,7 @@ describe('Logs page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await LogsPageHelper.checkConsole();
   });
 
   describe('breadcrumb and tab tests', () => {

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 f86c8d2d5569c7070ca065a2131ca24f9398bdd9..4950e44ed5d64396c06d304dbe1897765ca9f9da 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { ManagerModulesPageHelper } from './mgr-modules.po';
 
 describe('Manager modules page', () => {
@@ -9,7 +8,7 @@ describe('Manager modules page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await ManagerModulesPageHelper.checkConsole();
   });
 
   describe('breadcrumb test', () => {

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 2eccd062c78833f3c3d86d933751f0ec916bfe99..3a78e51646e014952fb87fe18a7a6beb12cb6c91 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { MonitorsPageHelper } from './monitors.po';
 
 describe('Monitors page', () => {
@@ -9,7 +8,7 @@ describe('Monitors page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await MonitorsPageHelper.checkConsole();
   });
 
   describe('breadcrumb test', () => {

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 85b3e9b0aadd29e6666adf70c958152e9d2cb1ef..2f3a79aa0c4be57f1f2aa323a0c0dba46338bad4 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { OSDsPageHelper } from './osds.po';
 
 describe('OSDs page', () => {
@@ -9,7 +8,7 @@ describe('OSDs page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await OSDsPageHelper.checkConsole();
   });
 
   describe('breadcrumb and tab tests', () => {

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 604b8075454af59763331aa22767ab7c1c2ea8c5..2d860c4381069a647a3eb896d3d8df3a7aeebdbb 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { FilesystemsPageHelper } from './filesystems.po';
 
 describe('Filesystems page', () => {
@@ -9,7 +8,7 @@ describe('Filesystems page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await FilesystemsPageHelper.checkConsole();
   });
 
   describe('breadcrumb test', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
deleted file mode 100644 (file)
index 8c3259b..0000000
--- a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { browser } from 'protractor';
-import { ImagesPageHelper } from './block/images.po';
-import { IscsiPageHelper } from './block/iscsi.po';
-import { MirroringPageHelper } from './block/mirroring.po';
-import { AlertsPageHelper } from './cluster/alerts.po';
-import { ConfigurationPageHelper } from './cluster/configuration.po';
-import { CrushMapPageHelper } from './cluster/crush-map.po';
-import { HostsPageHelper } from './cluster/hosts.po';
-import { LogsPageHelper } from './cluster/logs.po';
-import { ManagerModulesPageHelper } from './cluster/mgr-modules.po';
-import { MonitorsPageHelper } from './cluster/monitors.po';
-import { OSDsPageHelper } from './cluster/osds.po';
-import { FilesystemsPageHelper } from './filesystems/filesystems.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';
-import { UsersPageHelper } from './rgw/users.po';
-import { DashboardPageHelper } from './ui/dashboard.po';
-import { UserMgmtPageHelper } from './ui/user-mgmt.po';
-
-export class Helper {
-  pools: PoolPageHelper;
-  buckets: BucketsPageHelper;
-  images: ImagesPageHelper;
-  mirroring: MirroringPageHelper;
-  dashboard: DashboardPageHelper;
-  usermgmt: UserMgmtPageHelper;
-  daemons: DaemonsPageHelper;
-  users: UsersPageHelper;
-  nfs: NfsPageHelper;
-  filesystems: FilesystemsPageHelper;
-  osds: OSDsPageHelper;
-  monitors: MonitorsPageHelper;
-  mgrModules: ManagerModulesPageHelper;
-  logs: LogsPageHelper;
-  hosts: HostsPageHelper;
-  crushMap: CrushMapPageHelper;
-  configuration: ConfigurationPageHelper;
-  alerts: AlertsPageHelper;
-  iscsi: IscsiPageHelper;
-
-  constructor() {
-    this.pools = new PoolPageHelper();
-    this.buckets = new BucketsPageHelper();
-    this.images = new ImagesPageHelper();
-    this.iscsi = new IscsiPageHelper();
-    this.mirroring = new MirroringPageHelper();
-    this.dashboard = new DashboardPageHelper();
-    this.usermgmt = new UserMgmtPageHelper();
-    this.daemons = new DaemonsPageHelper();
-    this.users = new UsersPageHelper();
-    this.nfs = new NfsPageHelper();
-    this.filesystems = new FilesystemsPageHelper();
-    this.osds = new OSDsPageHelper();
-    this.monitors = new MonitorsPageHelper();
-    this.mgrModules = new ManagerModulesPageHelper();
-    this.logs = new LogsPageHelper();
-    this.hosts = new HostsPageHelper();
-    this.crushMap = new CrushMapPageHelper();
-    this.configuration = new ConfigurationPageHelper();
-    this.alerts = new AlertsPageHelper();
-    this.mirroring = new MirroringPageHelper();
-    this.iscsi = new IscsiPageHelper();
-    this.dashboard = new DashboardPageHelper();
-  }
-
-  /**
-   * Checks if there are any errors on the browser
-   *
-   * @static
-   * @memberof Helper
-   */
-  static async checkConsole() {
-    let browserLog = await browser
-      .manage()
-      .logs()
-      .get('browser');
-
-    browserLog = browserLog.filter((log) => log.level.value > 900);
-
-    if (browserLog.length > 0) {
-      console.log('\n log: ' + require('util').inspect(browserLog));
-    }
-
-    await expect(browserLog.length).toEqual(0);
-  }
-}

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 5addf779a9602d905a35da836404392af6ef688e..dc697451d24a0ffa31110aa1dc06703a9851802c 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { NfsPageHelper } from './nfs.po';
 
 describe('Nfs page', () => {
@@ -9,7 +8,7 @@ describe('Nfs page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await NfsPageHelper.checkConsole();
   });
 
   describe('breadcrumb test', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts
index 21c195012805e55ad2c9c7342e6f7cd3a7daad9c..ae1eb1645c8d5117078f3e12ea90efe35b0ccbbf 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/page-helper.po.ts
@@ -19,6 +19,27 @@ interface Pages {
 export abstract class PageHelper {
   pages: Pages;
 
+  /**
+   * Checks if there are any errors on the browser
+   *
+   * @static
+   * @memberof Helper
+   */
+  static async checkConsole() {
+    let browserLog = await browser
+      .manage()
+      .logs()
+      .get('browser');
+
+    browserLog = browserLog.filter((log) => log.level.value > 900);
+
+    if (browserLog.length > 0) {
+      console.log('\n log: ' + require('util').inspect(browserLog));
+    }
+
+    await expect(browserLog.length).toEqual(0);
+  }
+
   /**
    * Decorator to be used on Helper methods to restrict access to one particular URL.  This shall
    * help developers to prevent and highlight mistakes.  It also reduces boilerplate code and by

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 83176962227b3254372df38ea62ea4d6f3f947f8..4b1712f44f185e0be5b9445666169f984e830038 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
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { PoolPageHelper } from './pools.po';
 
 describe('Pools page', () => {
@@ -11,7 +10,7 @@ describe('Pools page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await PoolPageHelper.checkConsole();
   });
 
   describe('breadcrumb and tab tests', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts
index a6ef61ac7433e05fbe3daa30ecf74ab828ed107a..f6ae51f6cbd5cc45a54a6b0bf72d6c0e331b565d 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/rgw/buckets.e2e-spec.ts
@@ -1,5 +1,4 @@
 import { $ } from 'protractor';
-import { Helper } from '../helper.po';
 import { BucketsPageHelper } from './buckets.po';
 
 describe('RGW buckets page', () => {
@@ -10,7 +9,7 @@ describe('RGW buckets page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await BucketsPageHelper.checkConsole();
   });
 
   it('should open and show breadcrumb', async () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts
index a396ad76c748852b416aca7c2bc4b26a80371c7e..2e757b75a24808bd1eff47dd64db1c2f580f69fc 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/rgw/daemons.e2e-spec.ts
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { DaemonsPageHelper } from './daemons.po';
 
 describe('RGW daemons page', () => {
@@ -9,7 +8,7 @@ describe('RGW daemons page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await DaemonsPageHelper.checkConsole();
   });
 
   describe('breadcrumb and tab tests', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts
index 12cc327a35f2dddc050e9b43bacd1eae0cde80bd..13f96d11edb59173bfd2d244a7b7d27923074358 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/rgw/users.e2e-spec.ts
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { UsersPageHelper } from './users.po';
 
 describe('RGW users page', () => {
@@ -10,7 +9,7 @@ describe('RGW users page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await UsersPageHelper.checkConsole();
   });
 
   describe('breadcrumb test', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/ui/dashboard.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/ui/dashboard.e2e-spec.ts
index a0ece317db3a96f489b4e44a2e7aa6bc1b35e286..d15c358d52505e41bd3948436a186e387c2b2108 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/ui/dashboard.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/ui/dashboard.e2e-spec.ts
@@ -3,7 +3,6 @@ import { IscsiPageHelper } from '../block/iscsi.po';
 import { HostsPageHelper } from '../cluster/hosts.po';
 import { MonitorsPageHelper } from '../cluster/monitors.po';
 import { OSDsPageHelper } from '../cluster/osds.po';
-import { Helper } from '../helper.po';
 import { PageHelper } from '../page-helper.po';
 import { PoolPageHelper } from '../pools/pools.po';
 import { DaemonsPageHelper } from '../rgw/daemons.po';
@@ -29,7 +28,7 @@ describe('Dashboard Main Page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await DashboardPageHelper.checkConsole();
   });
 
   describe('Check that all hyperlinks on info cards lead to the correct page and fields exist', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/ui/role-mgmt.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/ui/role-mgmt.e2e-spec.ts
index 0bff2733058c33400c84caa10d6def616c3a205c..badb3c968e33f6d4f34ac0128be4810a474dc66f 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/ui/role-mgmt.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/ui/role-mgmt.e2e-spec.ts
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { RoleMgmtPageHelper } from './role-mgmt.po';
 
 describe('Role Management page', () => {
@@ -10,7 +9,7 @@ describe('Role Management page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await RoleMgmtPageHelper.checkConsole();
   });
 
   describe('breadcrumb tests', () => {

diff --git a/src/pybind/mgr/dashboard/frontend/e2e/ui/user-mgmt.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/ui/user-mgmt.e2e-spec.ts
index a0ae3f55c6e6ede26ab53fb9255e135516b6d88a..f40ce1f10a8c9a338a19c910f3b98852643ab9e4 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/e2e/ui/user-mgmt.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/e2e/ui/user-mgmt.e2e-spec.ts
@@ -1,4 +1,3 @@
-import { Helper } from '../helper.po';
 import { UserMgmtPageHelper } from './user-mgmt.po';
 
 describe('User Management page', () => {
@@ -10,7 +9,7 @@ describe('User Management page', () => {
   });
 
   afterEach(async () => {
-    await Helper.checkConsole();
+    await UserMgmtPageHelper.checkConsole();
   });
 
   describe('breadcrumb tests', () => {