From 8b567eb9a7ba8805b1224b6442d8a139de08b6bd Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Wed, 4 Jul 2018 16:56:43 +0100 Subject: [PATCH] mgr/dashboard: Move unit-test-helper into the new testing folder Signed-off-by: Tiago Melo --- .../mgr/dashboard/frontend/src/app/app.component.spec.ts | 2 +- .../src/app/ceph/block/iscsi/iscsi.component.spec.ts | 2 +- .../src/app/ceph/block/mirroring/mirroring.component.spec.ts | 2 +- .../app/ceph/block/rbd-details/rbd-details.component.spec.ts | 2 +- .../src/app/ceph/block/rbd-form/rbd-form.component.spec.ts | 2 +- .../src/app/ceph/block/rbd-list/rbd-list.component.spec.ts | 2 +- .../rbd-snapshot-form/rbd-snapshot-form.component.spec.ts | 2 +- .../rbd-snapshot-list/rbd-snapshot-list.component.spec.ts | 2 +- .../ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts | 2 +- .../cephfs/cephfs-clients/cephfs-clients.component.spec.ts | 2 +- .../cephfs/cephfs-detail/cephfs-detail.component.spec.ts | 2 +- .../ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts | 2 +- .../cluster/configuration/configuration.component.spec.ts | 2 +- .../src/app/ceph/cluster/hosts/hosts.component.spec.ts | 2 +- .../src/app/ceph/cluster/monitor/monitor.component.spec.ts | 2 +- .../cluster/osd/osd-details/osd-details.component.spec.ts | 2 +- .../osd/osd-flags-modal/osd-flags-modal.component.spec.ts | 2 +- .../app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts | 2 +- .../osd-performance-histogram.component.spec.ts | 2 +- .../osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts | 2 +- .../app/ceph/dashboard/dashboard/dashboard.component.spec.ts | 2 +- .../ceph/dashboard/health-pie/health-pie.component.spec.ts | 2 +- .../src/app/ceph/dashboard/health/health.component.spec.ts | 2 +- .../performance-counter.component.spec.ts | 2 +- .../table-performance-counter.component.spec.ts | 2 +- .../src/app/ceph/pool/pool-list/pool-list.component.spec.ts | 2 +- .../src/app/ceph/rgw/rgw-501/rgw-501.component.spec.ts | 2 +- .../rgw-bucket-details/rgw-bucket-details.component.spec.ts | 2 +- .../rgw/rgw-bucket-form/rgw-bucket-form.component.spec.ts | 2 +- .../rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts | 2 +- .../rgw-daemon-details/rgw-daemon-details.component.spec.ts | 2 +- .../rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts | 2 +- .../rgw-user-capability-modal.component.spec.ts | 2 +- .../rgw/rgw-user-details/rgw-user-details.component.spec.ts | 2 +- .../ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts | 2 +- .../ceph/rgw/rgw-user-list/rgw-user-list.component.spec.ts | 2 +- .../rgw-user-s3-key-modal.component.spec.ts | 2 +- .../rgw-user-subuser-modal.component.spec.ts | 2 +- .../rgw-user-swift-key-modal.component.spec.ts | 2 +- .../frontend/src/app/core/auth/login/login.component.spec.ts | 2 +- .../src/app/core/auth/logout/logout.component.spec.ts | 2 +- .../src/app/core/navigation/about/about.component.spec.ts | 2 +- .../dashboard-help/dashboard-help.component.spec.ts | 2 +- .../core/navigation/navigation/navigation.component.spec.ts | 2 +- .../navigation/notifications/notifications.component.spec.ts | 2 +- .../navigation/task-manager/task-manager.component.spec.ts | 2 +- .../src/app/core/not-found/not-found.component.spec.ts | 2 +- .../frontend/src/app/shared/api/auth.service.spec.ts | 2 +- .../frontend/src/app/shared/api/cephfs.service.spec.ts | 2 +- .../src/app/shared/api/configuration.service.spec.ts | 2 +- .../frontend/src/app/shared/api/dashboard.service.spec.ts | 2 +- .../frontend/src/app/shared/api/host.service.spec.ts | 2 +- .../frontend/src/app/shared/api/logging.service.spec.ts | 2 +- .../frontend/src/app/shared/api/monitor.service.spec.ts | 2 +- .../frontend/src/app/shared/api/osd.service.spec.ts | 2 +- .../src/app/shared/api/performance-counter.service.spec.ts | 2 +- .../frontend/src/app/shared/api/pool.service.spec.ts | 2 +- .../src/app/shared/api/rbd-mirroring.service.spec.ts | 2 +- .../frontend/src/app/shared/api/rbd.service.spec.ts | 2 +- .../frontend/src/app/shared/api/rgw-bucket.service.spec.ts | 2 +- .../frontend/src/app/shared/api/rgw-daemon.service.spec.ts | 2 +- .../frontend/src/app/shared/api/rgw-user.service.spec.ts | 2 +- .../frontend/src/app/shared/api/tcmu-iscsi.service.spec.ts | 2 +- .../deletion-modal/deletion-modal.component.spec.ts | 2 +- .../components/error-panel/error-panel.component.spec.ts | 2 +- .../app/shared/components/helper/helper.component.spec.ts | 2 +- .../components/info-panel/info-panel.component.spec.ts | 2 +- .../components/loading-panel/loading-panel.component.spec.ts | 2 +- .../src/app/shared/components/modal/modal.component.spec.ts | 2 +- .../shared/components/sparkline/sparkline.component.spec.ts | 2 +- .../components/submit-button/submit-button.component.spec.ts | 2 +- .../shared/components/usage-bar/usage-bar.component.spec.ts | 2 +- .../components/view-cache/view-cache.component.spec.ts | 2 +- .../components/warning-panel/warning-panel.component.spec.ts | 2 +- .../table-key-value/table-key-value.component.spec.ts | 2 +- .../src/app/shared/datatable/table/table.component.spec.ts | 2 +- .../src/app/shared/services/auth-guard.service.spec.ts | 2 +- .../src/app/shared/services/formatter.service.spec.ts | 2 +- .../app/shared/services/module-status-guard.service.spec.ts | 2 +- .../src/app/shared/services/notification.service.spec.ts | 2 +- .../frontend/src/app/shared/services/summary.service.spec.ts | 2 +- .../src/app/shared/services/task-manager.service.spec.ts | 2 +- .../src/app/shared/services/task-wrapper.service.spec.ts | 2 +- .../frontend/src/{app/shared => testing}/unit-test-helper.ts | 2 +- src/pybind/mgr/dashboard/frontend/src/tsconfig.app.json | 5 ++--- 85 files changed, 86 insertions(+), 87 deletions(-) rename src/pybind/mgr/dashboard/frontend/src/{app/shared => testing}/unit-test-helper.ts (92%) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/app.component.spec.ts index 9182e31bd7078..a157a44eb3fb4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/app.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/app.component.spec.ts @@ -4,9 +4,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastModule } from 'ng2-toastr'; +import { configureTestBed } from '../testing/unit-test-helper'; import { AppComponent } from './app.component'; import { AuthStorageService } from './shared/services/auth-storage.service'; -import { configureTestBed } from './shared/unit-test-helper'; describe('AppComponent', () => { let component: AppComponent; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts index f10d13d04da08..1e80d2e61dffb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/iscsi/iscsi.component.spec.ts @@ -1,13 +1,13 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { TcmuIscsiService } from '../../../shared/api/tcmu-iscsi.service'; import { CephShortVersionPipe } from '../../../shared/pipes/ceph-short-version.pipe'; import { DimlessPipe } from '../../../shared/pipes/dimless.pipe'; import { ListPipe } from '../../../shared/pipes/list.pipe'; import { RelativeDatePipe } from '../../../shared/pipes/relative-date.pipe'; import { FormatterService } from '../../../shared/services/formatter.service'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { IscsiComponent } from './iscsi.component'; describe('IscsiComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.spec.ts index 0f4878e2b00fa..584dacac973a8 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/mirroring/mirroring.component.spec.ts @@ -4,8 +4,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BsDropdownModule, TabsModule } from 'ngx-bootstrap'; import { ProgressbarModule } from 'ngx-bootstrap/progressbar'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { MirrorHealthColorPipe } from '../mirror-health-color.pipe'; import { MirroringComponent } from './mirroring.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.spec.ts index 33f9749077168..d836eb6cc337b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.spec.ts @@ -3,8 +3,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { TabsModule, TooltipModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RbdSnapshotListComponent } from '../rbd-snapshot-list/rbd-snapshot-list.component'; import { RbdDetailsComponent } from './rbd-details.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.spec.ts index e11941120b505..0dfdafadc1c85 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-form/rbd-form.component.spec.ts @@ -7,9 +7,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ToastModule } from 'ng2-toastr'; import { ActivatedRouteStub } from '../../../../testing/activated-route-stub'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { RbdService } from '../../../shared/api/rbd.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RbdFormMode } from './rbd-form-mode.enum'; import { RbdFormComponent } from './rbd-form.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.spec.ts index 1f5b842f32eea..f5384275d732a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-list/rbd-list.component.spec.ts @@ -11,9 +11,9 @@ import { TooltipModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ComponentsModule } from '../../../shared/components/components.module'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RbdDetailsComponent } from '../rbd-details/rbd-details.component'; import { RbdSnapshotListComponent } from '../rbd-snapshot-list/rbd-snapshot-list.component'; import { RbdListComponent } from './rbd-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form.component.spec.ts index 0bf89bb940a59..4c624dd8d8e23 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-form/rbd-snapshot-form.component.spec.ts @@ -5,11 +5,11 @@ import { ReactiveFormsModule } from '@angular/forms'; import { ToastModule } from 'ng2-toastr'; import { BsModalRef, BsModalService } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ApiModule } from '../../../shared/api/api.module'; import { ComponentsModule } from '../../../shared/components/components.module'; import { AuthStorageService } from '../../../shared/services/auth-storage.service'; import { ServicesModule } from '../../../shared/services/services.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RbdSnapshotFormComponent } from './rbd-snapshot-form.component'; describe('RbdSnapshotFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts index e709b4e4c5469..09420cca7161e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-snapshot-list/rbd-snapshot-list.component.spec.ts @@ -6,6 +6,7 @@ import { ToastModule } from 'ng2-toastr'; import { BsModalRef, ModalModule } from 'ngx-bootstrap'; import { throwError as observableThrowError } from 'rxjs'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ApiModule } from '../../../shared/api/api.module'; import { RbdService } from '../../../shared/api/rbd.service'; import { ComponentsModule } from '../../../shared/components/components.module'; @@ -15,7 +16,6 @@ import { PipesModule } from '../../../shared/pipes/pipes.module'; import { AuthStorageService } from '../../../shared/services/auth-storage.service'; import { NotificationService } from '../../../shared/services/notification.service'; import { ServicesModule } from '../../../shared/services/services.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RbdSnapshotListComponent } from './rbd-snapshot-list.component'; describe('RbdSnapshotListComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts index e940cdad0d136..8a173162b87fc 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ChartsModule } from 'ng2-charts/ng2-charts'; -import { configureTestBed } from '../../../shared/unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { CephfsChartComponent } from './cephfs-chart.component'; describe('CephfsChartComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.spec.ts index 31e65be2ae461..4524c00c80cd2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.spec.ts @@ -4,9 +4,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { BsDropdownModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { CephfsService } from '../../../shared/api/cephfs.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { CephfsClientsComponent } from './cephfs-clients.component'; describe('CephfsClientsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.spec.ts index 4f47f8f949da6..616630e2277d6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.spec.ts @@ -6,9 +6,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ChartsModule } from 'ng2-charts/ng2-charts'; import { BsDropdownModule, ProgressbarModule, TabsModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { CephfsService } from '../../../shared/api/cephfs.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { CephfsDetailComponent } from './cephfs-detail.component'; @Component({ selector: 'cd-cephfs-chart', template: '' }) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts index ca3e11451dfd4..aba6f1f4662df 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.spec.ts @@ -2,10 +2,10 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Component, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { CephfsService } from '../../../shared/api/cephfs.service'; import { CdTableSelection } from '../../../shared/models/cd-table-selection'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { CephfsListComponent } from './cephfs-list.component'; @Component({ selector: 'cd-cephfs-detail', template: '' }) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts index 152819cf6f2fe..c2602be6dc1ad 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/configuration/configuration.component.spec.ts @@ -4,9 +4,9 @@ import { FormsModule } from '@angular/forms'; import { TabsModule } from 'ngx-bootstrap/tabs/tabs.module'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ConfigurationService } from '../../../shared/api/configuration.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { ConfigurationComponent } from './configuration.component'; describe('ConfigurationComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts index e23a52ba162e3..ba23b2d332774 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.spec.ts @@ -4,11 +4,11 @@ import { RouterTestingModule } from '@angular/router/testing'; import { BsDropdownModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ComponentsModule } from '../../../shared/components/components.module'; import { Permissions } from '../../../shared/models/permissions'; import { AuthStorageService } from '../../../shared/services/auth-storage.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { HostsComponent } from './hosts.component'; describe('HostsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts index 1587560c9d049..a405a62662f4f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.spec.ts @@ -1,8 +1,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { MonitorService } from '../../../shared/api/monitor.service'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { MonitorComponent } from './monitor.component'; describe('MonitorComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts index e6f596fde2842..a8d07224583c4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.spec.ts @@ -3,10 +3,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TabsModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../../testing/unit-test-helper'; import { DataTableModule } from '../../../../shared/datatable/datatable.module'; import { CdTableSelection } from '../../../../shared/models/cd-table-selection'; import { SharedModule } from '../../../../shared/shared.module'; -import { configureTestBed } from '../../../../shared/unit-test-helper'; import { PerformanceCounterModule } from '../../../performance-counter/performance-counter.module'; import { OsdPerformanceHistogramComponent } from '../osd-performance-histogram/osd-performance-histogram.component'; import { OsdDetailsComponent } from './osd-details.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.spec.ts index 2d1d7daa73af1..77cda70ebd01f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-flags-modal/osd-flags-modal.component.spec.ts @@ -6,10 +6,10 @@ import * as _ from 'lodash'; import { ToastModule } from 'ng2-toastr'; import { BsModalRef, ModalModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../../testing/unit-test-helper'; import { NotificationType } from '../../../../shared/enum/notification-type.enum'; import { NotificationService } from '../../../../shared/services/notification.service'; import { SharedModule } from '../../../../shared/shared.module'; -import { configureTestBed } from '../../../../shared/unit-test-helper'; import { OsdFlagsModalComponent } from './osd-flags-modal.component'; function getFlagsArray(component: OsdFlagsModalComponent) { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts index b1095b8d9ed54..f5f5ce3e2d780 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.spec.ts @@ -3,6 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TabsModule } from 'ngx-bootstrap/tabs'; +import { configureTestBed } from '../../../../../testing/unit-test-helper'; import { ComponentsModule } from '../../../../shared/components/components.module'; import { DataTableModule } from '../../../../shared/datatable/datatable.module'; import { Permissions } from '../../../../shared/models/permissions'; @@ -10,7 +11,6 @@ import { DimlessPipe } from '../../../../shared/pipes/dimless.pipe'; import { AuthStorageService } from '../../../../shared/services/auth-storage.service'; import { FormatterService } from '../../../../shared/services/formatter.service'; import { SharedModule } from '../../../../shared/shared.module'; -import { configureTestBed } from '../../../../shared/unit-test-helper'; import { PerformanceCounterModule } from '../../../performance-counter/performance-counter.module'; import { OsdDetailsComponent } from '../osd-details/osd-details.component'; import { OsdPerformanceHistogramComponent } from '../osd-performance-histogram/osd-performance-histogram.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.spec.ts index 65a0864480900..5292f9458f247 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-performance-histogram/osd-performance-histogram.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../../shared/unit-test-helper'; +import { configureTestBed } from '../../../../../testing/unit-test-helper'; import { OsdPerformanceHistogramComponent } from './osd-performance-histogram.component'; describe('OsdPerformanceHistogramComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts index 185c525140402..b9cbc82939333 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-scrub-modal/osd-scrub-modal.component.spec.ts @@ -4,9 +4,9 @@ import { ReactiveFormsModule } from '@angular/forms'; import { BsModalRef } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../../testing/unit-test-helper'; import { OsdService } from '../../../../shared/api/osd.service'; import { NotificationService } from '../../../../shared/services/notification.service'; -import { configureTestBed } from '../../../../shared/unit-test-helper'; import { OsdScrubModalComponent } from './osd-scrub-modal.component'; describe('OsdScrubModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts index dc52606896fe9..079ae3e1cfbe9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/dashboard/dashboard.component.spec.ts @@ -1,7 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../../shared/unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { DashboardComponent } from './dashboard.component'; describe('DashboardComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts index d1ec0014d7402..bd382aaae02b0 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.spec.ts @@ -1,9 +1,9 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { DimlessBinaryPipe } from '../../../shared/pipes/dimless-binary.pipe'; import { FormatterService } from '../../../shared/services/formatter.service'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { HealthPieComponent } from './health-pie.component'; describe('HealthPieComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts index 14522ca553089..570071abfd157 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.spec.ts @@ -2,9 +2,9 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { DashboardService } from '../../../shared/api/dashboard.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { LogColorPipe } from '../log-color.pipe'; import { MdsSummaryPipe } from '../mds-summary.pipe'; import { MgrSummaryPipe } from '../mgr-summary.pipe'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts index c732e74286c27..d725a61b619f9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.spec.ts @@ -2,8 +2,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { TablePerformanceCounterComponent } from '../table-performance-counter/table-performance-counter.component'; import { PerformanceCounterComponent } from './performance-counter.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts index 516d4127d8b24..a71394fd02310 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/table-performance-counter/table-performance-counter.component.spec.ts @@ -1,8 +1,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { TablePerformanceCounterComponent } from './table-performance-counter.component'; describe('TablePerformanceCounterComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts index 815ae69706ea1..27db3d0d96529 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TabsModule } from 'ngx-bootstrap/tabs/tabs.module'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { PoolListComponent } from './pool-list.component'; describe('PoolListComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-501/rgw-501.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-501/rgw-501.component.spec.ts index 20a1d79e50c22..382d66f25647f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-501/rgw-501.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-501/rgw-501.component.spec.ts @@ -1,8 +1,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { Rgw501Component } from './rgw-501.component'; describe('Rgw501Component', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts index adaaf0534e748..18124caa365df 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts @@ -2,9 +2,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TabsModule } from 'ngx-bootstrap/tabs'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { CdTableSelection } from '../../../shared/models/cd-table-selection'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RgwBucketDetailsComponent } from './rgw-bucket-details.component'; describe('RgwBucketDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.spec.ts index f80db6ee4e2d0..5a3a0b5cda30a 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.spec.ts @@ -5,10 +5,10 @@ import { RouterTestingModule } from '@angular/router/testing'; import { of as observableOf } from 'rxjs'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { RgwBucketService } from '../../../shared/api/rgw-bucket.service'; import { RgwUserService } from '../../../shared/api/rgw-user.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RgwBucketFormComponent } from './rgw-bucket-form.component'; describe('RgwBucketFormComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts index 0e162944a6a85..28e937c90737e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts @@ -4,9 +4,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ModalModule, TabsModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { RgwBucketService } from '../../../shared/api/rgw-bucket.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RgwBucketDetailsComponent } from '../rgw-bucket-details/rgw-bucket-details.component'; import { RgwBucketListComponent } from './rgw-bucket-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts index acf40e2d846d7..388bcb7a96b4e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-details/rgw-daemon-details.component.spec.ts @@ -3,10 +3,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TabsModule } from 'ngx-bootstrap/tabs'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { RgwDaemonService } from '../../../shared/api/rgw-daemon.service'; import { CdTableSelection } from '../../../shared/models/cd-table-selection'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { PerformanceCounterModule } from '../../performance-counter/performance-counter.module'; import { RgwDaemonDetailsComponent } from './rgw-daemon-details.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts index 6822845e274f7..34ca733aa12d6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts @@ -3,8 +3,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TabsModule } from 'ngx-bootstrap/tabs'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { PerformanceCounterModule } from '../../performance-counter/performance-counter.module'; import { RgwDaemonDetailsComponent } from '../rgw-daemon-details/rgw-daemon-details.component'; import { RgwDaemonListComponent } from './rgw-daemon-list.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.spec.ts index 61ad79ab0c436..318c8a1affc0c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-capability-modal/rgw-user-capability-modal.component.spec.ts @@ -3,8 +3,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { BsModalRef } from 'ngx-bootstrap/modal'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RgwUserCapabilityModalComponent } from './rgw-user-capability-modal.component'; describe('RgwUserCapabilityModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts index 96b5c5a76e134..b2de9733fadc9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-details/rgw-user-details.component.spec.ts @@ -5,9 +5,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { BsModalService } from 'ngx-bootstrap/modal'; import { TabsModule } from 'ngx-bootstrap/tabs'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { CdTableSelection } from '../../../shared/models/cd-table-selection'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RgwUserDetailsComponent } from './rgw-user-details.component'; describe('RgwUserDetailsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts index bca02882ecc36..90f886e22c7ed 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-form/rgw-user-form.component.spec.ts @@ -6,9 +6,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { BsModalService } from 'ngx-bootstrap/modal'; import { of as observableOf } from 'rxjs'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { RgwUserService } from '../../../shared/api/rgw-user.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RgwUserS3Key } from '../models/rgw-user-s3-key'; import { RgwUserFormComponent } from './rgw-user-form.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.spec.ts index 28f20df62a3e8..dba2dcc695040 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-list/rgw-user-list.component.spec.ts @@ -5,9 +5,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { ModalModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { RgwUserService } from '../../../shared/api/rgw-user.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RgwUserListComponent } from './rgw-user-list.component'; describe('RgwUserListComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.spec.ts index e519b0be4f4b0..7dd53a0404665 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-s3-key-modal/rgw-user-s3-key-modal.component.spec.ts @@ -3,8 +3,8 @@ import { ReactiveFormsModule } from '@angular/forms'; import { BsModalRef } from 'ngx-bootstrap/modal'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RgwUserS3KeyModalComponent } from './rgw-user-s3-key-modal.component'; describe('RgwUserS3KeyModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts index e721c8160c327..f321dfe6595f7 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-subuser-modal/rgw-user-subuser-modal.component.spec.ts @@ -3,8 +3,8 @@ import { FormControl, ReactiveFormsModule } from '@angular/forms'; import { BsModalRef } from 'ngx-bootstrap/modal'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { RgwUserSubuserModalComponent } from './rgw-user-subuser-modal.component'; describe('RgwUserSubuserModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.spec.ts index 3b1fce3af069d..cf950177470a2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-swift-key-modal/rgw-user-swift-key-modal.component.spec.ts @@ -3,7 +3,7 @@ import { FormsModule } from '@angular/forms'; import { BsModalRef } from 'ngx-bootstrap/modal'; -import { configureTestBed } from '../../../shared/unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { RgwUserSwiftKeyModalComponent } from './rgw-user-swift-key-modal.component'; describe('RgwUserSwiftKeyModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.spec.ts index feb6c87e03637..f2df1e8646d7d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.spec.ts @@ -3,9 +3,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { RouterTestingModule } from '@angular/router/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { AuthService } from '../../../shared/api/auth.service'; import { AuthStorageService } from '../../../shared/services/auth-storage.service'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { LoginComponent } from './login.component'; describe('LoginComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.spec.ts index 96a851b6d35f1..b75279eb6159d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/auth/logout/logout.component.spec.ts @@ -2,7 +2,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../../../shared/unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { AuthModule } from '../auth.module'; import { LogoutComponent } from './logout.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts index d2c53707f09e9..3afd7bd384886 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/about/about.component.spec.ts @@ -5,9 +5,9 @@ import { BsModalRef } from 'ngx-bootstrap'; import 'rxjs/add/observable/of'; import { Observable } from 'rxjs/Observable'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SummaryService } from '../../../shared/services/summary.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { AboutComponent } from './about.component'; class SummaryServiceMock { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts index f6a3e5b12bffb..738f89c4ed58e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/dashboard-help/dashboard-help.component.spec.ts @@ -1,8 +1,8 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { DashboardHelpComponent } from './dashboard-help.component'; describe('DashboardHelpComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts index 71844c70095ec..6792cf8e98594 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { AppModule } from '../../../app.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { NavigationComponent } from './navigation.component'; describe('NavigationComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.spec.ts index b1e4419d5bcce..99aa09a890a92 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/notifications/notifications.component.spec.ts @@ -3,9 +3,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ToastModule } from 'ng2-toastr'; import { PopoverModule } from 'ngx-bootstrap/popover'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { NotificationService } from '../../../shared/services/notification.service'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { NotificationsComponent } from './notifications.component'; describe('NotificationsComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.spec.ts index 5b1c8680a3e0a..a7cab79cef190 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/task-manager/task-manager.component.spec.ts @@ -3,10 +3,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { PopoverModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ExecutingTask } from '../../../shared/models/executing-task'; import { FinishedTask } from '../../../shared/models/finished-task'; import { SharedModule } from '../../../shared/shared.module'; -import { configureTestBed } from '../../../shared/unit-test-helper'; import { TaskManagerComponent } from './task-manager.component'; describe('TaskManagerComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.spec.ts index 67e87175da528..b75232c204c22 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/not-found/not-found.component.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../shared/unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { NotFoundComponent } from './not-found.component'; describe('NotFoundComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/auth.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/auth.service.spec.ts index f8d71b38f992c..bfe7fdb2929dd 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/auth.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/auth.service.spec.ts @@ -3,7 +3,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { AuthStorageService } from '../services/auth-storage.service'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { AuthService } from './auth.service'; describe('AuthService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs.service.spec.ts index 1c8c14fee4fb5..882f7c58dab74 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/cephfs.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { CephfsService } from './cephfs.service'; describe('CephfsService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.spec.ts index fa07822b508ed..56a842a741bfd 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/configuration.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { ConfigurationService } from './configuration.service'; describe('ConfigurationService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/dashboard.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/dashboard.service.spec.ts index 9062ba501b823..dcfde3073d5ec 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/dashboard.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/dashboard.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { DashboardService } from './dashboard.service'; describe('DashboardService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.spec.ts index 445386f8f7851..d283ef7c0fe4e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { HostService } from './host.service'; describe('HostService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logging.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logging.service.spec.ts index fa8f0e918b1c7..cc855f2aaee08 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logging.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/logging.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { LoggingService } from './logging.service'; describe('LoggingService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/monitor.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/monitor.service.spec.ts index e1813b983cdb1..0eca853ac6632 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/monitor.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/monitor.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { MonitorService } from './monitor.service'; describe('MonitorService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts index ad004c2e8bcff..5610875f69d54 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/osd.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { OsdService } from './osd.service'; describe('OsdService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/performance-counter.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/performance-counter.service.spec.ts index ec87677237b7e..5cb79a6dfcfba 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/performance-counter.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/performance-counter.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { PerformanceCounterService } from './performance-counter.service'; describe('PerformanceCounterService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.spec.ts index 693fd891f2129..89630df492060 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/pool.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { PoolService } from './pool.service'; describe('PoolService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd-mirroring.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd-mirroring.service.spec.ts index 827a185c9ba1b..13ce01f7d9eaf 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd-mirroring.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd-mirroring.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { RbdMirroringService } from './rbd-mirroring.service'; describe('RbdMirroringService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts index 09d11a5b66130..46127509eda9e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rbd.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { RbdService } from './rbd.service'; describe('RbdService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.spec.ts index a57b1be688dba..e6d2b55848c96 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { RgwBucketService } from './rgw-bucket.service'; describe('RgwBucketService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.spec.ts index 362e474fe58a6..b866333fde7f6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-daemon.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { RgwDaemonService } from './rgw-daemon.service'; describe('RgwDaemonService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.spec.ts index b9acad14d4802..8777e2aa6e076 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-user.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { RgwUserService } from './rgw-user.service'; describe('RgwUserService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/tcmu-iscsi.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/tcmu-iscsi.service.spec.ts index b917923d8af7e..f7978b413804e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/tcmu-iscsi.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/tcmu-iscsi.service.spec.ts @@ -1,7 +1,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { TcmuIscsiService } from './tcmu-iscsi.service'; describe('TcmuIscsiService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.spec.ts index 3e76508553a38..8bb94293eabde 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/deletion-modal/deletion-modal.component.spec.ts @@ -5,7 +5,7 @@ import { NgForm, ReactiveFormsModule } from '@angular/forms'; import { BsModalRef, BsModalService, ModalModule } from 'ngx-bootstrap'; import { Observable, Subscriber, timer as observableTimer } from 'rxjs'; -import { configureTestBed } from '../../unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { DeletionModalComponent } from './deletion-modal.component'; @NgModule({ diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/error-panel/error-panel.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/error-panel/error-panel.component.spec.ts index f4d46981d02dd..f09a197fcdf27 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/error-panel/error-panel.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/error-panel/error-panel.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AlertModule } from 'ngx-bootstrap'; -import { configureTestBed } from '../../unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ErrorPanelComponent } from './error-panel.component'; describe('ErrorPanelComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.spec.ts index 0cd2b6795cb11..6f4488ac3441d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/helper/helper.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { PopoverModule } from 'ngx-bootstrap'; -import { configureTestBed } from '../../unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { HelperComponent } from './helper.component'; describe('HelperComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/info-panel/info-panel.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/info-panel/info-panel.component.spec.ts index 532b76174191d..fe08bb93f1e8d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/info-panel/info-panel.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/info-panel/info-panel.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AlertModule } from 'ngx-bootstrap'; -import { configureTestBed } from '../../unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { InfoPanelComponent } from './info-panel.component'; describe('InfoPanelComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.spec.ts index 45df0963713f9..c92786a6a499b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/loading-panel/loading-panel.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AlertModule } from 'ngx-bootstrap'; -import { configureTestBed } from '../../unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { LoadingPanelComponent } from './loading-panel.component'; describe('LoadingPanelComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.spec.ts index ae0c1c72407e7..56f4a146ebdb1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/modal/modal.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ModalModule } from 'ngx-bootstrap/modal'; -import { configureTestBed } from '../../unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ModalComponent } from './modal.component'; describe('ModalComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts index 4629c50685585..7b3999d023364 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/sparkline/sparkline.component.spec.ts @@ -1,7 +1,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { configureTestBed } from '../../unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SparklineComponent } from './sparkline.component'; describe('SparklineComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.spec.ts index 6acfc63aa0f2c..795637a5ee17b 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/submit-button/submit-button.component.spec.ts @@ -1,7 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FormGroup } from '@angular/forms'; -import { configureTestBed } from '../../unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { SubmitButtonComponent } from './submit-button.component'; describe('SubmitButtonComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.spec.ts index c33b75132aa87..1faa71a755813 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/usage-bar/usage-bar.component.spec.ts @@ -2,9 +2,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TooltipModule } from 'ngx-bootstrap'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { PipesModule } from '../../pipes/pipes.module'; import { ServicesModule } from '../../services/services.module'; -import { configureTestBed } from '../../unit-test-helper'; import { UsageBarComponent } from './usage-bar.component'; describe('UsageBarComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.spec.ts index 5ecd0c9eed3bb..a2926d7cbafdb 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/view-cache/view-cache.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AlertModule } from 'ngx-bootstrap'; -import { configureTestBed } from '../../unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ErrorPanelComponent } from '../error-panel/error-panel.component'; import { InfoPanelComponent } from '../info-panel/info-panel.component'; import { WarningPanelComponent } from '../warning-panel/warning-panel.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/warning-panel/warning-panel.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/warning-panel/warning-panel.component.spec.ts index ddf918eb5183b..8df65fcfb4a6d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/warning-panel/warning-panel.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/warning-panel/warning-panel.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AlertModule } from 'ngx-bootstrap'; -import { configureTestBed } from '../../unit-test-helper'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { WarningPanelComponent } from './warning-panel.component'; describe('WarningPanelComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts index 179bf3279fa53..030445a161576 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table-key-value/table-key-value.component.spec.ts @@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgxDatatableModule } from '@swimlane/ngx-datatable'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ComponentsModule } from '../../components/components.module'; -import { configureTestBed } from '../../unit-test-helper'; import { TableComponent } from '../table/table.component'; import { TableKeyValueComponent } from './table-key-value.component'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts index ef57fac28067f..4dce6a0949e08 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts @@ -4,9 +4,9 @@ import { RouterTestingModule } from '@angular/router/testing'; import { NgxDatatableModule } from '@swimlane/ngx-datatable'; +import { configureTestBed } from '../../../../testing/unit-test-helper'; import { ComponentsModule } from '../../components/components.module'; import { CdTableFetchDataContext } from '../../models/cd-table-fetch-data-context'; -import { configureTestBed } from '../../unit-test-helper'; import { TableComponent } from './table.component'; describe('TableComponent', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-guard.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-guard.service.spec.ts index 22cb4495ff6c0..b876228df22b5 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-guard.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/auth-guard.service.spec.ts @@ -3,7 +3,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { Router, Routes } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { AuthGuardService } from './auth-guard.service'; import { AuthStorageService } from './auth-storage.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts index 7591af2a1b37d..f75e8389b256e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/formatter.service.spec.ts @@ -1,6 +1,6 @@ +import { configureTestBed } from '../../../testing/unit-test-helper'; import { DimlessBinaryPipe } from '../pipes/dimless-binary.pipe'; import { DimlessPipe } from '../pipes/dimless.pipe'; -import { configureTestBed } from '../unit-test-helper'; import { FormatterService } from './formatter.service'; describe('FormatterService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts index ddc8e32946a23..a1772305255b2 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/module-status-guard.service.spec.ts @@ -6,7 +6,7 @@ import { RouterTestingModule } from '@angular/router/testing'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { ModuleStatusGuardService } from './module-status-guard.service'; describe('ModuleStatusGuardService', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/notification.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/notification.service.spec.ts index 5eb346ac91e39..28471e6f0b429 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/notification.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/notification.service.spec.ts @@ -3,9 +3,9 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import * as _ from 'lodash'; import { ToastsManager } from 'ng2-toastr'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { NotificationType } from '../enum/notification-type.enum'; import { FinishedTask } from '../models/finished-task'; -import { configureTestBed } from '../unit-test-helper'; import { NotificationService } from './notification.service'; import { TaskManagerMessageService } from './task-manager-message.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts index 58ccbcd9df188..92d4ec9c4c199 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts @@ -3,7 +3,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { of as observableOf } from 'rxjs'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { AuthStorageService } from './auth-storage.service'; import { SummaryService } from './summary.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts index a7b321a468127..635dba15375f4 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-manager.service.spec.ts @@ -3,7 +3,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import * as _ from 'lodash'; import { Subject } from 'rxjs'; -import { configureTestBed } from '../unit-test-helper'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { SummaryService } from './summary.service'; import { TaskManagerService } from './task-manager.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-wrapper.service.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-wrapper.service.spec.ts index 78e511f62631b..98e37097bd10c 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-wrapper.service.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/task-wrapper.service.spec.ts @@ -4,10 +4,10 @@ import { inject, TestBed } from '@angular/core/testing'; import { ToastModule } from 'ng2-toastr'; import { Observable } from 'rxjs/Observable'; +import { configureTestBed } from '../../../testing/unit-test-helper'; import { ExecutingTask } from '../models/executing-task'; import { FinishedTask } from '../models/finished-task'; import { SharedModule } from '../shared.module'; -import { configureTestBed } from '../unit-test-helper'; import { NotificationService } from './notification.service'; import { TaskManagerService } from './task-manager.service'; import { TaskWrapperService } from './task-wrapper.service'; diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/unit-test-helper.ts b/src/pybind/mgr/dashboard/frontend/src/testing/unit-test-helper.ts similarity index 92% rename from src/pybind/mgr/dashboard/frontend/src/app/shared/unit-test-helper.ts rename to src/pybind/mgr/dashboard/frontend/src/testing/unit-test-helper.ts index 6348045684ce0..b732015e4f23f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/unit-test-helper.ts +++ b/src/pybind/mgr/dashboard/frontend/src/testing/unit-test-helper.ts @@ -1,6 +1,6 @@ import { async, TestBed } from '@angular/core/testing'; -import { _DEV_ } from '../../unit-test-configuration'; +import { _DEV_ } from '../unit-test-configuration'; export function configureTestBed(configuration, useOldMethod?) { if (_DEV_ && !useOldMethod) { diff --git a/src/pybind/mgr/dashboard/frontend/src/tsconfig.app.json b/src/pybind/mgr/dashboard/frontend/src/tsconfig.app.json index 24c953c44c5dd..89c61e3f07d02 100644 --- a/src/pybind/mgr/dashboard/frontend/src/tsconfig.app.json +++ b/src/pybind/mgr/dashboard/frontend/src/tsconfig.app.json @@ -7,9 +7,8 @@ "types": [] }, "exclude": [ - "app/shared/unit-test-helper.ts", + "**/*.spec.ts", "test.ts", - "testing/*.ts", - "**/*.spec.ts" + "testing/*.ts" ] } -- 2.39.5