I have removed deprecated async() in @angular/core/testing Angular API and Modified some unit test case

src/app/app.component.spec.ts

@@ -1,5 +1,5 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ElectronService, NgxElectronModule } from 'ngx-electron';
@@ -16,8 +16,8 @@ describe('AppComponent', () => {
   let electronService: ElectronService;
   let settingsService: SettingsService;
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       declarations: [AppComponent],
       imports: [RouterTestingModule, MatIconModule, NgxElectronModule],
       providers: [SettingsService, ProgressService],
@@ -26,7 +26,7 @@ describe('AppComponent', () => {
 
     electronService = TestBed.inject(ElectronService);
     settingsService = TestBed.inject(SettingsService);
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AppComponent);
@@ -34,29 +34,29 @@ describe('AppComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create the app', async(() => {
+  it('should create the app', async() => {
     const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
+    await expect(app).toBeTruthy();
-  }));
+  });
 
-  it('should have footer', async(() => {
+  it('should have footer', async() => {
     const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('router-outlet').textContent).toEqual('');
+    await expect(compiled.querySelector('router-outlet').textContent).toEqual('');
-  }));
+  });
 
-  it('should receive changed settings and forward to electron', async(() => {
+  it('should receive changed settings and forward to electron', async() => {
-    spyOnProperty(electronService, 'isElectronApp').and.returnValue(true);
+    await spyOnProperty(electronService, 'isElectronApp').and.returnValue(true);
     settingsService.setReportsSettings(true);
     component.ngOnInit();
     settingsService.setReportsSettings(false);
-  }));
+  });
 
-  it('should receive changed settings and do not forward to electron', async(() => {
+  it('should receive changed settings and do not forward to electron', async() => {
     const spy = createSpyObj('Electron.IpcRenderer', ['send']);
     spyOnProperty(electronService, 'isElectronApp').and.returnValue(false);
     settingsService.setReportsSettings(true);
     component.ngOnInit();
     settingsService.setReportsSettings(false);
-    expect(spy.send).not.toHaveBeenCalled();
+    await expect(spy.send).not.toHaveBeenCalled();
-  }));
+  });
 });

src/app/cartography/components/drawing-resizing/drawing-resizing.component.spec.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { DrawingsEventSource } from '../../events/drawings-event-source';
 import { ResizingEnd } from '../../events/resizing';
