GUI2 Changed loading screen display to be a component
Change-Id: Id1592b498e6827ec4cd3544dec92e46f00e8d378
diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.spec.ts b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.spec.ts
index ccad204..dcabe08 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.spec.ts
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.spec.ts
@@ -15,24 +15,16 @@
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ActivatedRoute, Params } from '@angular/router';
-import { DebugElement } from '@angular/core';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FormsModule } from '@angular/forms';
-import { By } from '@angular/platform-browser';
import { AlarmTableComponent } from './alarmtable.component';
import { AlarmDetailsComponent } from '../alarmdetails/alarmdetails.component';
import {
FnService,
IconService,
- GlyphService,
IconComponent,
- LoadingService,
LogService,
- NavService,
- MastService,
- TableFilterPipe,
- ThemeService,
- WebSocketService
+ TableFilterPipe, LoadingComponent,
} from 'gui2-fw-lib';
import { of } from 'rxjs';
@@ -50,12 +42,6 @@
loadIconDef() { }
}
-class MockLoadingService {
- startAnim() { }
- stop() { }
- waiting() { }
-}
-
describe('AlarmTableComponent', () => {
let fs: FnService;
let ar: MockActivatedRoute;
@@ -85,12 +71,11 @@
imports: [BrowserAnimationsModule, FormsModule, RouterTestingModule],
declarations: [
AlarmTableComponent, AlarmDetailsComponent,
- IconComponent, TableFilterPipe
+ IconComponent, TableFilterPipe, LoadingComponent
],
providers: [
{ provide: FnService, useValue: fs },
{ provide: LogService, useValue: logSpy },
- { provide: LoadingService, useClass: MockLoadingService },
{ provide: IconService, useClass: MockIconService },
{ provide: 'Window', useValue: windowMock },
]