test: clean up async behaviour

src/app/modules/hebis/daia-availability/daia-availability.component.spec.ts

@@ -14,7 +14,7 @@
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
-import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {ActivatedRoute, RouterModule} from '@angular/router';
 import {IonRefresher} from '@ionic/angular';
 import {
@@ -72,43 +72,41 @@ describe('DaiaAvailabilityComponent', () => {
     'search',
   ]);
 
-  beforeEach(
-    waitForAsync(() => {
-      configProviderMock = jasmine.createSpyObj('ConfigProvider', [
-        'init',
-        'getValue',
-        'getAnyValue',
-      ]);
-      TestBed.configureTestingModule({
-        imports: [
-          RouterModule.forRoot([], {relativeLinkResolution: 'legacy'}),
-          HebisRoutingModule,
-          HebisModule,
-          TranslateModule.forRoot({
-            loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
-          }),
-          LoggerModule,
-        ],
-        providers: [
-          {
-            provide: ActivatedRoute,
-            useValue: fakeActivatedRoute,
-          },
-          {
-            provide: StorageProvider,
-            useValue: storageProviderSpy,
-          },
-          {
-            provide: ConfigProvider,
-            useValue: configProviderMock,
-          },
-          NGXLogger,
-          LoggerConfig,
-        ],
-        schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      }).compileComponents();
-    }),
-  );
+  beforeEach(() => {
+    configProviderMock = jasmine.createSpyObj('ConfigProvider', [
+      'init',
+      'getValue',
+      'getAnyValue',
+    ]);
+    TestBed.configureTestingModule({
+      imports: [
+        RouterModule.forRoot([], {relativeLinkResolution: 'legacy'}),
+        HebisRoutingModule,
+        HebisModule,
+        TranslateModule.forRoot({
+          loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
+        }),
+        LoggerModule,
+      ],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: fakeActivatedRoute,
+        },
+        {
+          provide: StorageProvider,
+          useValue: storageProviderSpy,
+        },
+        {
+          provide: ConfigProvider,
+          useValue: configProviderMock,
+        },
+        NGXLogger,
+        LoggerConfig,
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    }).compileComponents();
+  });
 
   beforeEach(async () => {
     dataProvider = TestBed.get(DaiaDataProvider);

src/app/modules/hebis/hebis-detail/hebis-detail.component.spec.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
 /*
  * Copyright (C) 2018, 2019 StApps
  * This program is free software: you can redistribute it and/or modify it
@@ -13,8 +12,9 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
+/* eslint-disable @typescript-eslint/no-non-null-assertion,@typescript-eslint/no-explicit-any */
 import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
-import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
+import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {ActivatedRoute, RouterModule} from '@angular/router';
 import {IonRefresher} from '@ionic/angular';
 import {
@@ -69,33 +69,31 @@ describe('HebisDetailComponent', () => {
     'search',
   ]);
 
-  beforeEach(
-    waitForAsync(() => {
-      TestBed.configureTestingModule({
-        imports: [
-          RouterModule.forRoot([], {relativeLinkResolution: 'legacy'}),
-          HebisRoutingModule,
-          HebisModule,
-          TranslateModule.forRoot({
-            loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
-          }),
-        ],
-        providers: [
-          {
-            provide: ActivatedRoute,
-            useValue: fakeActivatedRoute,
-          },
-          {
-            provide: StorageProvider,
-            useValue: storageProviderSpy,
-          },
-        ],
-        schemas: [CUSTOM_ELEMENTS_SCHEMA],
-      }).compileComponents();
-    }),
-  );
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        RouterModule.forRoot([], {relativeLinkResolution: 'legacy'}),
+        HebisRoutingModule,
+        HebisModule,
+        TranslateModule.forRoot({
+          loader: {provide: TranslateLoader, useClass: TranslateFakeLoader},
+        }),
+      ],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: fakeActivatedRoute,
+        },
+        {
+          provide: StorageProvider,
+          useValue: storageProviderSpy,
+        },
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    }).compileComponents();
+  });
 
-  beforeEach(async () => {
+  beforeEach(() => {
     dataProvider = TestBed.get(HebisDataProvider);
     translateService = TestBed.get(TranslateService);
     refresher = jasmine.createSpyObj('refresher', ['complete']);
@@ -103,7 +101,7 @@ describe('HebisDetailComponent', () => {
       Promise.resolve(sampleThing),
     );
     spyOn(HebisDetailComponent.prototype, 'getItem').and.callThrough();
-    fixture = await TestBed.createComponent(HebisDetailComponent);
+    fixture = TestBed.createComponent(HebisDetailComponent);
     comp = fixture.componentInstance;
     translateService.use('foo');
     fixture.detectChanges();