@@ -30,8 +30,8 @@ describe('DrawingResizingComponent', () => {
   let drawingsWidgetMock = new DrawingWidgetMock();
   let drawingsEventSource = new DrawingsEventSource();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [NoopAnimationsModule],
       providers: [
         { provide: DrawingsWidget, useValue: drawingsWidgetMock },
@@ -39,7 +39,7 @@ describe('DrawingResizingComponent', () => {
       ],
       declarations: [DrawingResizingComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DrawingResizingComponent);

src/app/cartography/components/experimental-map/selection/selection.component.spec.ts

@@ -5,17 +5,18 @@ describe('SelectionComponent', () => {
   let component: SelectionComponent;
   let fixture: ComponentFixture<SelectionComponent>;
 
-  beforeEach(async() => {
+  beforeEach(() => {
-    await TestBed.configureTestingModule({
+    TestBed.configureTestingModule({
       declarations: [SelectionComponent],
     }).compileComponents();
-  });
-
-  beforeEach(() => {
     fixture = TestBed.createComponent(SelectionComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
+  afterEach(() => {
+    fixture.destroy()
+  })
+
 
   it('should create', () => {
     expect(component).toBeTruthy();

src/app/cartography/components/experimental-map/selection/selection.component.ts

@@ -1,5 +1,5 @@
 import { AfterViewInit, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Observable, Subscription, fromEvent} from 'rxjs';
+import { Observable, Subscription} from 'rxjs';
 import { Rectangle } from '../../../models/rectangle';
 
 @Component({
@@ -29,7 +29,7 @@ export class SelectionComponent implements OnInit, AfterViewInit {
   ngAfterViewInit() {
     const down = Observable.fromEvent(this.svg, 'mousedown').do((e: MouseEvent) => e.preventDefault());
     down.subscribe((e: MouseEvent) => {
-      if (e?.target !== this.svg) {
+      if (e.target !== this.svg) {
         return;
       }
 
@@ -80,7 +80,6 @@ export class SelectionComponent implements OnInit, AfterViewInit {
             this.height = e.clientY - this.startY + window.scrollY;
 
             this.ref.detectChanges();
-
             this.selectedEvent([this.startX, this.startY], [this.width, this.height]);
           })
         )

src/app/cartography/components/experimental-map/status/status.component.spec.ts

@@ -1,15 +1,15 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { StatusComponent } from './status.component';
 
 describe('StatusComponent', () => {
   let component: StatusComponent;
   let fixture: ComponentFixture<StatusComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       declarations: [StatusComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(StatusComponent);

src/app/cartography/components/text-editor/text-editor.component.spec.ts

@@ -1,5 +1,5 @@
 import { Renderer2 } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { MockedLinkService } from '../../../components/project-map/project-map.component.spec';
 import { LinkService } from '../../../services/link.service';
@@ -18,7 +18,7 @@ describe('TextEditorComponent', () => {
   let fixture: ComponentFixture<TextEditorComponent>;
   let mockedLinkService: MockedLinkService = new MockedLinkService();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
     TestBed.configureTestingModule({
       imports: [NoopAnimationsModule],
       providers: [
@@ -35,7 +35,7 @@ describe('TextEditorComponent', () => {
       ],
       declarations: [TextEditorComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(TextEditorComponent);

src/app/cartography/directives/moving-canvas.directive.spec.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { MovingEventSource } from '../events/moving-event-source';
 import { Context } from '../models/context';
@@ -19,8 +19,8 @@ describe('MovingCanvasDirective', () => {
   let fixture: ComponentFixture<DummyComponent>;
   let movingEventSource = new MovingEventSource();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [NoopAnimationsModule],
       providers: [
         { provide: MovingEventSource, useValue: movingEventSource },
@@ -28,7 +28,7 @@ describe('MovingCanvasDirective', () => {
       ],
       declarations: [DummyComponent, MovingCanvasDirective],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DummyComponent);

src/app/cartography/directives/zooming-canvas.directive.spec.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { MapScaleService } from '../../services/mapScale.service';
 import { MovingEventSource } from '../events/moving-event-source';
@@ -20,8 +20,8 @@ describe('ZoomingCanvasDirective', () => {
   let fixture: ComponentFixture<DummyComponent>;
   let movingEventSource = new MovingEventSource();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [NoopAnimationsModule],
       providers: [
         { provide: MovingEventSource, useValue: movingEventSource },
@@ -30,7 +30,7 @@ describe('ZoomingCanvasDirective', () => {
       ],
       declarations: [DummyComponent, ZoomingCanvasDirective],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DummyComponent);

src/app/common/error-handlers/toaster-error-handler.spec.ts

@@ -18,8 +18,8 @@ describe('ToasterErrorHandler', () => {
   let toasterService: MockedToasterService;
   let settingsService: SettingsService;
 
-  beforeEach(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       providers: [
         { provide: ToasterService, useClass: MockedToasterService },
         { provide: SettingsService},

src/app/common/progress/progress.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { Router } from '@angular/router';
@@ -23,8 +23,8 @@ describe('ProgressComponent', () => {
   let progressService: ProgressService;
   let router: MockedRouter = new MockedRouter();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [RouterTestingModule, MatProgressSpinnerModule, MatIconModule],
       providers: [ProgressService, { provide: Router, useValue: router }],
       declarations: [ProgressComponent],
@@ -32,7 +32,7 @@ describe('ProgressComponent', () => {
 
     progressService = TestBed.get(ProgressService);
     router = TestBed.get(Router);
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ProgressComponent);

src/app/components/adbutler/adbutler.component.spec.ts

@@ -1,15 +1,15 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AdbutlerComponent } from './adbutler.component';
 
 xdescribe('AdbutlerComponent', () => {
   let component: AdbutlerComponent;
   let fixture: ComponentFixture<AdbutlerComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       declarations: [AdbutlerComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AdbutlerComponent);

src/app/components/bundled-server-finder/bundled-server-finder.component.spec.ts

@@ -1,6 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { ProgressService } from '../../common/progress/progress.service';
 import { Server } from '../../models/server';
 import { ServerService } from '../../services/server.service';
@@ -12,24 +14,30 @@ describe('BundledServerFinderComponent', () => {
   let component: BundledServerFinderComponent;
   let fixture: ComponentFixture<BundledServerFinderComponent>;
   let router: any;
-  let serverService: any;
+  let service: ServerService;
   let progressService: MockedProgressService = new MockedProgressService();
+  let serverServiceMock: jasmine.SpyObj<ServerService>;
 
-  beforeEach(async(() => {
+
+  beforeEach(async () => {
     router = {
       navigate: jasmine.createSpy('navigate'),
     };
 
-    const server = new Server();
+    
-    server.id = 99;
 
-    serverService = new MockedServerService();
+    serverServiceMock = jasmine.createSpyObj<ServerService>([
-    spyOn(serverService, 'getLocalServer').and.returnValue(Promise.resolve(server));
+      "getLocalServer"
+    ]);
 
-    TestBed.configureTestingModule({
+
+    // serverService = new MockedServerService();
+    // spyOn(serverService, 'getLocalServer').and.returnValue(Promise.resolve(server));
+
+    await TestBed.configureTestingModule({
       providers: [
         { provide: Router, useValue: router },
-        { provide: ServerService, useValue: serverService },
+        { provide: ServerService, useValue: serverServiceMock },
         { provide: ProgressService, useValue: progressService },
       ],
       declarations: [BundledServerFinderComponent],
@@ -39,12 +47,21 @@ describe('BundledServerFinderComponent', () => {
     fixture = TestBed.createComponent(BundledServerFinderComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
-  }));
+  });
 
   it('should create and redirect to server', fakeAsync(() => {
+    const server = new Server();
+    server.id = 99;
+    serverServiceMock.getLocalServer.and.returnValue(
+      Promise.resolve(server)
+    );
     expect(component).toBeTruthy();
-    expect(serverService.getLocalServer).toHaveBeenCalled();
+    tick(101)
-    tick();
+    fixture.detectChanges()
-    expect(router.navigate).toHaveBeenCalledWith(['/server', 99, 'projects']);
+    fixture.whenStable().then(() => {
+      expect(serverServiceMock.getLocalServer).toHaveBeenCalledWith('vps3.gns3.net',3000);
+      expect(router.navigate).toHaveBeenCalledWith(['/server', 99, 'projects']);
+    })
+    service = TestBed.inject(ServerService);
   }));
 });

src/app/components/bundled-server-finder/bundled-server-finder.component.ts

@@ -32,8 +32,8 @@ export class BundledServerFinderComponent implements OnInit {
       }
 
       this.serverService.getLocalServer(this.document.location.hostname, port).then((server: Server) => {
-        this.progressService.deactivate();
         this.router.navigate(['/server', server.id, 'projects']);
+        this.progressService.deactivate();
       });
     }, 100);
   }

src/app/components/drawings-listeners/drawing-added/drawing-added.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Observable } from 'rxjs';
 import { MapDrawingToSvgConverter } from '../../../cartography/converters/map/map-drawing-to-svg-converter';
 import { DrawingsDataSource } from '../../../cartography/datasources/drawings-datasource';
@@ -27,8 +27,8 @@ describe('DrawingAddedComponent', () => {
     new LineElementFactory()
   );
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       providers: [
         { provide: DrawingService, useValue: mockedDrawingService },
         { provide: DrawingsDataSource, useValue: mockedDrawingsDataSource },
@@ -38,7 +38,7 @@ describe('DrawingAddedComponent', () => {
       ],
       declarations: [DrawingAddedComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DrawingAddedComponent);

src/app/components/drawings-listeners/drawing-dragged/drawing-dragged.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Observable } from 'rxjs';
 import { DrawingsDataSource } from '../../../cartography/datasources/drawings-datasource';
 import { DrawingsEventSource } from '../../../cartography/events/drawings-event-source';
@@ -16,8 +16,8 @@ describe('DrawingDraggedComponent', () => {
   let mockedDrawingsDataSource = new MockedDrawingsDataSource();
   let mockedDrawingsEventSource = new DrawingsEventSource();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       providers: [
         { provide: DrawingService, useValue: mockedDrawingService },
         { provide: DrawingsDataSource, useValue: mockedDrawingsDataSource },
@@ -25,7 +25,7 @@ describe('DrawingDraggedComponent', () => {
       ],
       declarations: [DrawingDraggedComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DrawingDraggedComponent);

src/app/components/drawings-listeners/drawing-resized/drawing-resized.component.spec.ts

@@ -18,8 +18,8 @@ describe('DrawingResizedComponent', () => {
   let mockedDrawingsEventSource = new DrawingsEventSource();
   let mockedMapDrawingToSvgConverter = new MapDrawingToSvgConverter();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       providers: [
         { provide: DrawingService, useValue: mockedDrawingService },
         { provide: DrawingsDataSource, useValue: mockedDrawingsDataSource },
@@ -28,7 +28,7 @@ describe('DrawingResizedComponent', () => {
       ],
       declarations: [DrawingResizedComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DrawingResizedComponent);

src/app/components/drawings-listeners/interface-label-dragged/interface-label-dragged.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Observable } from 'rxjs';
 import { LinksDataSource } from '../../../cartography/datasources/links-datasource';
 import { DraggedDataEvent } from '../../../cartography/events/event-source';
@@ -18,8 +18,8 @@ describe('InterfaceLabelDraggedComponent', () => {
   let mockedLinksEventSource = new LinksEventSource();
   let mockedLinksDataSource = new LinksDataSource();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       providers: [
         { provide: LinkService, useValue: mockedLinkService },
         { provide: LinksDataSource, useValue: mockedLinksDataSource },
@@ -27,7 +27,7 @@ describe('InterfaceLabelDraggedComponent', () => {
       ],
       declarations: [InterfaceLabelDraggedComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(InterfaceLabelDraggedComponent);

src/app/components/drawings-listeners/link-created/link-created.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Observable } from 'rxjs';
 import { MapLabelToLabelConverter } from '../../../cartography/converters/map/map-label-to-label-converter';
 import { MapNodeToNodeConverter } from '../../../cartography/converters/map/map-node-to-node-converter';
@@ -30,8 +30,8 @@ describe('LinkCreatedComponent', () => {
   let mockedLinksEventSource = new LinksEventSource();
   let project = new Project();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       providers: [
         { provide: ProjectService, useClass: MockedProjectService },
         { provide: LinkService, useValue: mockedLinkService },
@@ -42,7 +42,7 @@ describe('LinkCreatedComponent', () => {
       ],
       declarations: [LinkCreatedComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LinkCreatedComponent);

src/app/components/drawings-listeners/node-dragged/node-dragged.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Observable } from 'rxjs';
 import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource';
 import { DraggedDataEvent } from '../../../cartography/events/event-source';
@@ -16,8 +16,8 @@ describe('NodeDraggedComponent', () => {
   let mockedNodeService = new MockedNodeService();
   let mockedNodesEventSource = new NodesEventSource();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       providers: [
         { provide: NodesDataSource, useValue: mockedNodesDataSource },
         { provide: NodeService, useValue: mockedNodeService },
@@ -25,7 +25,7 @@ describe('NodeDraggedComponent', () => {
       ],
       declarations: [NodeDraggedComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NodeDraggedComponent);

src/app/components/drawings-listeners/node-label-dragged/node-label-dragged.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Observable } from 'rxjs';
 import { MapLabelToLabelConverter } from '../../../cartography/converters/map/map-label-to-label-converter';
 import { NodesDataSource } from '../../../cartography/datasources/nodes-datasource';
@@ -24,8 +24,8 @@ describe('NodeLabelDraggedComponent', () => {
     new FontFixer()
   );
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       providers: [
         { provide: NodesDataSource, useValue: mockedNodesDataSource },
         { provide: NodeService, useValue: mockedNodeService },
@@ -34,7 +34,7 @@ describe('NodeLabelDraggedComponent', () => {
       ],
       declarations: [NodeLabelDraggedComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NodeLabelDraggedComponent);

src/app/components/drawings-listeners/text-added/text-added.component.spec.ts

@@ -28,8 +28,8 @@ describe('TextAddedComponent', () => {
     new LineElementFactory()
   );
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       providers: [
         { provide: DrawingService, useValue: mockedDrawingService },
         { provide: DrawingsDataSource, useValue: mockedDrawingsDataSource },
@@ -40,7 +40,7 @@ describe('TextAddedComponent', () => {
       ],
       declarations: [TextAddedComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(TextAddedComponent);

src/app/components/drawings-listeners/text-edited/text-edited.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Observable } from 'rxjs';
 import { MapDrawingToSvgConverter } from '../../../cartography/converters/map/map-drawing-to-svg-converter';
 import { DrawingsDataSource } from '../../../cartography/datasources/drawings-datasource';
@@ -16,8 +16,8 @@ describe('TextEditedComponent', () => {
   let mockedDrawingsDataSource = new MockedDrawingsDataSource();
   let mockedDrawingsEventSource = new DrawingsEventSource();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       providers: [
         { provide: DrawingService, useValue: mockedDrawingService },
         { provide: DrawingsDataSource, useValue: mockedDrawingsDataSource },
@@ -26,7 +26,7 @@ describe('TextEditedComponent', () => {
       ],
       declarations: [TextEditedComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(TextEditedComponent);

src/app/components/preferences/built-in/built-in-preferences.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -16,8 +16,8 @@ describe('BuiltInPreferencesComponent', () => {
   let fixture: ComponentFixture<BuiltInPreferencesComponent>;
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -36,7 +36,7 @@ describe('BuiltInPreferencesComponent', () => {
       declarations: [BuiltInPreferencesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(BuiltInPreferencesComponent);

src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -39,8 +39,8 @@ describe('CloudNodesAddTemplateComponent', () => {
   let mockedComputeService = new MockedComputeService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -65,7 +65,7 @@ describe('CloudNodesAddTemplateComponent', () => {
       declarations: [CloudNodesAddTemplateComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CloudNodesAddTemplateComponent);

src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component.spec.ts

@@ -41,8 +41,8 @@ describe('CloudNodesTemplateDetailsComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+  await  TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -68,7 +68,7 @@ describe('CloudNodesTemplateDetailsComponent', () => {
       declarations: [CloudNodesTemplateDetailsComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CloudNodesTemplateDetailsComponent);

src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -31,8 +31,8 @@ describe('CloudNodesTemplatesComponent', () => {
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+  await  TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -53,7 +53,7 @@ describe('CloudNodesTemplatesComponent', () => {
       declarations: [CloudNodesTemplatesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CloudNodesTemplatesComponent);

src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -39,8 +39,8 @@ describe('EthernetHubsAddTemplateComponent', () => {
   let mockedComputeService = new MockedComputeService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -68,7 +68,7 @@ describe('EthernetHubsAddTemplateComponent', () => {
       declarations: [EthernetHubsAddTemplateComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(EthernetHubsAddTemplateComponent);

src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -41,8 +41,8 @@ describe('EthernetHubsTemplateDetailsComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -68,7 +68,7 @@ describe('EthernetHubsTemplateDetailsComponent', () => {
       declarations: [EthernetHubsTemplateDetailsComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(EthernetHubsTemplateDetailsComponent);

src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.spec.ts

@@ -31,8 +31,8 @@ describe('EthernetHubsTemplatesComponent', () => {
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -53,15 +53,15 @@ describe('EthernetHubsTemplatesComponent', () => {
       declarations: [EthernetHubsTemplatesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EthernetHubsTemplatesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
-  it('should create', () => {
+beforeEach(() => {
-    expect(component).toBeTruthy();
+  fixture = TestBed.createComponent(EthernetHubsTemplatesComponent);
-  });
+  component = fixture.componentInstance;
+  fixture.detectChanges();
+});
+
+it('should create', () => {
+  expect(component).toBeTruthy();
+});
 });

src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -42,8 +42,8 @@ describe('EthernetSwitchesTemplateDetailsComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -69,7 +69,7 @@ describe('EthernetSwitchesTemplateDetailsComponent', () => {
       declarations: [EthernetSwitchesTemplateDetailsComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(EthernetSwitchesTemplateDetailsComponent);

src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -31,8 +31,8 @@ describe('EthernetSwitchesTemplatesComponent', () => {
   let mockedBuiltInTemplatesService = new MockedBuiltInTemplatesService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -53,15 +53,15 @@ describe('EthernetSwitchesTemplatesComponent', () => {
       declarations: [EthernetSwitchesTemplatesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EthernetSwitchesTemplatesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
-  it('should create', () => {
+beforeEach(() => {
-    expect(component).toBeTruthy();
+  fixture = TestBed.createComponent(EthernetSwitchesTemplatesComponent);
-  });
+  component = fixture.componentInstance;
+  fixture.detectChanges();
+});
+
+it('should create', () => {
+  expect(component).toBeTruthy();
+});
 });

src/app/components/preferences/common/custom-adapters/custom-adapters.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -14,8 +14,8 @@ describe('Custom adapters component', () => {
   let component: CustomAdaptersComponent;
   let fixture: ComponentFixture<CustomAdaptersComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+  await  TestBed.configureTestingModule({
       imports: [
         MatTableModule,
         MatIconModule,
@@ -28,7 +28,7 @@ describe('Custom adapters component', () => {
       declarations: [CustomAdaptersComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CustomAdaptersComponent);

src/app/components/preferences/common/symbols/symbols.component.spec.ts

@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -28,7 +28,7 @@ describe('Symbols component', () => {
   let fixture: ComponentFixture<SymbolsComponent>;
   let mockedSymbolsService = new MockedSymbolService();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
     TestBed.configureTestingModule({
       imports: [
         HttpClientModule,
@@ -49,7 +49,7 @@ describe('Symbols component', () => {
       declarations: [SymbolsComponent, SearchFilter],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(SymbolsComponent);

src/app/components/preferences/docker/add-docker-template/add-docker-template.component.spec.ts

@@ -46,8 +46,8 @@ xdescribe('AddDockerTemplateComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatStepperModule,
         MatAutocompleteModule,
@@ -81,7 +81,7 @@ xdescribe('AddDockerTemplateComponent', () => {
       ],
       declarations: [AddDockerTemplateComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AddDockerTemplateComponent);
@@ -92,27 +92,27 @@ xdescribe('AddDockerTemplateComponent', () => {
     fixture.destroy();
   });
 
-  it('should open first step at start', async(() => {
+  it('should open first step at start', async () => {
     fixture.detectChanges();
-    fixture.whenStable().then(() => {
+   await fixture.whenStable().then(() => {
       let stepperComponent = fixture.debugElement.query(By.css('mat-vertical-stepper')).componentInstance;
 
       expect(stepperComponent.selectedIndex).toBe(0);
     });
-  }));
+  });
 
-  it('should display correct label at start', async(() => {
+  it('should display correct label at start', async() => {
     fixture.detectChanges();
-    fixture.whenStable().then(() => {
+   await fixture.whenStable().then(() => {
       let selectedLabel = fixture.nativeElement.querySelector('[aria-selected="true"]');
 
       expect(selectedLabel.textContent).toMatch('Server type');
     });
-  }));
+  });
 
-  it('should not call add template when required fields are empty', async(() => {
+  it('should not call add template when required fields are empty', async() => {
     fixture.detectChanges();
-    fixture.whenStable().then(() => {
+    await fixture.whenStable().then(() => {
       let addButton = fixture.debugElement.nativeElement.querySelector('.add-button');
       spyOn(mockedDockerService, 'addTemplate').and.returnValue(of({} as DockerTemplate));
 
@@ -124,11 +124,11 @@ xdescribe('AddDockerTemplateComponent', () => {
 
       expect(mockedDockerService.addTemplate).not.toHaveBeenCalled();
     });
-  }));
+  });
 
-  it('should call add template when required fields are filled', async(() => {
+  it('should call add template when required fields are filled', async () => {
     fixture.detectChanges();
-    fixture.whenStable().then(() => {
+   await  fixture.whenStable().then(() => {
       let stepperComponent = fixture.debugElement.query(By.css('mat-vertical-stepper')).componentInstance;
       stepperComponent.selectedIndex = 1;
       component.newImageSelected = true;
@@ -197,5 +197,5 @@ xdescribe('AddDockerTemplateComponent', () => {
         });
       });
     });
-  }));
+  });
 });

src/app/components/preferences/docker/docker-template-details/docker-template-details.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -40,8 +40,8 @@ describe('DockerTemplateDetailsComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -66,7 +66,7 @@ describe('DockerTemplateDetailsComponent', () => {
       declarations: [DockerTemplateDetailsComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DockerTemplateDetailsComponent);

src/app/components/preferences/docker/docker-templates/docker-templates.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -31,8 +31,8 @@ describe('DockerTemplatesComponent', () => {
   let mockedDockerService = new MockedDockerService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -50,7 +50,7 @@ describe('DockerTemplatesComponent', () => {
       declarations: [DockerTemplatesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DockerTemplatesComponent);

src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -44,8 +44,8 @@ xdescribe('AddIosTemplateComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatStepperModule,
         FormsModule,
@@ -76,7 +76,7 @@ xdescribe('AddIosTemplateComponent', () => {
       declarations: [AddIosTemplateComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AddIosTemplateComponent);

src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -40,8 +40,8 @@ describe('IosTemplateDetailsComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+  await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -66,7 +66,7 @@ describe('IosTemplateDetailsComponent', () => {
       declarations: [IosTemplateDetailsComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(IosTemplateDetailsComponent);

src/app/components/preferences/dynamips/ios-templates/ios-templates.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -31,8 +31,8 @@ describe('IosTemplatesComponent', () => {
   let mockedIosService = new MockedIosService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -53,7 +53,7 @@ describe('IosTemplatesComponent', () => {
       declarations: [IosTemplatesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(IosTemplatesComponent);

src/app/components/preferences/general/general-preferences.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -16,8 +16,8 @@ describe('GeneralPreferencesComponent', () => {
   let fixture: ComponentFixture<GeneralPreferencesComponent>;
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -36,7 +36,7 @@ describe('GeneralPreferencesComponent', () => {
       declarations: [GeneralPreferencesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(GeneralPreferencesComponent);

src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -44,8 +44,8 @@ xdescribe('AddIouTemplateComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatStepperModule,
         FormsModule,
@@ -76,7 +76,7 @@ xdescribe('AddIouTemplateComponent', () => {
       declarations: [AddIouTemplateComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AddIouTemplateComponent);

src/app/components/preferences/ios-on-unix/iou-template-details/iou-template-details.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -40,8 +40,8 @@ describe('IouTemplateDetailsComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -63,7 +63,7 @@ describe('IouTemplateDetailsComponent', () => {
       declarations: [IouTemplateDetailsComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(IouTemplateDetailsComponent);

src/app/components/preferences/ios-on-unix/iou-templates/iou-templates.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -31,8 +31,8 @@ describe('IouTemplatesComponent', () => {
   let mockedIouService = new MockedIouService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -50,7 +50,7 @@ describe('IouTemplatesComponent', () => {
       declarations: [IouTemplatesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(IouTemplatesComponent);

src/app/components/preferences/preferences.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -36,8 +36,8 @@ describe('PreferencesComponent', () => {
   let fixture: ComponentFixture<PreferencesComponent>;
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -56,7 +56,7 @@ describe('PreferencesComponent', () => {
       declarations: [PreferencesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(PreferencesComponent);

src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -54,8 +54,8 @@ xdescribe('AddQemuVmTemplateComponent', () => {
     navigate: jasmine.createSpy('navigate'),
   };
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatStepperModule,
         FormsModule,
@@ -86,7 +86,7 @@ xdescribe('AddQemuVmTemplateComponent', () => {
       declarations: [AddQemuVmTemplateComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AddQemuVmTemplateComponent);

src/app/components/preferences/qemu/qemu-preferences/qemu-preferences.component.spec.ts

@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -28,7 +28,7 @@ describe('QemuPreferencesComponent', () => {
   let mockedServerSettingsService = new MockedServerSettingsService();
   let mockedToasterService = new MockedToasterService();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
     TestBed.configureTestingModule({
       imports: [
         HttpClientModule,
@@ -52,7 +52,7 @@ describe('QemuPreferencesComponent', () => {
       declarations: [QemuPreferencesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(QemuPreferencesComponent);

src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import {  ComponentFixture, TestBed } from '@angular/core/testing';
 import { AbstractControlDirective, FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -49,8 +49,8 @@ describe('QemuVmTemplateDetailsComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -74,7 +74,7 @@ describe('QemuVmTemplateDetailsComponent', () => {
       declarations: [QemuVmTemplateDetailsComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(QemuVmTemplateDetailsComponent);

src/app/components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component.spec.ts

@@ -31,8 +31,8 @@ describe('QemuTemplatesComponent', () => {
   let mockedQemuService = new MockedQemuService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -53,7 +53,7 @@ describe('QemuTemplatesComponent', () => {
       declarations: [QemuVmTemplatesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(QemuVmTemplatesComponent);

src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts

@@ -40,8 +40,8 @@ describe('AddVirtualBoxTemplateComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -65,7 +65,7 @@ describe('AddVirtualBoxTemplateComponent', () => {
       declarations: [AddVirtualBoxTemplateComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AddVirtualBoxTemplateComponent);

src/app/components/preferences/virtual-box/virtual-box-preferences/virtual-box-prefernces.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -20,8 +20,8 @@ describe('VirtualBoxPreferencesComponent', () => {
   let mockedServerService = new MockedServerService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -41,7 +41,7 @@ describe('VirtualBoxPreferencesComponent', () => {
       declarations: [VirtualBoxPreferencesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(VirtualBoxPreferencesComponent);

src/app/components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -41,8 +41,8 @@ describe('VirtualBoxTemplateDetailsComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -68,7 +68,7 @@ describe('VirtualBoxTemplateDetailsComponent', () => {
       declarations: [VirtualBoxTemplateDetailsComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(VirtualBoxTemplateDetailsComponent);

src/app/components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -31,8 +31,8 @@ describe('VirtualBoxTemplatesComponent', () => {
   let mockedVirtualBoxService = new MockedVirtualBoxService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+  await  TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -53,7 +53,7 @@ describe('VirtualBoxTemplatesComponent', () => {
       declarations: [VirtualBoxTemplatesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(VirtualBoxTemplatesComponent);

src/app/components/preferences/vmware/add-vmware-template/add-vmware.component.template.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -41,8 +41,8 @@ describe('AddVmwareTemplateComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -66,7 +66,7 @@ describe('AddVmwareTemplateComponent', () => {
       declarations: [AddVmwareTemplateComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AddVmwareTemplateComponent);

src/app/components/preferences/vmware/vmware-template-details/vmware-template-details.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
@@ -41,8 +41,8 @@ describe('VmwareTemplateDetailsComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -68,7 +68,7 @@ describe('VmwareTemplateDetailsComponent', () => {
       declarations: [VmwareTemplateDetailsComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(VmwareTemplateDetailsComponent);

src/app/components/preferences/vmware/vmware-templates/vmware-templates.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -31,8 +31,8 @@ describe('VmwareTemplatesComponent', () => {
   let mockedVmwareService = new MockedVmwareService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -53,15 +53,15 @@ describe('VmwareTemplatesComponent', () => {
       declarations: [VmwareTemplatesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(VmwareTemplatesComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
-  it('should create', () => {
+beforeEach(() => {
-    expect(component).toBeTruthy();
+  fixture = TestBed.createComponent(VmwareTemplatesComponent);
-  });
+  component = fixture.componentInstance;
+  fixture.detectChanges();
+});
+
+it('should create', () => {
+  expect(component).toBeTruthy();
+});
 });

src/app/components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component.spec.ts

@@ -20,8 +20,8 @@ describe('VpcsPreferencesComponent', () => {
   let mockedServerService = new MockedServerService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -41,7 +41,7 @@ describe('VpcsPreferencesComponent', () => {
       declarations: [VpcsPreferencesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(VpcsPreferencesComponent);

src/app/components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component.spec.ts

@@ -40,8 +40,8 @@ describe('VpcsTemplateDetailsComponent', () => {
   let mockedToasterService = new MockedToasterService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
@@ -66,7 +66,7 @@ describe('VpcsTemplateDetailsComponent', () => {
       declarations: [VpcsTemplateDetailsComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(VpcsTemplateDetailsComponent);

src/app/components/preferences/vpcs/vpcs-templates/vpcs-templates.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -31,8 +31,8 @@ describe('VpcsTemplatesComponent', () => {
   let mockedVpcsService = new MockedVpcsService();
   let activatedRoute = new MockedActivatedRoute().get();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatToolbarModule,
@@ -53,7 +53,7 @@ describe('VpcsTemplatesComponent', () => {
       declarations: [VpcsTemplatesComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(VpcsTemplatesComponent);

src/app/components/project-map/console-wrapper/console-wrapper.component.spec.ts

@@ -16,8 +16,8 @@ describe('ConsoleWrapperComponent', () => {
   let mapSettingsService: MapSettingsService;
   let toasterService: ToasterService;
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [RouterTestingModule, MatSnackBarModule],
       providers: [NodeConsoleService, ThemeService, MapSettingsService, ToasterService]
     }).compileComponents();
@@ -26,7 +26,7 @@ describe('ConsoleWrapperComponent', () => {
     nodeConsoleService = TestBed.inject(NodeConsoleService);
     themeService = TestBed.inject(ThemeService);
     mapSettingsService = TestBed.inject(MapSettingsService);
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ConsoleWrapperComponent);

src/app/components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component.spec.ts

@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -28,8 +28,8 @@ describe('BringToFrontActionComponent', () => {
   let nodeService = new MockedNodeService();
   let nodesDataSource = new MockedNodesDataSource();
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [MatIconModule, MatToolbarModule, MatMenuModule, MatCheckboxModule, CommonModule, NoopAnimationsModule],
       providers: [
         { provide: DrawingService, useValue: drawingService },
@@ -39,35 +39,35 @@ describe('BringToFrontActionComponent', () => {
       ],
       declarations: [BringToFrontActionComponent],
     }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(BringToFrontActionComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
-  it('should create', () => {
+beforeEach(() => {
-    expect(component).toBeTruthy();
+  fixture = TestBed.createComponent(BringToFrontActionComponent);
-  });
+  component = fixture.componentInstance;
-
+  fixture.detectChanges();
-  it('should call node service when bring to front action called', () => {
+});
-    spyOn(nodeService, 'update').and.returnValue(of());
+
-    component.nodes = [{ z: 0 } as Node];
+it('should create', () => {
-    component.drawings = [];
+  expect(component).toBeTruthy();
-
+});
-    component.bringToFront();
+
-
+it('should call node service when bring to front action called', () => {
-    expect(nodeService.update).toHaveBeenCalled();
+  spyOn(nodeService, 'update').and.returnValue(of());
-  });
+  component.nodes = [{ z: 0 } as Node];
-
+  component.drawings = [];
-  it('should call drawing service when bring to front action called', () => {
+
-    spyOn(drawingService, 'update').and.returnValue(of());
+  component.bringToFront();
-    component.nodes = [];
+
-    component.drawings = [{ z: 0 } as Drawing];
+  expect(nodeService.update).toHaveBeenCalled();
-
+});
-    component.bringToFront();
+
-
+it('should call drawing service when bring to front action called', () => {
-    expect(drawingService.update).toHaveBeenCalled();
+  spyOn(drawingService, 'update').and.returnValue(of());
-  });
+  component.nodes = [];
+  component.drawings = [{ z: 0 } as Drawing];
+
+  component.bringToFront();
+
+  expect(drawingService.update).toHaveBeenCalled();
+});
 });

src/app/components/project-map/context-menu/actions/console-device-action/console-device-action.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { ElectronService } from 'ngx-electron';
 import { Node } from '../../../../../cartography/models/node';
@@ -40,8 +40,8 @@ describe('ConsoleDeviceActionComponent', () => {
     server = { host: 'localhost', port: 222 } as Server;
   });
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       providers: [
         { provide: ElectronService, useValue: electronService },
         { provide: ServerService, useValue: mockedServerService },
@@ -54,7 +54,7 @@ describe('ConsoleDeviceActionComponent', () => {
     }).compileComponents();
 
     settingsService = TestBed.inject(SettingsService);
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ConsoleDeviceActionComponent);

src/app/components/project-map/context-menu/actions/delete-action/delete-action.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatBottomSheetModule } from '@angular/material/bottom-sheet';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
@@ -23,8 +23,8 @@ describe('DeleteActionComponent', () => {
   let mockedDrawingService: MockedDrawingService = new MockedDrawingService();
   let mockedLinkService: MockedLinkService = new MockedLinkService();
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [MatIconModule, MatMenuModule, NoopAnimationsModule, MatBottomSheetModule],
       providers: [
         { provide: NodesDataSource, useClass: NodesDataSource },
@@ -36,7 +36,7 @@ describe('DeleteActionComponent', () => {
       ],
       declarations: [DeleteActionComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DeleteActionComponent);

src/app/components/project-map/context-menu/actions/duplicate-action/duplicate-action.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -21,8 +21,8 @@ describe('DuplicateActionComponent', () => {
   let mockedDrawingService: MockedDrawingService = new MockedDrawingService();
   let mockedToasterService = new MockedToasterService();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [MatIconModule, MatMenuModule, NoopAnimationsModule],
       providers: [
         { provide: NodesDataSource, useClass: NodesDataSource },
@@ -33,7 +33,7 @@ describe('DuplicateActionComponent', () => {
       ],
       declarations: [DuplicateActionComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DuplicateActionComponent);

src/app/components/project-map/context-menu/context-menu.component.spec.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatMenuModule, MatMenuTrigger } from '@angular/material/menu';
 import { BrowserModule } from '@angular/platform-browser';
 import { ElectronService } from 'ngx-electron';
@@ -15,12 +15,12 @@ describe('ContextMenuComponent', () => {
   let component: ContextMenuComponent;
   let fixture: ComponentFixture<ContextMenuComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
     const electronMock = {
       isElectronApp: true,
     };
 
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [MatMenuModule, BrowserModule],
       providers: [
         { provide: ChangeDetectorRef },
@@ -30,7 +30,7 @@ describe('ContextMenuComponent', () => {
       declarations: [ContextMenuComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ContextMenuComponent);

src/app/components/project-map/log-console/log-console.component.spec.ts

@@ -41,8 +41,8 @@ describe('LogConsoleComponent', () => {
 
   let httpServer = new HttpServer({} as HttpClient, {} as ServerErrorHandler);
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [HttpClientTestingModule, RouterTestingModule, MatMenuModule, BrowserModule, MatSnackBarModule],
       providers: [
         { provide: ProjectWebServiceHandler, useValue: mockedProjectWebServiceHandler },
@@ -61,7 +61,7 @@ describe('LogConsoleComponent', () => {
     toasterService = TestBed.inject(ToasterService);
     mapSettingsService = TestBed.inject(MapSettingsService);
     nodeConsoleService = TestBed.inject(NodeConsoleService);
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(LogConsoleComponent);

src/app/components/project-map/node-editors/config-editor/config-editor.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -26,8 +26,8 @@ describe('ConfigEditorDialogComponent', () => {
   };
   let mockedNodeService: MockedNodeService = new MockedNodeService();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatDialogModule,
         MatFormFieldModule,
@@ -51,7 +51,7 @@ describe('ConfigEditorDialogComponent', () => {
 
     node = new Node();
     node.name = 'sample name';
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ConfigEditorDialogComponent);

src/app/components/project-map/node-select-interface/node-select-interface.component.spec.ts

@@ -1,15 +1,15 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NodeSelectInterfaceComponent } from './node-select-interface.component';
 
 describe('NodeSelectInterfaceComponent', () => {
   let component: NodeSelectInterfaceComponent;
   let fixture: ComponentFixture<NodeSelectInterfaceComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       declarations: [NodeSelectInterfaceComponent],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NodeSelectInterfaceComponent);

src/app/components/project-map/nodes-menu/nodes-menu.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -22,8 +22,8 @@ xdescribe('NodesMenuComponent', () => {
   let mockedNodeService: MockedNodeService = new MockedNodeService();
   let mockedNodesDataSource: MockedNodesDataSource = new MockedNodesDataSource();
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [MatButtonModule, MatIconModule, CommonModule, NoopAnimationsModule],
       providers: [
         { provide: NodeService, useValue: mockedNodeService },
@@ -36,7 +36,7 @@ xdescribe('NodesMenuComponent', () => {
       declarations: [NodesMenuComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(NodesMenuComponent);

src/app/components/project-map/packet-capturing/packet-filters/packet-filters.component.spec.ts

@@ -23,8 +23,8 @@ describe('PacketFiltersDialogComponent', () => {
     close: jasmine.createSpy('close'),
   };
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatDialogModule,
         FormsModule,
@@ -44,7 +44,7 @@ describe('PacketFiltersDialogComponent', () => {
       declarations: [PacketFiltersDialogComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(PacketFiltersDialogComponent);

src/app/components/project-map/packet-capturing/start-capture/start-capture.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
@@ -29,8 +29,8 @@ describe('StartCaptureDialogComponent', () => {
     close: jasmine.createSpy('close'),
   };
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatDialogModule,
         FormsModule,
@@ -53,7 +53,7 @@ describe('StartCaptureDialogComponent', () => {
       declarations: [StartCaptureDialogComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(StartCaptureDialogComponent);

src/app/components/project-map/project-map-menu/project-map-menu.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
@@ -25,8 +25,8 @@ describe('ProjectMapMenuComponent', () => {
   let mapSettingService = new MapSettingsService();
   let mockedSymbolService = new MockedSymbolService();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatIconModule,
         MatDialogModule,
@@ -46,7 +46,7 @@ describe('ProjectMapMenuComponent', () => {
       declarations: [ProjectMapMenuComponent, D3MapComponent, ...ANGULAR_MAP_DECLARATIONS],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ProjectMapMenuComponent);

src/app/components/projects/add-blank-project-dialog/add-blank-project-dialog.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -64,8 +64,8 @@ describe('AddBlankProjectDialogComponent', () => {
     close: jasmine.createSpy('close'),
   };
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatDialogModule,
         MatFormFieldModule,
@@ -88,7 +88,7 @@ describe('AddBlankProjectDialogComponent', () => {
     server = new Server();
     server.host = 'localhost';
     server.port = 80;
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(AddBlankProjectDialogComponent);

src/app/components/projects/import-project-dialog/import-project-dialog.component.spec.ts

@@ -1,5 +1,5 @@
 import { DebugElement } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -66,8 +66,8 @@ describe('ImportProjectDialogComponent', () => {
     close: jasmine.createSpy('close'),
   };
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatTableModule,
         MatTooltipModule,
@@ -93,7 +93,7 @@ describe('ImportProjectDialogComponent', () => {
     server = new Server();
     server.host = 'localhost';
     server.port = 80;
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ImportProjectDialogComponent);

src/app/components/projects/projects.component.spec.ts

@@ -1,5 +1,5 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatBottomSheetModule } from '@angular/material/bottom-sheet';
 import { MatDialogModule } from '@angular/material/dialog';
@@ -38,19 +38,19 @@ xdescribe('ProjectsComponent', () => {
   let mockedProjectService: MockedProjectService = new MockedProjectService();
   let electronService;
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
     electronService = {
       isElectronApp: true,
       remote: {
         require: (file) => {
           return {
-            openConsole() {},
+            openConsole() { },
           };
         },
       },
     };
 
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatTableModule,
         MatTooltipModule,
@@ -68,7 +68,7 @@ xdescribe('ProjectsComponent', () => {
       providers: [
         { provide: ServerService, useClass: MockedServerService },
         { provide: ProjectService, useValue: mockedProjectService },
-        { provide: SettingsService},
+        { provide: SettingsService },
         { provide: ToasterService },
         { provide: ElectronService, useValue: electronService },
         ProgressService,
@@ -97,75 +97,75 @@ xdescribe('ProjectsComponent', () => {
 
     spyOn(progressService, 'activate');
     spyOn(progressService, 'deactivate');
-  }));
+  });
+
+beforeEach(() => {
+  fixture = TestBed.createComponent(ProjectsComponent);
+  component = fixture.componentInstance;
+  fixture.detectChanges();
+});
+
+it('should create', () => {
+  expect(component).toBeTruthy();
+});
+
+it('should remove item after delete action', () => {
+  spyOn(mockedProjectService, 'delete').and.returnValue(of());
+  let project = new Project();
+  project.project_id = '1';
+
+  component.delete(project);
+
+  expect(mockedProjectService.delete).toHaveBeenCalled();
+});
+
+it('should call list on refresh', () => {
+  mockedProjectService.list = jasmine.createSpy().and.returnValue(of([]));
+
+  component.refresh();
+
+  expect(mockedProjectService.list).toHaveBeenCalled();
+});
+
+describe('ProjectComponent open', () => {
+  let project: Project;
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(ProjectsComponent);
+    project = new Project();
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('should remove item after delete action', () => {
-    spyOn(mockedProjectService, 'delete').and.returnValue(of());
-    let project = new Project();
     project.project_id = '1';
 
-    component.delete(project);
+    spyOn(projectService, 'open').and.returnValue(of(project));
 
-    expect(mockedProjectService.delete).toHaveBeenCalled();
+    component.server = server;
   });
 
-  it('should call list on refresh', () => {
+  it('should open project', () => {
-    mockedProjectService.list = jasmine.createSpy().and.returnValue(of([]));
+    component.open(project);
+    expect(projectService.open).toHaveBeenCalledWith(server, project.project_id);
 
-    component.refresh();
+    expect(progressService.activate).toHaveBeenCalled();
-
+    expect(progressService.deactivate).toHaveBeenCalled();
-    expect(mockedProjectService.list).toHaveBeenCalled();
-  });
-
-  describe('ProjectComponent open', () => {
-    let project: Project;
-
-    beforeEach(() => {
-      project = new Project();
-      project.project_id = '1';
-
-      spyOn(projectService, 'open').and.returnValue(of(project));
-
-      component.server = server;
-    });
-
-    it('should open project', () => {
-      component.open(project);
-      expect(projectService.open).toHaveBeenCalledWith(server, project.project_id);
-
-      expect(progressService.activate).toHaveBeenCalled();
-      expect(progressService.deactivate).toHaveBeenCalled();
-    });
-  });
-
-  describe('ProjectComponent close', () => {
-    let project: Project;
-
-    beforeEach(() => {
-      project = new Project();
-      project.project_id = '1';
-
-      spyOn(projectService, 'close').and.returnValue(of(project));
-
-      component.server = server;
-    });
-
-    xit('should close project', () => {
-      component.close(project);
-      expect(projectService.close).toHaveBeenCalledWith(server, project.project_id);
-
-      expect(progressService.activate).toHaveBeenCalled();
-      expect(progressService.deactivate).toHaveBeenCalled();
-    });
   });
 });
+
+describe('ProjectComponent close', () => {
+  let project: Project;
+
+  beforeEach(() => {
+    project = new Project();
+    project.project_id = '1';
+
+    spyOn(projectService, 'close').and.returnValue(of(project));
+
+    component.server = server;
+  });
+
+  xit('should close project', () => {
+    component.close(project);
+    expect(projectService.close).toHaveBeenCalledWith(server, project.project_id);
+
+    expect(progressService.activate).toHaveBeenCalled();
+    expect(progressService.deactivate).toHaveBeenCalled();
+  });
+});
+});

src/app/components/servers/server-discovery/server-discovery.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { MatCardModule } from '@angular/material/card';
 import { MatDividerModule } from '@angular/material/divider';
 import { Observable } from 'rxjs/Rx';
@@ -17,10 +17,10 @@ xdescribe('ServerDiscoveryComponent', () => {
   let mockedVersionService: MockedVersionService;
   let mockedServerService: MockedServerService;
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
     mockedServerService = new MockedServerService();
     mockedVersionService = new MockedVersionService();
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [MatCardModule, MatDividerModule],
       providers: [
         { provide: VersionService, useFactory: () => mockedVersionService },
@@ -29,143 +29,143 @@ xdescribe('ServerDiscoveryComponent', () => {
       ],
       declarations: [ServerDiscoveryComponent],
     }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ServerDiscoveryComponent);
-
-    component = fixture.componentInstance;
-
-    // we don't really want to run it during testing
-    spyOn(component, 'ngOnInit').and.returnValue(null);
-
-    fixture.detectChanges();
   });
 
-  it('should create', () => {
+beforeEach(() => {
-    expect(component).toBeTruthy();
+  fixture = TestBed.createComponent(ServerDiscoveryComponent);
+
+  component = fixture.componentInstance;
+
+  // we don't really want to run it during testing
+  spyOn(component, 'ngOnInit').and.returnValue(null);
+
+  fixture.detectChanges();
+});
+
+it('should create', () => {
+  expect(component).toBeTruthy();
+});
+
+describe('isAvailable', () => {
+  it('should return server object when server is available', () => {
+    const version = new Version();
+    version.version = '2.1.8';
+
+    const getVersionSpy = spyOn(mockedVersionService, 'get').and.returnValue(Observable.of(version));
+
+    component.isServerAvailable('127.0.0.1', 3080).subscribe((s) => {
+      expect(s.host).toEqual('127.0.0.1');
+      expect(s.port).toEqual(3080);
+    });
+
+    const server = new Server();
+    server.host = '127.0.0.1';
+    server.port = 3080;
+
+    expect(getVersionSpy).toHaveBeenCalledWith(server);
   });
 
-  describe('isAvailable', () => {
+  it('should throw error once server is not available', () => {
-    it('should return server object when server is available', () => {
+    const server = new Server();
-      const version = new Version();
+    server.host = '127.0.0.1';
-      version.version = '2.1.8';
+    server.port = 3080;
 
-      const getVersionSpy = spyOn(mockedVersionService, 'get').and.returnValue(Observable.of(version));
+    const getVersionSpy = spyOn(mockedVersionService, 'get').and.returnValue(
+      Observable.throwError(new Error('server is unavailable'))
+    );
+    let hasExecuted = false;
 
-      component.isServerAvailable('127.0.0.1', 3080).subscribe((s) => {
+    component.isServerAvailable('127.0.0.1', 3080).subscribe(
-        expect(s.host).toEqual('127.0.0.1');
+      (ver) => { },
-        expect(s.port).toEqual(3080);
+      (err) => {
-      });
+        hasExecuted = true;
+        expect(err.toString()).toEqual('Error: server is unavailable');
+      }
+    );
 
+    expect(getVersionSpy).toHaveBeenCalledWith(server);
+    expect(hasExecuted).toBeTruthy();
+  });
+});
+
+describe('discovery', () => {
+  it('should discovery all servers available', (done) => {
+    const version = new Version();
+    version.version = '2.1.8';
+
+    spyOn(component, 'isServerAvailable').and.callFake((ip, port) => {
       const server = new Server();
-      server.host = '127.0.0.1';
+      server.host = ip;
-      server.port = 3080;
+      server.port = port;
-
+      return Observable.of(server);
-      expect(getVersionSpy).toHaveBeenCalledWith(server);
     });
 
-    it('should throw error once server is not available', () => {
+    component.discovery().subscribe((discovered) => {
-      const server = new Server();
+      expect(discovered[0].host).toEqual('127.0.0.1');
-      server.host = '127.0.0.1';
+      expect(discovered[0].port).toEqual(3080);
-      server.port = 3080;
 
-      const getVersionSpy = spyOn(mockedVersionService, 'get').and.returnValue(
+      expect(discovered.length).toEqual(1);
-        Observable.throwError(new Error('server is unavailable'))
-      );
-      let hasExecuted = false;
 
-      component.isServerAvailable('127.0.0.1', 3080).subscribe(
+      done();
-        (ver) => {},
-        (err) => {
-          hasExecuted = true;
-          expect(err.toString()).toEqual('Error: server is unavailable');
-        }
-      );
-
-      expect(getVersionSpy).toHaveBeenCalledWith(server);
-      expect(hasExecuted).toBeTruthy();
-    });
-  });
-
-  describe('discovery', () => {
-    it('should discovery all servers available', (done) => {
-      const version = new Version();
-      version.version = '2.1.8';
-
-      spyOn(component, 'isServerAvailable').and.callFake((ip, port) => {
-        const server = new Server();
-        server.host = ip;
-        server.port = port;
-        return Observable.of(server);
-      });
-
-      component.discovery().subscribe((discovered) => {
-        expect(discovered[0].host).toEqual('127.0.0.1');
-        expect(discovered[0].port).toEqual(3080);
-
-        expect(discovered.length).toEqual(1);
-
-        done();
-      });
-    });
-  });
-
-  describe('discoverFirstAvailableServer', () => {
-    let server: Server;
-
-    beforeEach(function () {
-      server = new Server();
-      (server.host = '199.111.111.1'), (server.port = 3333);
-
-      spyOn(component, 'discovery').and.callFake(() => {
-        return Observable.of([server]);
-      });
-    });
-
-    it('should get first server from discovered and with no added before', fakeAsync(() => {
-      expect(component.discoveredServer).toBeUndefined();
-      component.discoverFirstAvailableServer();
-      tick();
-      expect(component.discoveredServer.host).toEqual('199.111.111.1');
-      expect(component.discoveredServer.port).toEqual(3333);
-    }));
-
-    it('should get first server from discovered and with already added', fakeAsync(() => {
-      mockedServerService.servers.push(server);
-
-      expect(component.discoveredServer).toBeUndefined();
-      component.discoverFirstAvailableServer();
-      tick();
-      expect(component.discoveredServer).toBeUndefined();
-    }));
-  });
-
-  describe('accepting and ignoring found server', () => {
-    let server: Server;
-    beforeEach(() => {
-      server = new Server();
-      (server.host = '199.111.111.1'), (server.port = 3333);
-      component.discoveredServer = server;
-    });
-
-    describe('accept', () => {
-      it('should add new server', fakeAsync(() => {
-        component.accept(server);
-        tick();
-        expect(component.discoveredServer).toBeNull();
-        expect(mockedServerService.servers[0].host).toEqual('199.111.111.1');
-        expect(mockedServerService.servers[0].name).toEqual('199.111.111.1');
-        expect(mockedServerService.servers[0].location).toEqual('remote');
-      }));
-    });
-
-    describe('ignore', () => {
-      it('should reject server', fakeAsync(() => {
-        component.ignore(server);
-        tick();
-        expect(component.discoveredServer).toBeNull();
-      }));
     });
   });
 });
+
+describe('discoverFirstAvailableServer', () => {
+  let server: Server;
+
+  beforeEach(function () {
+    server = new Server();
+    (server.host = '199.111.111.1'), (server.port = 3333);
+
+    spyOn(component, 'discovery').and.callFake(() => {
+      return Observable.of([server]);
+    });
+  });
+
+  it('should get first server from discovered and with no added before', fakeAsync(() => {
+    expect(component.discoveredServer).toBeUndefined();
+    component.discoverFirstAvailableServer();
+    tick();
+    expect(component.discoveredServer.host).toEqual('199.111.111.1');
+    expect(component.discoveredServer.port).toEqual(3333);
+  }));
+
+  it('should get first server from discovered and with already added', fakeAsync(() => {
+    mockedServerService.servers.push(server);
+
+    expect(component.discoveredServer).toBeUndefined();
+    component.discoverFirstAvailableServer();
+    tick();
+    expect(component.discoveredServer).toBeUndefined();
+  }));
+});
+
+describe('accepting and ignoring found server', () => {
+  let server: Server;
+  beforeEach(() => {
+    server = new Server();
+    (server.host = '199.111.111.1'), (server.port = 3333);
+    component.discoveredServer = server;
+  });
+
+  describe('accept', () => {
+    it('should add new server', fakeAsync(() => {
+      component.accept(server);
+      tick();
+      expect(component.discoveredServer).toBeNull();
+      expect(mockedServerService.servers[0].host).toEqual('199.111.111.1');
+      expect(mockedServerService.servers[0].name).toEqual('199.111.111.1');
+      expect(mockedServerService.servers[0].location).toEqual('remote');
+    }));
+  });
+
+  describe('ignore', () => {
+    it('should reject server', fakeAsync(() => {
+      component.ignore(server);
+      tick();
+      expect(component.discoveredServer).toBeNull();
+    }));
+  });
+});
+});

src/app/components/settings/console/console.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MatCardModule } from '@angular/material/card';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -17,7 +17,7 @@ describe('ConsoleComponent', () => {
   let router;
   let toaster: MockedToasterService;
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
     consoleService = {
       command: 'command',
     };
@@ -28,7 +28,7 @@ describe('ConsoleComponent', () => {
 
     toaster = new MockedToasterService();
 
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       providers: [
         { provide: ConsoleService, useValue: consoleService },
         { provide: ToasterService, useValue: toaster },
@@ -44,33 +44,33 @@ describe('ConsoleComponent', () => {
       ],
       declarations: [ConsoleComponent],
     }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ConsoleComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
-  it('should create', () => {
+beforeEach(() => {
-    expect(component).toBeTruthy();
+  fixture = TestBed.createComponent(ConsoleComponent);
-  });
+  component = fixture.componentInstance;
-
+  fixture.detectChanges();
-  it('should set default command', () => {
+});
-    component.ngOnInit();
+
-    expect(component.consoleForm.value.command).toEqual('command');
+it('should create', () => {
-  });
+  expect(component).toBeTruthy();
-
+});
-  it('should go back', () => {
+
-    component.goBack();
+it('should set default command', () => {
-    expect(router.navigate).toHaveBeenCalledWith(['/settings']);
+  component.ngOnInit();
-  });
+  expect(component.consoleForm.value.command).toEqual('command');
-
+});
-  it('should update console command', () => {
+
-    component.consoleForm.get('command').setValue('newCommand');
+it('should go back', () => {
-    spyOn(component, 'goBack');
+  component.goBack();
-    component.save();
+  expect(router.navigate).toHaveBeenCalledWith(['/settings']);
-    expect(toaster.success.length).toEqual(1);
+});
-    expect(component.goBack).toHaveBeenCalled();
+
-  });
+it('should update console command', () => {
+  component.consoleForm.get('command').setValue('newCommand');
+  spyOn(component, 'goBack');
+  component.save();
+  expect(toaster.success.length).toEqual(1);
+  expect(component.goBack).toHaveBeenCalled();
+});
 });

src/app/components/settings/settings.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatExpansionModule } from '@angular/material/expansion';
@@ -21,19 +21,19 @@ describe('SettingsComponent', () => {
   let settingsService: SettingsService;
   let mapSettingsService = {
     integrateLinkLabelsToLinks: true,
-    toggleIntegrateInterfaceLabels(val: boolean) {},
+    toggleIntegrateInterfaceLabels(val: boolean) { },
-    toggleOpenReadme(val: boolean) {},
+    toggleOpenReadme(val: boolean) { },
-    toggleOpenConsolesInWidget(val: boolean) {}
+    toggleOpenConsolesInWidget(val: boolean) { }
   };
   let consoleService;
   let updatesService = autoSpy(UpdatesService);
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
     consoleService = {
       command: 'command',
     };
 
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [
         MatExpansionModule,
         MatCheckboxModule,
@@ -54,41 +54,41 @@ describe('SettingsComponent', () => {
     }).compileComponents();
 
     settingsService = TestBed.get(SettingsService);
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SettingsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
   });
 
-  it('should create', () => {
+beforeEach(() => {
-    expect(component).toBeTruthy();
+  fixture = TestBed.createComponent(SettingsComponent);
-  });
+  component = fixture.componentInstance;
-
+  fixture.detectChanges();
-  it('should get and save new settings', () => {
+});
-    const settings = {
+
-      crash_reports: true,
+it('should create', () => {
-      experimental_features: true,
+  expect(component).toBeTruthy();
-      anonymous_statistics: true,
+});
-      angular_map: false,
+
-      console_command: '',
+it('should get and save new settings', () => {
-    };
+  const settings = {
-    const getAll = spyOn(settingsService, 'getAll').and.returnValue(settings);
+    crash_reports: true,
-    const setAll = spyOn(settingsService, 'setAll');
+    experimental_features: true,
-    spyOn(mapSettingsService, 'toggleIntegrateInterfaceLabels');
+    anonymous_statistics: true,
-    spyOn(mapSettingsService, 'toggleOpenConsolesInWidget');
+    angular_map: false,
-    
+    console_command: '',
-    component.ngOnInit();
+  };
-    
+  const getAll = spyOn(settingsService, 'getAll').and.returnValue(settings);
-    expect(getAll).toHaveBeenCalled();
+  const setAll = spyOn(settingsService, 'setAll');
-    expect(component.settings).toEqual(settings);
+  spyOn(mapSettingsService, 'toggleIntegrateInterfaceLabels');
-    
+  spyOn(mapSettingsService, 'toggleOpenConsolesInWidget');
-    component.settings.crash_reports = false;
+
-    component.save();
+  component.ngOnInit();
-    
+
-    expect(setAll).toHaveBeenCalledWith(settings);
+  expect(getAll).toHaveBeenCalled();
-    expect(mapSettingsService.toggleIntegrateInterfaceLabels).toHaveBeenCalled();
+  expect(component.settings).toEqual(settings);
-    expect(mapSettingsService.toggleOpenConsolesInWidget).toHaveBeenCalled();
+
-  });
+  component.settings.crash_reports = false;
+  component.save();
+
+  expect(setAll).toHaveBeenCalledWith(settings);
+  expect(mapSettingsService.toggleIntegrateInterfaceLabels).toHaveBeenCalled();
+  expect(mapSettingsService.toggleOpenConsolesInWidget).toHaveBeenCalled();
+});
 });

src/app/components/snapshots/list-of-snapshots/list-of-snaphshots.component.spec.ts

@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
@@ -67,8 +67,8 @@ describe('ListOfSnapshotsComponent', () => {
   let mockedSnapshotService = new MockedSnapshotService();
   let mockedToasterService = new MockedToasterService();
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatDialogModule,
         MatTableModule,
@@ -95,7 +95,7 @@ describe('ListOfSnapshotsComponent', () => {
       declarations: [ListOfSnapshotsComponent, DateFilter, NameFilter],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ListOfSnapshotsComponent);

src/app/components/template/template.component.spec.ts

@@ -41,7 +41,9 @@ describe('TemplateComponent', () => {
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
-
+ afterEach(()=>{
+   fixture.destroy()
+ })
   it('should create', () => {
     expect(component).toBeTruthy();
   });

src/app/components/topology-summary/topology-summary.component.spec.ts

@@ -33,8 +33,8 @@ describe('TopologySummaryComponent', () => {
   let mockedComputeService: MockedComputeService = new MockedComputeService();
   let mockedLinksDataSource: MockedLinksDataSource = new MockedLinksDataSource();
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
-    TestBed.configureTestingModule({
+   await TestBed.configureTestingModule({
       imports: [
         MatTableModule,
         MatTooltipModule,
@@ -53,7 +53,7 @@ describe('TopologySummaryComponent', () => {
       declarations: [TopologySummaryComponent],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(TopologySummaryComponent);

src/app/components/user-management/user-management.component.spec.ts

@@ -1,5 +1,5 @@
 /* tslint:disable:no-unused-variable */
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 
@@ -9,12 +9,12 @@ describe('UserManagementComponent', () => {
   let component: UserManagementComponent;
   let fixture: ComponentFixture<UserManagementComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(async () => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
-      declarations: [ UserManagementComponent ]
+      declarations: [UserManagementComponent]
     })
-    .compileComponents();
+      .compileComponents();
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(UserManagementComponent);

src/app/layouts/default-layout/default-layout.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
@@ -35,11 +35,11 @@ describe('DefaultLayoutComponent', () => {
   let httpServer: HttpServer;
   let errorHandler: ServerErrorHandler;
 
-  beforeEach(async(() => {
+  beforeEach(async() => {
     electronServiceMock = new ElectronServiceMock();
     serverManagementService.serverStatusChanged = new Subject<ServerStateEvent>();
 
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       declarations: [DefaultLayoutComponent, ProgressComponent],
       imports: [MatIconModule, MatMenuModule, MatToolbarModule, HttpClientModule, RouterTestingModule, MatProgressSpinnerModule],
       providers: [
@@ -69,7 +69,7 @@ describe('DefaultLayoutComponent', () => {
     errorHandler = TestBed.inject(ServerErrorHandler);
     httpServer = TestBed.inject(HttpServer);
     serverService = TestBed.inject(ServerService);
-  }));
+  });
 
   beforeEach(() => {
     fixture = TestBed.createComponent(DefaultLayoutComponent);