From 34f213d58cb3879a2cd9199192047fd73274df62 Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Thu, 29 Aug 2019 16:50:55 +0000 Subject: [PATCH] mgr/dashboard: Move some e2e into new "ui" folder Signed-off-by: Tiago Melo --- .../mgr/dashboard/frontend/e2e/helper.po.ts | 4 ++-- .../frontend/e2e/{ => ui}/dashboard.e2e-spec.ts | 16 ++++++++-------- .../frontend/e2e/{ => ui}/dashboard.po.ts | 2 +- .../frontend/e2e/{ => ui}/user-mgmt.e2e-spec.ts | 2 +- .../frontend/e2e/{ => ui}/user-mgmt.po.ts | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) rename src/pybind/mgr/dashboard/frontend/e2e/{ => ui}/dashboard.e2e-spec.ts (91%) rename src/pybind/mgr/dashboard/frontend/e2e/{ => ui}/dashboard.po.ts (97%) rename src/pybind/mgr/dashboard/frontend/e2e/{ => ui}/user-mgmt.e2e-spec.ts (98%) rename src/pybind/mgr/dashboard/frontend/e2e/{ => ui}/user-mgmt.po.ts (98%) diff --git a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts index 1bf9ca2131b..8c3259b7308 100644 --- a/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts +++ b/src/pybind/mgr/dashboard/frontend/e2e/helper.po.ts @@ -10,14 +10,14 @@ 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 { DashboardPageHelper } from './dashboard.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 { UserMgmtPageHelper } from './user-mgmt.po'; +import { DashboardPageHelper } from './ui/dashboard.po'; +import { UserMgmtPageHelper } from './ui/user-mgmt.po'; export class Helper { pools: PoolPageHelper; diff --git a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/ui/dashboard.e2e-spec.ts similarity index 91% rename from src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts rename to src/pybind/mgr/dashboard/frontend/e2e/ui/dashboard.e2e-spec.ts index f06c515926e..a0ece317db3 100644 --- a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/e2e/ui/dashboard.e2e-spec.ts @@ -1,13 +1,13 @@ import { browser } from 'protractor'; -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 { 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'; import { DashboardPageHelper } from './dashboard.po'; -import { Helper } from './helper.po'; -import { PageHelper } from './page-helper.po'; -import { PoolPageHelper } from './pools/pools.po'; -import { DaemonsPageHelper } from './rgw/daemons.po'; describe('Dashboard Main Page', () => { let dashboard: DashboardPageHelper; diff --git a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/ui/dashboard.po.ts similarity index 97% rename from src/pybind/mgr/dashboard/frontend/e2e/dashboard.po.ts rename to src/pybind/mgr/dashboard/frontend/e2e/ui/dashboard.po.ts index a4271d931a4..f0a23385417 100644 --- a/src/pybind/mgr/dashboard/frontend/e2e/dashboard.po.ts +++ b/src/pybind/mgr/dashboard/frontend/e2e/ui/dashboard.po.ts @@ -1,5 +1,5 @@ import { $, $$, by, ElementFinder } from 'protractor'; -import { PageHelper } from './page-helper.po'; +import { PageHelper } from '../page-helper.po'; export class DashboardPageHelper extends PageHelper { pages = { diff --git a/src/pybind/mgr/dashboard/frontend/e2e/user-mgmt.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/e2e/ui/user-mgmt.e2e-spec.ts similarity index 98% rename from src/pybind/mgr/dashboard/frontend/e2e/user-mgmt.e2e-spec.ts rename to src/pybind/mgr/dashboard/frontend/e2e/ui/user-mgmt.e2e-spec.ts index 410b7b62aa5..e3f10e83086 100644 --- a/src/pybind/mgr/dashboard/frontend/e2e/user-mgmt.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/e2e/ui/user-mgmt.e2e-spec.ts @@ -1,4 +1,4 @@ -import { Helper } from './helper.po'; +import { Helper } from '../helper.po'; import { UserMgmtPageHelper } from './user-mgmt.po'; describe('User Management page', () => { diff --git a/src/pybind/mgr/dashboard/frontend/e2e/user-mgmt.po.ts b/src/pybind/mgr/dashboard/frontend/e2e/ui/user-mgmt.po.ts similarity index 98% rename from src/pybind/mgr/dashboard/frontend/e2e/user-mgmt.po.ts rename to src/pybind/mgr/dashboard/frontend/e2e/ui/user-mgmt.po.ts index 8b4de347a2a..70fd02d5ed4 100644 --- a/src/pybind/mgr/dashboard/frontend/e2e/user-mgmt.po.ts +++ b/src/pybind/mgr/dashboard/frontend/e2e/ui/user-mgmt.po.ts @@ -1,5 +1,5 @@ import { $, by, element } from 'protractor'; -import { PageHelper } from './page-helper.po'; +import { PageHelper } from '../page-helper.po'; export class UserMgmtPageHelper extends PageHelper { pages = { -- 2.39.5