From a23af4c854b1341b7f4f155d854d007678fb73c4 Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Thu, 29 Aug 2019 20:32:17 +0000 Subject: [PATCH] mgr/dashboard: Remove helper.po.ts Signed-off-by: Tiago Melo --- .../frontend/e2e/block/images.e2e-spec.ts | 3 +- .../frontend/e2e/block/iscsi.e2e-spec.ts | 3 +- .../frontend/e2e/block/mirroring.e2e-spec.ts | 3 +- .../frontend/e2e/cluster/alerts.e2e-spec.ts | 3 +- .../e2e/cluster/configuration.e2e-spec.ts | 3 +- .../e2e/cluster/crush-map.e2e-spec.ts | 3 +- .../frontend/e2e/cluster/hosts.e2e-spec.ts | 3 +- .../frontend/e2e/cluster/logs.e2e-spec.ts | 3 +- .../e2e/cluster/mgr-modules.e2e-spec.ts | 3 +- .../frontend/e2e/cluster/monitors.e2e-spec.ts | 3 +- .../frontend/e2e/cluster/osds.e2e-spec.ts | 3 +- .../e2e/filesystems/filesystems.e2e-spec.ts | 3 +- .../mgr/dashboard/frontend/e2e/helper.po.ts | 88 ------------------- .../frontend/e2e/nfs/nfs.e2e-spec.ts | 3 +- .../dashboard/frontend/e2e/page-helper.po.ts | 21 +++++ .../frontend/e2e/pools/pools.e2e-spec.ts | 3 +- .../frontend/e2e/rgw/buckets.e2e-spec.ts | 3 +- .../frontend/e2e/rgw/daemons.e2e-spec.ts | 3 +- .../frontend/e2e/rgw/users.e2e-spec.ts | 3 +- .../frontend/e2e/ui/dashboard.e2e-spec.ts | 3 +- .../frontend/e2e/ui/role-mgmt.e2e-spec.ts | 3 +- .../frontend/e2e/ui/user-mgmt.e2e-spec.ts | 3 +- 22 files changed, 41 insertions(+), 128 deletions(-) delete mode 100644 src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts 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 aee484a21a4..142275ff40b 100644 --- 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 f032c7657ca..79ea41db848 100644 --- 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 6daddf93173..b6201019d2c 100644 --- 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 e54f6dfca05..51639d2fca7 100644 --- 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 d4e10e49136..23da2a70233 100644 --- 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 315c5ed4a29..07687bdc15d 100644 --- 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 347ba502315..1b64cdbfa83 100644 --- 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 bd4ac4484e5..47c95a39bdc 100644 --- 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 f86c8d2d556..4950e44ed5d 100644 --- 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 2eccd062c78..3a78e51646e 100644 --- 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 85b3e9b0aad..2f3a79aa0c4 100644 --- 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 604b8075454..2d860c43810 100644 --- 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 index 8c3259b7308..00000000000 --- 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 5addf779a96..dc697451d24 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 @@ -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 21c19501280..ae1eb1645c8 100644 --- 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 83176962227..4b1712f44f1 100644 --- 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 a6ef61ac743..f6ae51f6cbd 100644 --- 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 a396ad76c74..2e757b75a24 100644 --- 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 12cc327a35f..13f96d11edb 100644 --- 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 a0ece317db3..d15c358d525 100644 --- 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 0bff2733058..badb3c968e3 100644 --- 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 a0ae3f55c6e..f40ce1f10a8 100644 --- 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', () => { -- 2.39.5