[ACS-5620] stabilise unit tests by switching to standard Angular api (#8759)

* switch to standard TestBed api for unit testing

* test fixes

* test fixes

* test fixes

* test fixes

* test fixes

* test fixes

* test fixes

* test fixes

* test fixes

lib/core/src/lib/about/about-github-link/about-github-link.component.spec.ts

@@ -17,7 +17,6 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CoreTestingModule } from '../../testing/core.testing.module';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { AboutGithubLinkComponent } from './about-github-link.component';
 import { aboutGithubDetails } from '../about.mock';
 import { TranslateModule } from '@ngx-translate/core';
@@ -26,14 +25,13 @@ describe('AboutGithubLinkComponent', () => {
     let fixture: ComponentFixture<AboutGithubLinkComponent>;
     let component: AboutGithubLinkComponent;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(AboutGithubLinkComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();

lib/core/src/lib/about/about-server-settings/about-server-settings.component.spec.ts

@@ -17,7 +17,6 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CoreTestingModule } from '../../testing/core.testing.module';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { AboutServerSettingsComponent } from './about-server-settings.component';
 import { AppConfigService } from '../../app-config/app-config.service';
 import { aboutGithubDetails } from '../about.mock';
@@ -28,14 +27,13 @@ describe('AboutServerSettingsComponent', () => {
     let component: AboutServerSettingsComponent;
     let appConfigService: AppConfigService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(AboutServerSettingsComponent);
         component = fixture.componentInstance;
         appConfigService = TestBed.inject(AppConfigService);

lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts

@@ -20,7 +20,6 @@ import { AppConfigService } from '../../app-config/app-config.service';
 import { AuthGuardBpm } from './auth-guard-bpm.service';
 import { AuthenticationService } from '../services/authentication.service';
 import { RouterStateSnapshot, Router } from '@angular/router';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { MatDialog } from '@angular/material/dialog';
 import { TranslateModule } from '@ngx-translate/core';
@@ -32,14 +31,13 @@ describe('AuthGuardService BPM', () => {
     let router: Router;
     let appConfigService: AppConfigService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         localStorage.clear();
         authService = TestBed.inject(AuthenticationService);
         authGuard = TestBed.inject(AuthGuardBpm);

lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts

@@ -20,7 +20,6 @@ import { AppConfigService } from '../../app-config/app-config.service';
 import { AuthGuardEcm } from './auth-guard-ecm.service';
 import { AuthenticationService } from '../services/authentication.service';
 import { RouterStateSnapshot, Router } from '@angular/router';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { MatDialog } from '@angular/material/dialog';
 import { TranslateModule } from '@ngx-translate/core';
@@ -32,14 +31,13 @@ describe('AuthGuardService ECM', () => {
     let router: Router;
     let appConfigService: AppConfigService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         localStorage.clear();
         authService = TestBed.inject(AuthenticationService);
         authGuard = TestBed.inject(AuthGuardEcm);

lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts

@@ -17,7 +17,6 @@
 
 import { TestBed } from '@angular/core/testing';
 import { ActivatedRouteSnapshot, Router } from '@angular/router';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { AuthGuardSsoRoleService } from './auth-guard-sso-role.service';
 import { JwtHelperService } from '../services/jwt-helper.service';
@@ -30,14 +29,13 @@ describe('Auth Guard SSO role service', () => {
     let jwtHelperService: JwtHelperService;
     let routerService: Router;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         localStorage.clear();
         authGuard = TestBed.inject(AuthGuardSsoRoleService);
         jwtHelperService = TestBed.inject(JwtHelperService);

lib/core/src/lib/auth/guard/auth-guard.service.spec.ts

@@ -20,7 +20,6 @@ import { Router, RouterStateSnapshot } from '@angular/router';
 import { AppConfigService } from '../../app-config/app-config.service';
 import { AuthGuard } from './auth-guard.service';
 import { AuthenticationService } from '../services/authentication.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { StorageService } from '../../common/services/storage.service';
@@ -33,14 +32,13 @@ describe('AuthGuardService', () => {
     let storageService: StorageService;
     let appConfigService: AppConfigService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         localStorage.clear();
         state = { url: '' };
         authService = TestBed.inject(AuthenticationService);

lib/core/src/lib/auth/services/identity-group.service.spec.ts

@@ -16,7 +16,6 @@
  */
 
 import { fakeAsync, TestBed } from '@angular/core/testing';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { IdentityGroupService } from './identity-group.service';
 import { HttpErrorResponse } from '@angular/common/http';
 import { throwError, of } from 'rxjs';
@@ -37,14 +36,13 @@ describe('IdentityGroupService', () => {
     let adfHttpClient: AdfHttpClient;
     let requestSpy: jasmine.Spy;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(fakeAsync(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         service = TestBed.inject(IdentityGroupService);
         adfHttpClient = TestBed.inject(AdfHttpClient);
         requestSpy = spyOn(adfHttpClient, 'request');

lib/core/src/lib/auth/services/identity-role.service.spec.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { HttpClientModule, HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { TestBed } from '@angular/core/testing';
 import { of, throwError } from 'rxjs';
@@ -49,13 +48,12 @@ export const mockIdentityRoles = {
 describe('IdentityRoleService', () => {
     let service: IdentityRoleService;
 
-    setupTestBed({
-      imports: [
-        HttpClientModule
-      ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                HttpClientModule
+            ]
+        });
         service = TestBed.inject(IdentityRoleService);
     });
 

lib/core/src/lib/auth/services/identity-user.service.spec.ts

@@ -30,7 +30,6 @@ import {
 import { mockGroups, mockJoinGroupRequest } from '../mock/identity-group.mock';
 import { IdentityUserService } from './identity-user.service';
 import { JwtHelperService } from './jwt-helper.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { mockToken } from '../mock/jwt-helper.service.spec';
 import { IdentityRoleModel } from '../models/identity-role.model';
 import { CoreTestingModule } from '../../testing/core.testing.module';
@@ -51,20 +50,17 @@ describe('IdentityUserService', () => {
     let adfHttpClient: AdfHttpClient;
     let requestSpy: jasmine.Spy;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         service = TestBed.inject(IdentityUserService);
         adfHttpClient = TestBed.inject(AdfHttpClient);
         requestSpy = spyOn(adfHttpClient, 'request');
-    });
 
-    beforeEach(() => {
         const store = {};
 
         spyOn(localStorage, 'getItem').and.callFake( (key: string): string => store[key] || null);

lib/core/src/lib/auth/services/jwt-helper.service.spec.ts

@@ -17,18 +17,16 @@
 
 import { JwtHelperService } from './jwt-helper.service';
 import { mockToken } from '../mock/jwt-helper.service.spec';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { TestBed } from '@angular/core/testing';
 
 describe('JwtHelperService', () => {
 
     let jwtHelperService: JwtHelperService;
 
-    setupTestBed({
-        providers: [JwtHelperService]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            providers: [JwtHelperService]
+        });
         jwtHelperService = TestBed.inject(JwtHelperService);
     });
 

lib/core/src/lib/auth/services/user-access.service.spec.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { CoreTestingModule, setupTestBed } from '../../testing';
+import { CoreTestingModule } from '../../testing';
 import { TestBed } from '@angular/core/testing';
 import { UserAccessService } from './user-access.service';
 import { JwtHelperService } from './jwt-helper.service';
@@ -26,12 +26,11 @@ describe('UserAccessService', () => {
     let jwtHelperService: JwtHelperService;
     let appConfigService: AppConfigService;
 
-    setupTestBed({
-        imports: [CoreTestingModule],
-        providers: [UserAccessService]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [CoreTestingModule],
+            providers: [UserAccessService]
+        });
         userAccessService = TestBed.inject(UserAccessService);
         jwtHelperService = TestBed.inject(JwtHelperService);
         appConfigService = TestBed.inject(AppConfigService);

lib/core/src/lib/buttons-menu/buttons-menu.component.spec.ts

@@ -18,7 +18,6 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { MaterialModule } from '../material.module';
 import { CoreTestingModule } from '../testing/core.testing.module';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CUSTOM_ELEMENTS_SCHEMA, Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -59,21 +58,20 @@ describe('ButtonsMenuComponent', () => {
         let component: CustomContainerComponent;
         let element: HTMLElement;
 
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule,
-                MaterialModule
-            ],
-            declarations: [
-                CustomContainerComponent
-            ],
-            schemas: [
-                CUSTOM_ELEMENTS_SCHEMA
-            ]
-        });
-
         beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreTestingModule,
+                    MaterialModule
+                ],
+                declarations: [
+                    CustomContainerComponent
+                ],
+                schemas: [
+                    CUSTOM_ELEMENTS_SCHEMA
+                ]
+            });
             fixture = TestBed.createComponent(CustomContainerComponent);
             element = fixture.debugElement.nativeElement;
             component = fixture.componentInstance;
@@ -111,21 +109,20 @@ describe('ButtonsMenuComponent', () => {
         let fixture: ComponentFixture<CustomEmptyContainerComponent>;
         let element: HTMLElement;
 
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule,
-                MaterialModule
-            ],
-            declarations: [
-                CustomEmptyContainerComponent
-            ],
-            schemas: [
-                CUSTOM_ELEMENTS_SCHEMA
-            ]
-        });
-
         beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreTestingModule,
+                    MaterialModule
+                ],
+                declarations: [
+                    CustomEmptyContainerComponent
+                ],
+                schemas: [
+                    CUSTOM_ELEMENTS_SCHEMA
+                ]
+            });
             fixture = TestBed.createComponent(CustomEmptyContainerComponent);
             element = fixture.nativeElement;
         });

lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts

@@ -17,7 +17,6 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { CardViewArrayItemComponent } from './card-view-arrayitem.component';
 import { CardViewArrayItemModel, CardViewArrayItem } from '../../models/card-view-arrayitem.model';
@@ -45,24 +44,23 @@ describe('CardViewArrayItemComponent', () => {
         icon: 'edit'
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
-    afterEach(() => {
-        fixture.destroy();
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(CardViewArrayItemComponent);
         service = TestBed.inject(CardViewUpdateService);
         component = fixture.componentInstance;
         component.property = new CardViewArrayItemModel(mockDefaultProps);
     });
 
+    afterEach(() => {
+        fixture.destroy();
+    });
+
     describe('Click event', () => {
         beforeEach(() => {
             serviceSpy = spyOn(service, 'clicked');

lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts

@@ -18,7 +18,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { MatCheckbox, MatCheckboxChange } from '@angular/material/checkbox';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CardViewUpdateService } from '../../services/card-view-update.service';
 import { CardViewBoolItemComponent } from './card-view-boolitem.component';
 import { CardViewBoolItemModel } from '../../models/card-view-boolitem.model';
@@ -30,14 +29,13 @@ describe('CardViewBoolItemComponent', () => {
     let fixture: ComponentFixture<CardViewBoolItemComponent>;
     let component: CardViewBoolItemComponent;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(CardViewBoolItemComponent);
         component = fixture.componentInstance;
         component.property = new CardViewBoolItemModel({

lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts

@@ -17,7 +17,6 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import moment from 'moment';
 import { CardViewDateItemModel } from '../../models/card-view-dateitem.model';
 import { CardViewUpdateService } from '../../services/card-view-update.service';
@@ -34,14 +33,13 @@ describe('CardViewDateItemComponent', () => {
     let component: CardViewDateItemComponent;
     let appConfigService: AppConfigService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         appConfigService = TestBed.inject(AppConfigService);
         appConfigService.config.dateValues = {
             defaultDateFormat: 'shortDate',

lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts

@@ -19,7 +19,6 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { CardViewKeyValuePairsItemModel } from '../../models/card-view-keyvaluepairs.model';
 import { CardViewKeyValuePairsItemComponent } from './card-view-keyvaluepairsitem.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { CardViewUpdateService } from '../../services/card-view-update.service';
 import { TranslateModule } from '@ngx-translate/core';
@@ -32,14 +31,13 @@ describe('CardViewKeyValuePairsItemComponent', () => {
     const mockEmptyData = [{ name: '', value: '' }];
     const mockData = [{ name: 'test-name', value: 'test-value' }];
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(CardViewKeyValuePairsItemComponent);
         cardViewUpdateService = TestBed.inject(CardViewUpdateService);
         component = fixture.componentInstance;

lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts

@@ -21,7 +21,6 @@ import { By } from '@angular/platform-browser';
 import { CardViewMapItemModel } from '../../models/card-view-mapitem.model';
 import { CardViewUpdateService } from '../../services/card-view-update.service';
 import { CardViewMapItemComponent } from './card-view-mapitem.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -33,14 +32,13 @@ describe('CardViewMapItemComponent', () => {
     let debug: DebugElement;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(CardViewMapItemComponent);
         service = TestBed.inject(CardViewUpdateService);
         component = fixture.componentInstance;

lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts

@@ -20,7 +20,6 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { By } from '@angular/platform-browser';
 import { CardViewSelectItemModel } from '../../models/card-view-selectitem.model';
 import { CardViewSelectItemComponent } from './card-view-selectitem.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { of } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
@@ -48,14 +47,13 @@ describe('CardViewSelectItemComponent', () => {
         editable: true
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(CardViewSelectItemComponent);
         component = fixture.componentInstance;
         overlayContainer = TestBed.inject(OverlayContainer);

lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts

@@ -16,7 +16,6 @@
  */
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { setupTestBed } from '../../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { SelectFilterInputComponent } from './select-filter-input.component';
@@ -73,18 +72,20 @@ describe('SelectFilterInputComponent', () => {
     let component: SelectFilterInputComponent;
     let matSelect: MatSelect;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            NoopAnimationsModule
-        ],
-        declarations: [
-            TestComponent
-        ],
-        providers: [
-            MatSelect
-        ]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                NoopAnimationsModule
+            ],
+            declarations: [
+                TestComponent
+            ],
+            providers: [
+                MatSelect
+            ]
+        });
     });
 
     describe('component', () => {

lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts

@@ -20,7 +20,6 @@ import { By } from '@angular/platform-browser';
 import { CardViewTextItemModel } from '../../models/card-view-textitem.model';
 import { CardViewUpdateService } from '../../services/card-view-update.service';
 import { CardViewTextItemComponent } from './card-view-textitem.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { CardViewItemFloatValidator } from '../../validators/card-view-item-float.validator';
 import { CardViewItemIntValidator } from '../../validators/card-view-item-int.validator';
@@ -89,15 +88,14 @@ describe('CardViewTextItemComponent', () => {
         expect(valueChips[2].nativeElement.innerText.trim()).toBe(param3);
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            MatChipsModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                MatChipsModule
+            ]
+        });
         fixture = TestBed.createComponent(CardViewTextItemComponent);
         component = fixture.componentInstance;
     });

lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts

@@ -17,7 +17,6 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CardViewDateItemModel } from '../../models/card-view-dateitem.model';
 import { CardViewTextItemModel } from '../../models/card-view-textitem.model';
 import { CardViewComponent } from './card-view.component';
@@ -32,14 +31,13 @@ describe('CardViewComponent', () => {
     let fixture: ComponentFixture<CardViewComponent>;
     let component: CardViewComponent;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(CardViewComponent);
         component = fixture.componentInstance;
     });

lib/core/src/lib/clipboard/clipboard.directive.spec.ts

@@ -17,7 +17,6 @@
 
 import { Component, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed, tick, fakeAsync } from '@angular/core/testing';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { ClipboardService } from './clipboard.service';
 import { ClipboardDirective } from './clipboard.directive';
 import { CoreTestingModule } from '../testing/core.testing.module';
@@ -41,17 +40,16 @@ describe('ClipboardDirective', () => {
     let fixture: ComponentFixture<TestTargetClipboardComponent>;
     let clipboardService: ClipboardService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [
-            TestTargetClipboardComponent
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [
+                TestTargetClipboardComponent
+            ]
+        });
         fixture = TestBed.createComponent(TestTargetClipboardComponent);
         clipboardService = TestBed.inject(ClipboardService);
         fixture.detectChanges();
@@ -92,17 +90,16 @@ describe('CopyClipboardDirective', () => {
     let fixture: ComponentFixture<TestCopyClipboardComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [
-            TestCopyClipboardComponent
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [
+                TestCopyClipboardComponent
+            ]
+        });
         fixture = TestBed.createComponent(TestCopyClipboardComponent);
         element = fixture.debugElement.nativeElement;
         fixture.detectChanges();

lib/core/src/lib/clipboard/clipboard.service.spec.ts

@@ -19,7 +19,6 @@ import { NotificationService } from '../notifications/services/notification.serv
 import { TestBed } from '@angular/core/testing';
 import { ClipboardService } from './clipboard.service';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -28,15 +27,14 @@ describe('ClipboardService', () => {
     let notificationService: NotificationService;
     let inputElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            MatSnackBarModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                MatSnackBarModule
+            ]
+        });
         clipboardService = TestBed.inject(ClipboardService);
         notificationService = TestBed.inject(NotificationService);
         inputElement = document.createElement('input');

lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts

@@ -20,7 +20,6 @@ import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
 import { CommentModel } from '../../models/comment.model';
 import { CommentListComponent } from './comment-list.component';
 import { By } from '@angular/platform-browser';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import {
@@ -39,21 +38,20 @@ describe('CommentListComponent', () => {
     let fixture: ComponentFixture<CommentListComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        schemas: [CUSTOM_ELEMENTS_SCHEMA],
-        providers: [
-            {
-                provide: ADF_COMMENTS_SERVICE,
-                useClass: CommentListServiceMock
-            }
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            schemas: [CUSTOM_ELEMENTS_SCHEMA],
+            providers: [
+                {
+                    provide: ADF_COMMENTS_SERVICE,
+                    useClass: CommentListServiceMock
+                }
+            ]
+        });
         fixture = TestBed.createComponent(CommentListComponent);
         commentList = fixture.componentInstance;
 

lib/core/src/lib/comments/comments.component.spec.ts

@@ -18,7 +18,6 @@
 import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommentsComponent } from './comments.component';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { CommentsServiceMock, commentsResponseMock } from './mocks/comments.service.mock';
@@ -32,21 +31,20 @@ describe('CommentsComponent', () => {
     let addCommentSpy: jasmine.Spy;
     let commentsService: CommentsService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        schemas: [CUSTOM_ELEMENTS_SCHEMA],
-        providers: [
-            {
-                provide: ADF_COMMENTS_SERVICE,
-                useClass: CommentsServiceMock
-            }
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            schemas: [CUSTOM_ELEMENTS_SCHEMA],
+            providers: [
+                {
+                    provide: ADF_COMMENTS_SERVICE,
+                    useClass: CommentsServiceMock
+                }
+            ]
+        });
         fixture = TestBed.createComponent(CommentsComponent);
         component = fixture.componentInstance;
 

lib/core/src/lib/common/services/directionality-config.service.spec.ts

@@ -17,7 +17,6 @@
 
 import { TestBed } from '@angular/core/testing';
 import { CoreTestingModule } from '../../testing/core.testing.module';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { UserPreferencesService } from './user-preferences.service';
 import { TranslateModule } from '@ngx-translate/core';
 import { CoreModule } from '../../core.module';
@@ -25,15 +24,14 @@ import { CoreModule } from '../../core.module';
 describe('DirectionalityConfigService', () => {
     let userPreferencesService: UserPreferencesService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         userPreferencesService = TestBed.inject(UserPreferencesService);
     });
 

lib/core/src/lib/common/services/log.service.spec.ts

@@ -22,7 +22,6 @@ import { Component } from '@angular/core';
 import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
 import { AppConfigService } from '../../app-config/app-config.service';
 import { LogService } from './log.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 
 @Component({
     template: '',
@@ -60,13 +59,12 @@ describe('LogService', () => {
     let providesLogComponent: ComponentFixture<ProvidesLogComponent>;
     let appConfigService: AppConfigService;
 
-    setupTestBed({
-        imports: [HttpClientModule],
-        declarations: [ProvidesLogComponent],
-        providers: [LogService, AppConfigService]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [HttpClientModule],
+            declarations: [ProvidesLogComponent],
+            providers: [LogService, AppConfigService]
+        });
         appConfigService = TestBed.inject(AppConfigService);
         providesLogComponent = TestBed.createComponent(ProvidesLogComponent);
     });

lib/core/src/lib/common/services/storage.service.spec.ts

@@ -18,7 +18,6 @@
 import { TestBed } from '@angular/core/testing';
 import { AppConfigService } from '../../app-config/app-config.service';
 import { StorageService } from '../../common/services/storage.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { AppConfigServiceMock } from '../mock/app-config.service.mock';
 import { TranslateModule } from '@ngx-translate/core';
@@ -32,15 +31,14 @@ describe('StorageService', () => {
     const value = 'test_value';
 
     describe('StorageService', () => {
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreModule.forRoot(),
-                CoreTestingModule
-            ]
-        });
-
         beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreModule.forRoot(),
+                    CoreTestingModule
+                ]
+            });
             appConfig = TestBed.inject(AppConfigService);
             appConfig.config = {
                 application: {
@@ -81,14 +79,13 @@ describe('StorageService', () => {
     });
 
     describe('StorageService', () => {
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule
-            ]
-        });
-
         beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreTestingModule
+                ]
+            });
             appConfig = TestBed.inject(AppConfigService);
             appConfig.config = {
                 application: {

lib/core/src/lib/common/services/thumbnail.service.spec.ts

@@ -17,7 +17,6 @@
 
 import { TestBed } from '@angular/core/testing';
 import { ThumbnailService } from './thumbnail.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -25,14 +24,13 @@ describe('ThumbnailService', () => {
 
     let service: ThumbnailService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         service = TestBed.inject(ThumbnailService);
     });
 

lib/core/src/lib/common/services/user-preferences.service.spec.ts

@@ -20,7 +20,6 @@ import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import { AppConfigService } from '../../app-config/app-config.service';
 import { StorageService } from '../../common/services/storage.service';
 import { UserPreferencesService, UserPreferenceValues } from '../../common/services/user-preferences.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { AppConfigServiceMock } from '../mock/app-config.service.mock';
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
@@ -34,16 +33,14 @@ describe('UserPreferencesService', () => {
     let appConfig: AppConfigServiceMock;
     let alfrescoApiService: AlfrescoApiServiceMock;
     let translate: TranslateService;
-    let changeDisposable: any;
-
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
 
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         appConfig = TestBed.inject(AppConfigService);
         appConfig.config = {
             pagination: {
@@ -52,29 +49,19 @@ describe('UserPreferencesService', () => {
             }
         };
 
+        preferences = TestBed.inject(UserPreferencesService);
         storage = TestBed.inject(StorageService);
+        storage.clear();
         translate = TestBed.inject(TranslateService);
         alfrescoApiService = TestBed.inject(AlfrescoApiService) as AlfrescoApiServiceMock;
     });
 
-    beforeEach(() => {
-        storage.clear();
-    });
-
     afterEach(() => {
-        if (changeDisposable) {
-            changeDisposable.unsubscribe();
-        }
-
         storage.clear();
+        TestBed.resetTestingModule();
     });
 
     describe(' with pagination config', () => {
-
-        beforeEach(() => {
-            preferences = TestBed.inject(UserPreferencesService);
-        });
-
         it('should get default pagination from app config', (done) => {
             appConfig.config.pagination.size = 0;
             appConfig.load().then(() => {
@@ -158,29 +145,26 @@ describe('UserPreferencesService', () => {
             expect(storage.getItem(UserPreferenceValues.Locale)).toBe(null);
         });
 
-        it('should stream the page size value when is set', (done) => {
-            preferences.paginationSize = 5;
-            changeDisposable = preferences.onChange.subscribe((userPreferenceStatus) => {
-                expect(userPreferenceStatus[UserPreferenceValues.PaginationSize]).toBe(5);
-                done();
+        it('should stream the page size value when is set', () => {
+            let lastValue;
+            preferences.onChange.subscribe((userPreferenceStatus) => {
+                lastValue = userPreferenceStatus[UserPreferenceValues.PaginationSize];
             });
+            preferences.paginationSize = 5;
+            expect(lastValue).toBe(5);
         });
 
-        it('should stream the user preference status when changed', (done) => {
-            preferences.set('propertyA', 'valueA');
-            changeDisposable = preferences.onChange.subscribe((userPreferenceStatus) => {
-                expect(userPreferenceStatus.propertyA).toBe('valueA');
-                done();
+        it('should stream the user preference status when changed', () => {
+            let lastValue;
+            preferences.onChange.subscribe((userPreferenceStatus) => {
+                lastValue = userPreferenceStatus.propertyA;
             });
+            preferences.set('propertyA', 'valueA');
+            expect(lastValue).toBe('valueA');
         });
     });
 
     describe('with language config', () => {
-
-        beforeEach(() => {
-            preferences = TestBed.inject(UserPreferencesService);
-        });
-
         it('should store default textOrientation based on language', () => {
             appConfig.config.languages = [
                 {
@@ -218,7 +202,7 @@ describe('UserPreferencesService', () => {
             expect(storage.getItem(textOrientation)).toBe(null);
         });
 
-        it('should default to browser locale for textOrientation when locale is not defined in configuration', (done) => {
+        it('should default to browser locale for textOrientation when locale is not defined in configuration', () => {
             appConfig.config.languages = [
                 {
                     key: 'fake-locale-browser',
@@ -228,11 +212,13 @@ describe('UserPreferencesService', () => {
             spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locale-browser');
             alfrescoApiService.initialize();
 
-            changeDisposable = preferences.onChange
-                .subscribe((userPreferenceStatus) => {
-                    expect(userPreferenceStatus['textOrientation']).toBe('rtl');
-                    done();
+            let lastValue;
+
+            preferences.onChange.subscribe((userPreferenceStatus) => {
+                lastValue = userPreferenceStatus['textOrientation'];
             });
+
+            expect(lastValue).toBe('rtl');
         });
     });
 });

lib/core/src/lib/context-menu/context-menu-overlay.service.spec.ts

@@ -19,7 +19,6 @@ import { Overlay } from '@angular/cdk/overlay';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { ContextMenuOverlayService } from './context-menu-overlay.service';
 import { Injector } from '@angular/core';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -35,15 +34,14 @@ describe('ContextMenuOverlayService', () => {
         } as MouseEvent
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        providers: [ Overlay ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            providers: [ Overlay ]
+        });
         overlay = TestBed.inject(Overlay);
         injector = TestBed.inject(Injector);
     });

lib/core/src/lib/context-menu/context-menu.spec.ts

@@ -18,7 +18,6 @@
 import { Component } from '@angular/core';
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { ContextMenuModule } from './context-menu.module';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -79,18 +78,17 @@ describe('ContextMenuDirective', () => {
         }
     ];
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            ContextMenuModule
-        ],
-        declarations: [
-            TestComponent
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                ContextMenuModule
+            ],
+            declarations: [
+                TestComponent
+            ]
+        });
         fixture = TestBed.createComponent(TestComponent);
         fixture.componentInstance.actions = actions;
         fixture.detectChanges();

lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts

@@ -24,7 +24,6 @@ import { DataSorting } from '../../data/data-sorting.model';
 import { ObjectDataColumn } from '../../data/object-datacolumn.model';
 import { ObjectDataTableAdapter } from '../../data/object-datatable-adapter';
 import { DataTableComponent, ShowHeaderMode } from './datatable.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { DataColumnListComponent } from '../../data-column/data-column-list.component';
 import { DataColumnComponent } from '../../data-column/data-column.component';
@@ -146,15 +145,14 @@ describe('DataTable', () => {
         expect(doubleClickCount).toBe(1);
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [CustomColumnHeaderComponent]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [CustomColumnHeaderComponent]
+        });
         fixture = TestBed.createComponent(DataTableComponent);
         dataTable = fixture.componentInstance;
         element = fixture.debugElement.nativeElement;
@@ -1381,16 +1379,15 @@ describe('Accesibility', () => {
     let element: any;
     let columnCustomTemplate: TemplateRef<any>;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [CustomColumnTemplateComponent],
-        schemas: [NO_ERRORS_SCHEMA]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [CustomColumnTemplateComponent],
+            schemas: [NO_ERRORS_SCHEMA]
+        });
         columnCustomTemplate = TestBed.createComponent(CustomColumnTemplateComponent).componentInstance.templateRef;
         fixture = TestBed.createComponent(DataTableComponent);
         dataTable = fixture.componentInstance;
@@ -1603,16 +1600,15 @@ describe('Drag&Drop column header', () => {
     let data: { id: number; name: string }[] = [];
     let dataTableSchema: DataColumn[] = [];
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [CustomColumnTemplateComponent],
-        schemas: [NO_ERRORS_SCHEMA]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [CustomColumnTemplateComponent],
+            schemas: [NO_ERRORS_SCHEMA]
+        });
         fixture = TestBed.createComponent(DataTableComponent);
         dataTable = fixture.componentInstance;
         data = [
@@ -1715,16 +1711,15 @@ describe('Show/hide columns', () => {
     let data: DataColumn[] = [];
     let dataTableSchema: DataColumn[] = [];
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [CustomColumnTemplateComponent],
-        schemas: [NO_ERRORS_SCHEMA]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [CustomColumnTemplateComponent],
+            schemas: [NO_ERRORS_SCHEMA]
+        });
         fixture = TestBed.createComponent(DataTableComponent);
         dataTable = fixture.componentInstance;
         data = [
@@ -1818,16 +1813,15 @@ describe('Column Resizing', () => {
         headerColumns.forEach((header: HTMLElement) => expect(header.classList).not.toContain(excludedClass));
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [CustomColumnTemplateComponent],
-        schemas: [NO_ERRORS_SCHEMA]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [CustomColumnTemplateComponent],
+            schemas: [NO_ERRORS_SCHEMA]
+        });
         fixture = TestBed.createComponent(DataTableComponent);
         dataTable = fixture.componentInstance;
         data = [

lib/core/src/lib/datatable/components/empty-list/empty-list.component.spec.ts

@@ -17,21 +17,19 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { EmptyListComponent } from './empty-list.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
 describe('EmptyListComponentComponent', () => {
     let fixture: ComponentFixture<EmptyListComponent>;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(EmptyListComponent);
     });
 

lib/core/src/lib/datatable/components/json-cell/json-cell.component.spec.ts

@@ -18,8 +18,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ObjectDataTableAdapter } from '../../data/object-datatable-adapter';
 import { ObjectDataColumn } from '../../data/object-datacolumn.model';
-
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { JsonCellComponent } from './json-cell.component';
 import { TranslateModule } from '@ngx-translate/core';
@@ -31,14 +29,13 @@ describe('JsonCellComponent', () => {
     let rowData: any;
     let columnData: any;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(JsonCellComponent);
         component = fixture.componentInstance;
     });

lib/core/src/lib/datatable/components/location-cell/location-cell.component.spec.ts

@@ -18,9 +18,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ObjectDataTableAdapter } from '../../data/object-datatable-adapter';
 import { ObjectDataColumn } from '../../data/object-datacolumn.model';
-
 import { LocationCellComponent } from './location-cell.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -31,14 +29,13 @@ describe('LocationCellComponent', () => {
     let rowData: any;
     let columnData: any;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(LocationCellComponent);
         component = fixture.componentInstance;
     });

lib/core/src/lib/datatable/data-column/data-column.component.spec.ts

@@ -16,17 +16,18 @@
  */
 
 import { DataColumnComponent } from './data-column.component';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
+import { TestBed } from '@angular/core/testing';
 
 describe('DataColumnListComponent', () => {
-
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
     });
 
     it('should setup screen reader title for thumbnails', () => {

lib/core/src/lib/datatable/directives/header-filter-template.directive.spec.ts

@@ -18,7 +18,6 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { DataTableComponent } from '../components/datatable/datatable.component';
 import { HeaderFilterTemplateDirective } from './header-filter-template.directive';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -28,14 +27,13 @@ describe('HeaderFilterTemplateDirective', () => {
     let dataTable: DataTableComponent;
     let directive: HeaderFilterTemplateDirective;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(DataTableComponent);
         dataTable = fixture.componentInstance;
         directive = new HeaderFilterTemplateDirective(dataTable);

lib/core/src/lib/datatable/directives/loading-template.directive.spec.ts

@@ -18,7 +18,6 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { DataTableComponent } from '../components/datatable/datatable.component';
 import { LoadingContentTemplateDirective } from './loading-template.directive';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -28,14 +27,13 @@ describe('LoadingContentTemplateDirective', () => {
     let dataTable: DataTableComponent;
     let directive: LoadingContentTemplateDirective;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(DataTableComponent);
         dataTable = fixture.componentInstance;
         directive = new LoadingContentTemplateDirective(dataTable);

lib/core/src/lib/datatable/directives/no-content-template.directive.spec.ts

@@ -18,7 +18,6 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { DataTableComponent } from '../components/datatable/datatable.component';
 import { NoContentTemplateDirective } from './no-content-template.directive';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -28,14 +27,13 @@ describe('NoContentTemplateDirective', () => {
     let dataTable: DataTableComponent;
     let directive: NoContentTemplateDirective;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(DataTableComponent);
         dataTable = fixture.componentInstance;
         directive = new NoContentTemplateDirective(dataTable);

lib/core/src/lib/datatable/directives/no-permission-template.directive.spec.ts

@@ -18,7 +18,6 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { DataTableComponent } from '../components/datatable/datatable.component';
 import { NoPermissionTemplateDirective } from './no-permission-template.directive';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -28,14 +27,13 @@ describe('NoPermissionTemplateDirective', () => {
     let dataTable: DataTableComponent;
     let directive: NoPermissionTemplateDirective;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(DataTableComponent);
         dataTable = fixture.componentInstance;
         directive = new NoPermissionTemplateDirective(dataTable);

lib/core/src/lib/directives/highlight.directive.spec.ts

@@ -20,7 +20,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { HighlightTransformService } from '../common/services/highlight-transform.service';
 import { HighlightDirective } from './highlight.directive';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -46,17 +45,16 @@ describe('HighlightDirective', () => {
     let fixture: ComponentFixture<TestComponent>;
     let component: TestComponent;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [
-            TestComponent
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [
+                TestComponent
+            ]
+        });
         fixture = TestBed.createComponent(TestComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();

lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts

@@ -18,7 +18,6 @@
 import { Component, ViewChild } from '@angular/core';
 import { ComponentFixture, fakeAsync, flush, TestBed } from '@angular/core/testing';
 import { InfiniteSelectScrollDirective } from './infinite-select-scroll.directive';
-import { setupTestBed } from '../testing/setup-test-bed';
 import {  MatSelect, MatSelectModule } from '@angular/material/select';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
@@ -49,18 +48,17 @@ describe('InfiniteSelectScrollDirective', () => {
     let fixture: ComponentFixture<TestComponent>;
     let component: TestComponent;
 
-    setupTestBed({
-        imports: [
-            MatSelectModule,
-            NoopAnimationsModule
-        ],
-        declarations: [
-            TestComponent,
-            InfiniteSelectScrollDirective
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                MatSelectModule,
+                NoopAnimationsModule
+            ],
+            declarations: [
+                TestComponent,
+                InfiniteSelectScrollDirective
+            ]
+        });
         fixture = TestBed.createComponent(TestComponent);
         component = fixture.componentInstance;
     });

lib/core/src/lib/directives/logout.directive.spec.ts

@@ -21,7 +21,6 @@ import { Router } from '@angular/router';
 import { of, throwError } from 'rxjs';
 import { AuthenticationService } from '../auth/services/authentication.service';
 import { AppConfigService } from '../app-config/app-config.service';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { LogoutDirective } from './logout.directive';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
@@ -44,17 +43,16 @@ describe('LogoutDirective', () => {
         let authService: AuthenticationService;
         let appConfig: AppConfigService;
 
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule
-            ],
-            declarations: [
-                TestComponent
-            ]
-        });
-
         beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreTestingModule
+                ],
+                declarations: [
+                    TestComponent
+                ]
+            });
             router = TestBed.inject(Router);
             authService = TestBed.inject(AuthenticationService);
             appConfig = TestBed.inject(AppConfigService);
@@ -126,17 +124,16 @@ describe('LogoutDirective', () => {
         let router: Router;
         let authService: AuthenticationService;
 
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule
-            ],
-            declarations: [
-                TestComponent
-            ]
-        });
-
         beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreTestingModule
+                ],
+                declarations: [
+                    TestComponent
+                ]
+            });
             router = TestBed.inject(Router);
             authService = TestBed.inject(AuthenticationService);
             fixture = TestBed.createComponent(TestComponent);
@@ -170,17 +167,16 @@ describe('LogoutDirective', () => {
         let router: Router;
         let authService: AuthenticationService;
 
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule
-            ],
-            declarations: [
-                TestComponent
-            ]
-        });
-
         beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreTestingModule
+                ],
+                declarations: [
+                    TestComponent
+                ]
+            });
             router = TestBed.inject(Router);
             authService = TestBed.inject(AuthenticationService);
             fixture = TestBed.createComponent(TestComponent);

lib/core/src/lib/form/components/form-field/form-field.component.spec.ts

@@ -20,7 +20,6 @@ import { FormRenderingService } from '../../services/form-rendering.service';
 import { FormFieldModel, FormFieldTypes, FormModel } from '../widgets/core';
 import { TextWidgetComponent, CheckboxWidgetComponent } from '../widgets';
 import { FormFieldComponent } from './form-field.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { FormBaseModule } from '../../form-base.module';
 import { CoreTestingModule } from '../../../testing';
 import { TranslateModule } from '@ngx-translate/core';
@@ -33,15 +32,14 @@ describe('FormFieldComponent', () => {
 
     let formRenderingService: FormRenderingService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            FormBaseModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                FormBaseModule
+            ]
+        });
         fixture = TestBed.createComponent(FormFieldComponent);
         component = fixture.componentInstance;
         formRenderingService = fixture.debugElement.injector.get(FormRenderingService);

lib/core/src/lib/form/components/form-renderer.component.spec.ts

@@ -16,7 +16,6 @@
  */
 
 import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { FormRendererComponent } from './form-renderer.component';
 import { FormBaseModule } from '../form-base.module';
 import {
@@ -94,15 +93,14 @@ describe('Form Renderer Component', () => {
     let formRenderingService: FormRenderingService;
     let rulesManager: FormRulesManager<any>;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            FormBaseModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                FormBaseModule
+            ]
+        });
         fixture = TestBed.createComponent(FormRendererComponent);
         formRendererComponent = fixture.componentInstance;
         formService = TestBed.inject(FormService);

lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts

@@ -18,7 +18,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormFieldModel } from '../core/form-field.model';
 import { AmountWidgetComponent, ADF_AMOUNT_SETTINGS } from './amount.widget';
-import { setupTestBed } from '../../../../testing/setup-test-bed';
 import { FormBaseModule } from '../../../form-base.module';
 import { FormFieldTypes } from '../core/form-field-types';
 import { CoreTestingModule } from '../../../../testing/core.testing.module';
@@ -32,15 +31,14 @@ describe('AmountWidgetComponent', () => {
     let fixture: ComponentFixture<AmountWidgetComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            FormBaseModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                FormBaseModule
+            ]
+        });
         fixture = TestBed.createComponent(AmountWidgetComponent);
         widget = fixture.componentInstance;
         element = fixture.nativeElement;
@@ -157,15 +155,14 @@ describe('AmountWidgetComponent - rendering', () => {
     let fixture: ComponentFixture<AmountWidgetComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            FormBaseModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                FormBaseModule
+            ]
+        });
         fixture = TestBed.createComponent(AmountWidgetComponent);
         widget = fixture.componentInstance;
         element = fixture.nativeElement;
@@ -380,23 +377,22 @@ describe('AmountWidgetComponent settings', () => {
     let widget: AmountWidgetComponent;
     let fixture: ComponentFixture<AmountWidgetComponent>;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            FormBaseModule
-        ],
-        providers: [
-            {
-                provide: ADF_AMOUNT_SETTINGS,
-                useValue: {
-                    showReadonlyPlaceholder: true
-                }
-            }
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                FormBaseModule
+            ],
+            providers: [
+                {
+                    provide: ADF_AMOUNT_SETTINGS,
+                    useValue: {
+                        showReadonlyPlaceholder: true
+                    }
+                }
+            ]
+        });
         fixture = TestBed.createComponent(AmountWidgetComponent);
 
         widget = fixture.componentInstance;

lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.spec.ts

@@ -20,7 +20,6 @@ import { FormFieldTypes } from '../core/form-field-types';
 import { FormFieldModel } from '../core/form-field.model';
 import { FormModel } from '../core/form.model';
 import { CheckboxWidgetComponent } from './checkbox.widget';
-import { setupTestBed } from '../../../../testing/setup-test-bed';
 import { FormBaseModule } from '../../../form-base.module';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderService } from '../../../../translation/translate-loader.service';
@@ -35,20 +34,19 @@ describe('CheckboxWidgetComponent', () => {
     let fixture: ComponentFixture<CheckboxWidgetComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            FormBaseModule,
-            MatCheckboxModule,
-            MatTooltipModule
-        ],
-        providers: [
-            { provide: TranslateLoader, useClass: TranslateLoaderService }
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                FormBaseModule,
+                MatCheckboxModule,
+                MatTooltipModule
+            ],
+            providers: [
+                { provide: TranslateLoader, useClass: TranslateLoaderService }
+            ]
+        });
         fixture = TestBed.createComponent(CheckboxWidgetComponent);
 
         widget = fixture.componentInstance;

lib/core/src/lib/form/components/widgets/core/form.model.spec.ts

@@ -25,18 +25,18 @@ import { FormOutcomeModel } from './form-outcome.model';
 import { FormModel } from './form.model';
 import { TabModel } from './tab.model';
 import { fakeMetadataForm } from '../../mock/form.mock';
-import { CoreTestingModule, setupTestBed } from '../../../../testing';
+import { CoreTestingModule } from '../../../../testing';
+import { TestBed } from '@angular/core/testing';
 
 describe('FormModel', () => {
     let formService: FormService;
 
-    setupTestBed({
-        imports: [
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                CoreTestingModule
+            ]
+        });
         formService = new FormService();
     });
 

lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts

@@ -20,7 +20,6 @@ import moment from 'moment';
 import { FormFieldModel } from '../core/form-field.model';
 import { FormModel } from '../core/form.model';
 import { DateTimeWidgetComponent } from './date-time.widget';
-import { setupTestBed } from '../../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatTooltipModule } from '@angular/material/tooltip';
@@ -33,15 +32,14 @@ describe('DateTimeWidgetComponent', () => {
     let fixture: ComponentFixture<DateTimeWidgetComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            MatTooltipModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                MatTooltipModule
+            ]
+        });
         fixture = TestBed.createComponent(DateTimeWidgetComponent);
 
         element = fixture.nativeElement;

lib/core/src/lib/form/components/widgets/date/date.widget.spec.ts

@@ -20,7 +20,6 @@ import moment from 'moment';
 import { FormFieldModel } from '../core/form-field.model';
 import { FormModel } from '../core/form.model';
 import { DateWidgetComponent } from './date.widget';
-import { setupTestBed } from '../../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { FormFieldTypes } from '../core/form-field-types';
@@ -31,14 +30,13 @@ describe('DateWidgetComponent', () => {
     let fixture: ComponentFixture<DateWidgetComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(DateWidgetComponent);
 
         element = fixture.nativeElement;

lib/core/src/lib/form/components/widgets/error/error.component.spec.ts

@@ -17,7 +17,6 @@
 
 import { SimpleChange, SimpleChanges } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { setupTestBed } from '../../../../testing/setup-test-bed';
 import { ErrorWidgetComponent } from './error.component';
 import { CoreTestingModule } from '../../../../testing';
 import { ErrorMessageModel } from '../index';
@@ -28,13 +27,12 @@ describe('ErrorWidgetComponent', () => {
     let fixture: ComponentFixture<ErrorWidgetComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(ErrorWidgetComponent);
         widget = fixture.componentInstance;
         element = fixture.nativeElement;

lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.spec.ts

@@ -20,7 +20,6 @@ import { FormFieldTypes } from '../core/form-field-types';
 import { FormFieldModel } from '../core/form-field.model';
 import { FormModel } from '../core/form.model';
 import { HyperlinkWidgetComponent } from './hyperlink.widget';
-import { setupTestBed } from '../../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../../testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatTooltipModule } from '@angular/material/tooltip';
@@ -31,15 +30,14 @@ describe('HyperlinkWidgetComponent', () => {
     let fixture: ComponentFixture<HyperlinkWidgetComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            MatTooltipModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                MatTooltipModule
+            ]
+        });
         fixture = TestBed.createComponent(HyperlinkWidgetComponent);
         widget = fixture.componentInstance;
         element = fixture.nativeElement;

lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts

@@ -17,7 +17,6 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { setupTestBed } from '../../../../testing/setup-test-bed';
 import { MultilineTextWidgetComponentComponent } from './multiline-text.widget';
 import { CoreTestingModule } from '../../../../testing/core.testing.module';
 import { FormFieldModel } from '../core/form-field.model';
@@ -31,14 +30,13 @@ describe('MultilineTextWidgetComponentComponent', () => {
     let fixture: ComponentFixture<MultilineTextWidgetComponentComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(MultilineTextWidgetComponentComponent);
         widget = fixture.componentInstance;
         element = fixture.nativeElement;

lib/core/src/lib/form/components/widgets/number/number.widget.spec.ts

@@ -21,7 +21,7 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
-import { CoreTestingModule, setupTestBed } from '../../../../testing';
+import { CoreTestingModule } from '../../../../testing';
 import { FormFieldModel, FormFieldTypes, FormModel } from '../core';
 import { NumberWidgetComponent } from './number.widget';
 
@@ -31,17 +31,16 @@ describe('NumberWidgetComponent', () => {
     let fixture: ComponentFixture<NumberWidgetComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            MatInputModule,
-            FormsModule,
-            MatIconModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                MatInputModule,
+                FormsModule,
+                MatIconModule
+            ]
+        });
         fixture = TestBed.createComponent(NumberWidgetComponent);
         widget = fixture.componentInstance;
         element = fixture.nativeElement;

lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts

@@ -20,7 +20,6 @@ import { FormFieldTypes } from '../core/form-field-types';
 import { FormFieldModel } from '../core/form-field.model';
 import { FormModel } from '../core/form.model';
 import { TextWidgetComponent } from './text.widget';
-import { setupTestBed } from '../../../../testing/setup-test-bed';
 import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
@@ -40,17 +39,16 @@ describe('TextWidgetComponent', () => {
     let element: HTMLElement;
     let errorWidget: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            MatInputModule,
-            FormsModule,
-            MatIconModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                MatInputModule,
+                FormsModule,
+                MatIconModule
+            ]
+        });
         fixture = TestBed.createComponent(TextWidgetComponent);
         widget = fixture.componentInstance;
         element = fixture.nativeElement;

lib/core/src/lib/form/components/widgets/widget.component.spec.ts

@@ -19,7 +19,6 @@ import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
 import { FormFieldModel } from './core/form-field.model';
 import { FormModel } from './core/form.model';
 import { WidgetComponent } from './widget.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { filter } from 'rxjs/operators';
@@ -30,14 +29,13 @@ describe('WidgetComponent', () => {
     let fixture: ComponentFixture<WidgetComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(WidgetComponent);
 
         element = fixture.nativeElement;

lib/core/src/lib/form/models/form-rules.model.spec.ts

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { FormBaseModule } from '../form-base.module';
 import { CoreTestingModule } from '../../testing';
 import { TranslateModule } from '@ngx-translate/core';
@@ -45,21 +44,20 @@ describe('Form Rules', () => {
     let formService: FormService;
 
     describe('Injection token provided', () => {
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule,
-                FormBaseModule
-            ],
-            providers: [
-                {
-                    provide: FORM_RULES_MANAGER,
-                    useValue: customRuleManager
-                }
-            ]
-        });
-
         beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreTestingModule,
+                    FormBaseModule
+                ],
+                providers: [
+                    {
+                        provide: FORM_RULES_MANAGER,
+                        useValue: customRuleManager
+                    }
+                ]
+            });
             injector = TestBed.inject(Injector);
             formService = TestBed.inject(FormService);
         });
@@ -115,15 +113,14 @@ describe('Form Rules', () => {
         let rulesManager: FormRulesManager<any>;
         let getRulesSpy: jasmine.Spy;
 
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule,
-                FormBaseModule
-            ]
-        });
-
         beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreTestingModule,
+                    FormBaseModule
+                ]
+            });
             injector = TestBed.inject(Injector);
             rulesManager = formRulesManagerFactory<any>(injector);
             getRulesSpy = spyOn<any>(rulesManager, 'getRules');

lib/core/src/lib/form/services/form.service.spec.ts

@@ -18,28 +18,22 @@
 import { TestBed } from '@angular/core/testing';
 import { formModelTabs } from '../../mock';
 import { FormService } from './form.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
 describe('Form service', () => {
-
     let service: FormService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         service = TestBed.inject(FormService);
     });
 
-    afterEach(() => {
-    });
-
     describe('parseForm', () => {
 
         it('should parse a Form Definition with tabs', () => {

lib/core/src/lib/form/services/widget-visibility-cloud.service.spec.ts

@@ -26,7 +26,6 @@ import {
 } from '../components/widgets/core';
 import { WidgetVisibilityModel, WidgetTypeEnum } from '../models/widget-visibility.model';
 import { WidgetVisibilityService } from './widget-visibility.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import {
     fakeFormJson,
     formTest, formValues, complexVisibilityJsonVisible,
@@ -44,14 +43,13 @@ describe('WidgetVisibilityCloudService', () => {
     let booleanResult: boolean;
     const stubFormWithFields = new FormModel(fakeFormJson);
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         service = TestBed.inject(WidgetVisibilityService);
         jasmine.Ajax.install();
     });

lib/core/src/lib/form/services/widget-visibility.service.spec.ts

@@ -25,7 +25,6 @@ import {
 } from '../components/widgets/core';
 import { WidgetVisibilityModel } from '../models/widget-visibility.model';
 import { WidgetVisibilityService } from './widget-visibility.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import {
     fakeFormJson, formTest,
     formValues, complexVisibilityJsonVisible,
@@ -43,14 +42,13 @@ describe('WidgetVisibilityService', () => {
     let booleanResult: boolean;
     const stubFormWithFields = new FormModel(fakeFormJson);
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         service = TestBed.inject(WidgetVisibilityService);
     });
 

lib/core/src/lib/identity-user-info/identity-user-info.component.spec.ts

@@ -16,9 +16,7 @@
  */
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { IdentityUserInfoComponent } from './identity-user-info.component';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { TranslateModule } from '@ngx-translate/core';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { MatMenuModule } from '@angular/material/menu';
@@ -40,15 +38,14 @@ describe('IdentityUserInfoComponent', () => {
         fixture.detectChanges();
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            MatMenuModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                MatMenuModule
+            ]
+        });
         fixture = TestBed.createComponent(IdentityUserInfoComponent);
         component = fixture.componentInstance;
         element = fixture.nativeElement;

lib/core/src/lib/layout/components/header/header.component.spec.ts

@@ -17,7 +17,6 @@
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { HeaderLayoutComponent } from './header.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { By } from '@angular/platform-browser';
 import { SidenavLayoutModule } from '../../layout.module';
@@ -30,14 +29,13 @@ describe('HeaderLayoutComponent', () => {
     let component: HeaderLayoutComponent;
 
     describe('Input parameters', () => {
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule
-            ]
-        });
-
         beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreTestingModule
+                ]
+            });
             fixture = TestBed.createComponent(HeaderLayoutComponent);
             component = fixture.componentInstance;
         });
@@ -222,14 +220,16 @@ describe('HeaderLayoutComponent', () => {
         })
         class HeaderLayoutTesterComponent {}
 
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule,
-                SidenavLayoutModule,
-                MaterialModule
-            ],
-            declarations: [HeaderLayoutTesterComponent]
+        beforeEach(() => {
+            TestBed.configureTestingModule({
+                imports: [
+                    TranslateModule.forRoot(),
+                    CoreTestingModule,
+                    SidenavLayoutModule,
+                    MaterialModule
+                ],
+                declarations: [HeaderLayoutTesterComponent]
+            });
         });
 
         it('should project the provided nodes into the component', () => {

lib/core/src/lib/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts

@@ -19,7 +19,6 @@ import { Component } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MaterialModule } from '../../../material.module';
 import { SidebarActionMenuComponent } from './sidebar-action-menu.component';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../../testing/core.testing.module';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
@@ -29,14 +28,13 @@ describe('SidebarActionMenuComponent', () => {
     let component: SidebarActionMenuComponent;
     let fixture: ComponentFixture<SidebarActionMenuComponent>;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(SidebarActionMenuComponent);
         element = fixture.nativeElement;
         component = fixture.componentInstance;
@@ -86,18 +84,17 @@ describe('Custom SidebarActionMenuComponent', () => {
     let component: CustomSidebarActionMenuComponent;
     let element: HTMLElement;
 
-    setupTestBed({
-        declarations: [
-            SidebarActionMenuComponent,
-            CustomSidebarActionMenuComponent
-        ],
-        imports: [
-            MaterialModule,
-            NoopAnimationsModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            declarations: [
+                SidebarActionMenuComponent,
+                CustomSidebarActionMenuComponent
+            ],
+            imports: [
+                MaterialModule,
+                NoopAnimationsModule
+            ]
+        });
         fixture = TestBed.createComponent(CustomSidebarActionMenuComponent);
         fixture.detectChanges();
         component = fixture.componentInstance;

lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts

@@ -29,7 +29,6 @@ import { UserPreferencesService } from '../../../common/services/user-preference
 import { CommonModule } from '@angular/common';
 import { Direction } from '@angular/cdk/bidi';
 import { of } from 'rxjs';
-import { setupTestBed } from '../../../testing/setup-test-bed';
 
 @Component({
     selector: 'adf-layout-container',
@@ -81,30 +80,29 @@ describe('SidenavLayoutComponent', () => {
     let mediaQueryList: any;
     let component: SidenavLayoutComponent;
 
-    setupTestBed({
-        imports: [
-            CommonModule,
-            PlatformModule,
-            LayoutModule,
-            MaterialModule
-        ],
-        declarations: [
-            DummyLayoutContainerComponent,
-            SidenavLayoutComponent,
-            SidenavLayoutContentDirective,
-            SidenavLayoutHeaderDirective,
-            SidenavLayoutNavigationDirective
-        ],
-        providers: [
-            MediaMatcher,
-            { provide: UserPreferencesService, useValue: { select: () => of() } }
-        ],
-        schemas: [
-            CUSTOM_ELEMENTS_SCHEMA
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                CommonModule,
+                PlatformModule,
+                LayoutModule,
+                MaterialModule
+            ],
+            declarations: [
+                DummyLayoutContainerComponent,
+                SidenavLayoutComponent,
+                SidenavLayoutContentDirective,
+                SidenavLayoutHeaderDirective,
+                SidenavLayoutNavigationDirective
+            ],
+            providers: [
+                MediaMatcher,
+                { provide: UserPreferencesService, useValue: { select: () => of() } }
+            ],
+            schemas: [
+                CUSTOM_ELEMENTS_SCHEMA
+            ]
+        });
         mediaQueryList = {
             mediaFn: null,
             matches: false,
@@ -239,28 +237,27 @@ describe('Template transclusion', () => {
             removeListener: () => {}
     };
 
-    setupTestBed({
-        imports: [
-            CommonModule,
-            PlatformModule,
-            LayoutModule,
-            MaterialModule
-        ],
-        declarations: [
-            DummyLayoutContainerComponent,
-            SidenavLayoutTesterComponent,
-            SidenavLayoutComponent,
-            SidenavLayoutContentDirective,
-            SidenavLayoutHeaderDirective,
-            SidenavLayoutNavigationDirective
-        ],
-        providers: [
-            MediaMatcher,
-            { provide: UserPreferencesService, useValue: { select: () => of() } }
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                CommonModule,
+                PlatformModule,
+                LayoutModule,
+                MaterialModule
+            ],
+            declarations: [
+                DummyLayoutContainerComponent,
+                SidenavLayoutTesterComponent,
+                SidenavLayoutComponent,
+                SidenavLayoutContentDirective,
+                SidenavLayoutHeaderDirective,
+                SidenavLayoutNavigationDirective
+            ],
+            providers: [
+                MediaMatcher,
+                { provide: UserPreferencesService, useValue: { select: () => of() } }
+            ]
+        });
         mediaMatcher = TestBed.inject(MediaMatcher);
         spyOn(mediaMatcher, 'matchMedia').and.callFake(() => {
             spyOn(mediaQueryList, 'addListener').and.stub();

lib/core/src/lib/login/components/login-dialog-panel.component.spec.ts

@@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AuthenticationService } from '../../auth/services/authentication.service';
 import { LoginDialogPanelComponent } from './login-dialog-panel.component';
 import { of } from 'rxjs';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -31,14 +30,13 @@ describe('LoginDialogPanelComponent', () => {
     let passwordInput: HTMLInputElement;
     let authService: AuthenticationService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(async () => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(LoginDialogPanelComponent);
         element = fixture.nativeElement;
         component = fixture.componentInstance;

lib/core/src/lib/login/components/login.component.spec.ts

@@ -27,7 +27,6 @@ import { LoginSuccessEvent } from '../models/login-success.event';
 import { LoginComponent } from './login.component';
 import { of, throwError } from 'rxjs';
 import { AlfrescoApiService } from '../../services/alfresco-api.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { LogService } from '../../common/services/log.service';
 
@@ -57,13 +56,12 @@ describe('LoginComponent', () => {
         return errorMessage;
     };
 
-    setupTestBed({
-        imports: [
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(fakeAsync(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(LoginComponent);
 
         element = fixture.nativeElement;

lib/core/src/lib/login/directives/login-footer.directive.spec.ts

@@ -18,7 +18,6 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { LoginComponent } from '../components/login.component';
 import { LoginFooterDirective } from './login-footer.directive';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -27,14 +26,13 @@ describe('LoginFooterDirective', () => {
     let component: LoginComponent;
     let directive: LoginFooterDirective;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(LoginComponent);
         component = fixture.componentInstance;
         directive = new LoginFooterDirective(component);

lib/core/src/lib/login/directives/login-header.directive.spec.ts

@@ -18,7 +18,6 @@
 import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { LoginComponent } from '../components/login.component';
 import { LoginHeaderDirective } from './login-header.directive';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -27,14 +26,13 @@ describe('LoginHeaderDirective', () => {
     let component: LoginComponent;
     let directive: LoginHeaderDirective;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(LoginComponent);
         component = fixture.componentInstance;
         directive = new LoginHeaderDirective(component);

lib/core/src/lib/notifications/components/notification-history.component.spec.ts

@@ -16,7 +16,6 @@
  */
 
 import { ComponentFixture, inject, TestBed } from '@angular/core/testing';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { NotificationHistoryComponent } from './notification-history.component';
 import { OverlayContainer } from '@angular/cdk/overlay';
@@ -41,14 +40,13 @@ describe('Notification History Component', () => {
         fixture.detectChanges();
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(NotificationHistoryComponent);
         component = fixture.componentInstance;
         element = fixture.nativeElement;

lib/core/src/lib/notifications/services/notification.service.spec.ts

@@ -19,11 +19,9 @@ import { LiveAnnouncer } from '@angular/cdk/a11y';
 import { OverlayModule } from '@angular/cdk/overlay';
 import { Component } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { MatSnackBar, MatSnackBarConfig, MatSnackBarModule } from '@angular/material/snack-bar';
 import { NotificationService } from './notification.service';
 import { TranslationService } from '../../translation/translation.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -93,21 +91,20 @@ describe('NotificationService', () => {
     let fixture: ComponentFixture<ProvidesNotificationServiceComponent>;
     let translationService: TranslationService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            OverlayModule,
-            MatSnackBarModule
-        ],
-        declarations: [ProvidesNotificationServiceComponent],
-        providers: [
-            MatSnackBar,
-            LiveAnnouncer
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                OverlayModule,
+                MatSnackBarModule
+            ],
+            declarations: [ProvidesNotificationServiceComponent],
+            providers: [
+                MatSnackBar,
+                LiveAnnouncer
+            ]
+        });
         translationService = TestBed.inject(TranslationService);
         fixture = TestBed.createComponent(ProvidesNotificationServiceComponent);
         fixture.detectChanges();

lib/core/src/lib/pagination/infinite-pagination.component.spec.ts

@@ -21,7 +21,6 @@ import { PaginationModel } from '../models/pagination.model';
 import { InfinitePaginationComponent } from './infinite-pagination.component';
 import { PaginatedComponent } from './paginated-component.interface';
 import { BehaviorSubject } from 'rxjs';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { Component, ChangeDetectorRef } from '@angular/core';
 import { RequestPaginationModel } from '../models/request-pagination.model';
@@ -59,17 +58,16 @@ describe('InfinitePaginationComponent', () => {
     let pagination: PaginationModel;
     let changeDetectorRef: ChangeDetectorRef;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [
-            TestPaginatedComponent
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [
+                TestPaginatedComponent
+            ]
+        });
         fixture = TestBed.createComponent(InfinitePaginationComponent);
         component = fixture.componentInstance;
         changeDetectorRef = fixture.componentRef.injector.get(ChangeDetectorRef);

lib/core/src/lib/pagination/pagination.component.spec.ts

@@ -20,10 +20,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { PaginationComponent } from './pagination.component';
 import { PaginatedComponent } from './paginated-component.interface';
 import { BehaviorSubject } from 'rxjs';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { PaginationModel } from '../models/pagination.model';
+import { setupTestBed } from '@alfresco/adf-core';
 
 class FakePaginationInput implements PaginationModel {
     count = 25;

lib/core/src/lib/pipes/decimal-number.pipe.spec.ts

@@ -19,7 +19,6 @@ import { TestBed } from '@angular/core/testing';
 import { AppConfigService } from '../app-config/app-config.service';
 import { UserPreferencesService } from '../common/services/user-preferences.service';
 import { of } from 'rxjs';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { DecimalNumberPipe } from './decimal-number.pipe';
 import { TranslateModule } from '@ngx-translate/core';
@@ -29,14 +28,13 @@ describe('DecimalNumberPipe', () => {
     let pipe: DecimalNumberPipe;
     let userPreferences: UserPreferencesService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         userPreferences = TestBed.inject(UserPreferencesService);
         spyOn(userPreferences, 'select').and.returnValue(of(''));
         pipe = new DecimalNumberPipe(userPreferences, TestBed.inject(AppConfigService));

lib/core/src/lib/pipes/localized-date.pipe.spec.ts

@@ -20,7 +20,6 @@ import { TestBed } from '@angular/core/testing';
 import { AppConfigService } from '../app-config/app-config.service';
 import { UserPreferencesService } from '../common/services/user-preferences.service';
 import { of } from 'rxjs';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { registerLocaleData } from '@angular/common';
 import localeFr from '@angular/common/locales/fr';
@@ -32,14 +31,13 @@ describe('LocalizedDatePipe', () => {
     let pipe: LocalizedDatePipe;
     let userPreferences: UserPreferencesService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         userPreferences = TestBed.inject(UserPreferencesService);
         spyOn(userPreferences, 'select').and.returnValue(of(''));
         pipe = new LocalizedDatePipe(userPreferences, TestBed.inject(AppConfigService));

lib/core/src/lib/pipes/multi-value.pipe.spec.ts

@@ -17,7 +17,6 @@
 
 import { MultiValuePipe } from './multi-value.pipe';
 import { TestBed } from '@angular/core/testing';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -25,14 +24,13 @@ describe('FullNamePipe', () => {
 
     let pipe: MultiValuePipe;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         pipe = TestBed.inject(MultiValuePipe);
    });
 

lib/core/src/lib/pipes/time-ago.pipe.spec.ts

@@ -19,7 +19,6 @@ import { TimeAgoPipe } from './time-ago.pipe';
 import { TestBed } from '@angular/core/testing';
 import { AppConfigService } from '../app-config/app-config.service';
 import { UserPreferencesService } from '../common/services/user-preferences.service';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { of } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
@@ -29,14 +28,13 @@ describe('TimeAgoPipe', () => {
     let pipe: TimeAgoPipe;
     let userPreferences: UserPreferencesService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         userPreferences = TestBed.inject(UserPreferencesService);
         spyOn(userPreferences, 'select').and.returnValue(of(''));
         pipe = new TimeAgoPipe(userPreferences, TestBed.inject(AppConfigService));

lib/core/src/lib/search-text/search-text-input.component.spec.ts

@@ -23,7 +23,6 @@ import { By } from '@angular/platform-browser';
 import { Subject } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
 import { UserPreferencesService } from '../common/services/user-preferences.service';
-import { setupTestBed } from '../testing/setup-test-bed';
 
 describe('SearchTextInputComponent', () => {
 
@@ -33,14 +32,13 @@ describe('SearchTextInputComponent', () => {
     let element: HTMLElement;
     let userPreferencesService: UserPreferencesService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(SearchTextInputComponent);
         component = fixture.componentInstance;
         debugElement = fixture.debugElement;

lib/core/src/lib/templates/empty-content/empty-content.component.spec.ts

@@ -18,7 +18,6 @@
 import { Component } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { TranslateService, TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { CoreTestingModule } from '../../testing/core.testing.module';
@@ -43,17 +42,16 @@ describe('EmptyContentComponent', () => {
     let fixture: ComponentFixture<TestComponent>;
     let translateService: TranslateService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [
-            TestComponent
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [
+                TestComponent
+            ]
+        });
         fixture = TestBed.createComponent(TestComponent);
         translateService = TestBed.inject(TranslateService);
     });

lib/core/src/lib/templates/error-content/error-content.component.spec.ts

@@ -19,7 +19,6 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { ErrorContentComponent } from './error-content.component';
 import { TranslationService } from '../../translation/translation.service';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { ActivatedRoute } from '@angular/router';
 import { of } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
@@ -32,19 +31,7 @@ describe('ErrorContentComponent', () => {
     let translateService: TranslationService;
 
     beforeEach(() => {
-        fixture = TestBed.createComponent(ErrorContentComponent);
-        element = fixture.nativeElement;
-        errorContentComponent = fixture.debugElement.componentInstance;
-        translateService = TestBed.inject(TranslationService);
-    });
-
-    afterEach(() => {
-        fixture.destroy();
-    });
-
-    describe(' with an undefined error', () => {
-
-        setupTestBed({
+        TestBed.configureTestingModule({
             imports: [
                 TranslateModule.forRoot(),
                 CoreTestingModule
@@ -53,7 +40,18 @@ describe('ErrorContentComponent', () => {
                 { provide: ActivatedRoute, useValue: { params: of() } }
             ]
         });
+        fixture = TestBed.createComponent(ErrorContentComponent);
+        element = fixture.nativeElement;
+        errorContentComponent = fixture.debugElement.componentInstance;
+        translateService = TestBed.inject(TranslationService);
+    });
 
+    afterEach(() => {
+        fixture.destroy();
+        TestBed.resetTestingModule();
+    });
+
+    describe(' with an undefined error', () => {
         it('should render error code', async () => {
             fixture.detectChanges();
             await fixture.whenStable();
@@ -108,18 +106,9 @@ describe('ErrorContentComponent', () => {
     });
 
     describe(' with a specific error', () => {
-
-        setupTestBed({
-            imports: [
-                TranslateModule.forRoot(),
-                CoreTestingModule
-            ],
-            providers: [
-                { provide: ActivatedRoute, useValue: { params: of({ id: '404' }) } }
-            ]
-        });
-
         it('should navigate to an error given by the route params', async () => {
+            const route = TestBed.inject(ActivatedRoute);
+            route.params = of({ id: '404' });
             spyOn(translateService, 'instant').and.returnValue(of('404'));
             fixture.detectChanges();
             await fixture.whenStable();

lib/core/src/lib/testing/core.testing.module.ts

@@ -57,7 +57,8 @@ import { DirectionalityConfigService } from '../common/services/directionality-c
     exports: [
         NoopAnimationsModule,
         CoreModule,
-        TranslateModule
+        TranslateModule,
+        RouterTestingModule
     ]
 })
 export class CoreTestingModule {}

lib/core/src/lib/testing/setup-test-bed.ts

@@ -29,6 +29,7 @@ const resetTestingModule = TestBed.resetTestingModule;
 const preventAngularFromResetting = () => (TestBed.resetTestingModule = () => TestBed);
 const allowAngularToReset = () => (TestBed.resetTestingModule = resetTestingModule);
 
+// @deprecated Please use the standard `TestBed.configureTestingModule` instead
 export const setupTestBed = (moduleDef: TestModuleMetadata) => {
     beforeAll((done) => {
             localStorage.clear();

lib/core/src/lib/translation/translate-loader.spec.ts

@@ -18,7 +18,6 @@
 import { TestBed } from '@angular/core/testing';
 import { TranslateLoaderService } from './translate-loader.service';
 import { TranslationService } from './translation.service';
-import { setupTestBed } from '../testing/setup-test-bed';
 import { TranslateModule } from '@ngx-translate/core';
 import { CoreModule } from '../core.module';
 
@@ -28,17 +27,16 @@ describe('TranslateLoader', () => {
     let translationService: TranslationService;
     let customLoader: TranslateLoaderService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreModule.forRoot()
-        ],
-        providers: [
-            TranslationService
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreModule.forRoot()
+            ],
+            providers: [
+                TranslationService
+            ]
+        });
         translationService = TestBed.inject(TranslationService);
         customLoader = translationService.translate.currentLoader as TranslateLoaderService;
 

lib/core/src/lib/viewer/components/img-viewer.component.spec.ts

@@ -19,7 +19,7 @@ import { SimpleChange } from '@angular/core';
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { UrlService } from '../../common/services/url.service';
 import { ImgViewerComponent } from './img-viewer.component';
-import { setupTestBed, CoreTestingModule } from '../../testing';
+import { CoreTestingModule } from '../../testing';
 import { AppConfigService } from '../../app-config/app-config.service';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
@@ -36,11 +36,13 @@ describe('Test Img viewer component ', () => {
         return new Blob([data], { type: 'image/png' });
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
     });
 
     describe('Zoom customization', () => {

lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.spec.ts

@@ -18,7 +18,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { PdfPasswordDialogComponent } from './pdf-viewer-password-dialog';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -29,28 +28,27 @@ describe('PdfPasswordDialogComponent', () => {
     let fixture: ComponentFixture<PdfPasswordDialogComponent>;
     let dialogRef: MatDialogRef<PdfPasswordDialogComponent>;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        providers: [
-            {
-                provide: MAT_DIALOG_DATA,
-                useValue: {
-                    reason: null
-                }
-            },
-            {
-                provide: MatDialogRef,
-                useValue: {
-                    close: jasmine.createSpy('open')
-                }
-            }
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            providers: [
+                {
+                    provide: MAT_DIALOG_DATA,
+                    useValue: {
+                        reason: null
+                    }
+                },
+                {
+                    provide: MatDialogRef,
+                    useValue: {
+                        close: jasmine.createSpy('open')
+                    }
+                }
+            ]
+        });
         fixture = TestBed.createComponent(PdfPasswordDialogComponent);
         component = fixture.componentInstance;
         dialogRef = TestBed.inject(MatDialogRef);

lib/core/src/lib/viewer/components/pdf-viewer-thumb.component.spec.ts

@@ -18,7 +18,6 @@
 import { DomSanitizer } from '@angular/platform-browser';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { PdfThumbComponent } from './pdf-viewer-thumb.component';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -42,17 +41,16 @@ describe('PdfThumbComponent', () => {
         getHeight: jasmine.createSpy('getHeight').and.returnValue(height)
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        providers: [
-            { provide: DomSanitizer, useValue: domSanitizer }
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            providers: [
+                { provide: DomSanitizer, useValue: domSanitizer }
+            ]
+        });
         fixture = TestBed.createComponent(PdfThumbComponent);
         component = fixture.componentInstance;
     });

lib/core/src/lib/viewer/components/pdf-viewer-thumbnails.component.spec.ts

@@ -18,7 +18,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { PdfThumbListComponent } from './pdf-viewer-thumbnails.component';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { DOWN_ARROW, UP_ARROW, ESCAPE } from '@angular/cdk/keycodes';
@@ -60,14 +59,13 @@ describe('PdfThumbListComponent', () => {
         eventBus: new pdfjsViewer.EventBus()
     };
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(PdfThumbListComponent);
         component = fixture.componentInstance;
         component.pdfViewer = viewerMock;

lib/core/src/lib/viewer/components/pdf-viewer.component.spec.ts

@@ -23,7 +23,6 @@ import { PdfViewerComponent } from './pdf-viewer.component';
 import { RIGHT_ARROW, LEFT_ARROW } from '@angular/cdk/keycodes';
 import { MatDialog } from '@angular/material/dialog';
 import { of } from 'rxjs';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { take } from 'rxjs/operators';
 import { AppConfigService } from '../../app-config/app-config.service';
 import { CoreTestingModule } from '../../testing/core.testing.module';
@@ -125,29 +124,28 @@ xdescribe('Test PdfViewer component', () => {
     let change: any;
     let dialog: MatDialog;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        declarations: [
-            TestDialogComponent,
-            UrlTestComponent,
-            UrlTestPasswordComponent,
-            BlobTestComponent
-        ],
-        providers: [
-            {
-                provide: MatDialog, useValue: {
-                    open: () => {
-                    }
-                }
-            },
-            RenderingQueueServices
-        ]
-    });
-
     beforeEach((done) => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            declarations: [
+                TestDialogComponent,
+                UrlTestComponent,
+                UrlTestPasswordComponent,
+                BlobTestComponent
+            ],
+            providers: [
+                {
+                    provide: MatDialog, useValue: {
+                        open: () => {
+                        }
+                    }
+                },
+                RenderingQueueServices
+            ]
+        });
         fixture = TestBed.createComponent(PdfViewerComponent);
         dialog = TestBed.inject(MatDialog);
 

lib/core/src/lib/viewer/components/txt-viewer.component.spec.ts

@@ -18,7 +18,6 @@
 import { SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TxtViewerComponent } from './txt-viewer.component';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -28,14 +27,13 @@ describe('Text View component', () => {
     let fixture: ComponentFixture<TxtViewerComponent>;
     let element: HTMLElement;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(TxtViewerComponent);
 
         element = fixture.nativeElement;

lib/core/src/lib/viewer/components/viewer-render.component.spec.ts

@@ -19,10 +19,8 @@ import { Location } from '@angular/common';
 import { SpyLocation } from '@angular/common/testing';
 import { Component, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { RenderingQueueServices } from '../services/rendering-queue.services';
 import { ViewerRenderComponent } from './viewer-render.component';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 import { MatDialog } from '@angular/material/dialog';
@@ -60,25 +58,24 @@ describe('ViewerComponent', () => {
 
     let extensionService: AppExtensionService;
 
-    setupTestBed({
-        imports: [
-            NoopAnimationsModule,
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            MatButtonModule,
-            MatIconModule
-        ],
-        declarations: [
-            DoubleViewerComponent
-        ],
-        providers: [
-            RenderingQueueServices,
-            {provide: Location, useClass: SpyLocation},
-            MatDialog
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                NoopAnimationsModule,
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                MatButtonModule,
+                MatIconModule
+            ],
+            declarations: [
+                DoubleViewerComponent
+            ],
+            providers: [
+                RenderingQueueServices,
+                {provide: Location, useClass: SpyLocation},
+                MatDialog
+            ]
+        });
         fixture = TestBed.createComponent(ViewerRenderComponent);
         element = fixture.nativeElement;
         component = fixture.componentInstance;

lib/core/src/lib/viewer/directives/viewer-extension.directive.spec.ts

@@ -21,7 +21,6 @@ import { ChangeDetectorRef, ElementRef } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { ViewerRenderComponent } from '../components/viewer-render.component';
 import { ViewerExtensionDirective } from './viewer-extension.directive';
-import { setupTestBed } from '../../testing/setup-test-bed';
 import { CoreTestingModule } from '../../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -34,21 +33,20 @@ describe('ExtensionViewerDirective', () => {
         }
     }
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ],
-        providers: [
-            { provide: Location, useClass: SpyLocation },
-            ViewerExtensionDirective,
-            {provide: ElementRef, useClass: MockElementRef},
-            ViewerRenderComponent,
-            { provide: ChangeDetectorRef, useValue: { detectChanges: () => {} } }
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ],
+            providers: [
+                { provide: Location, useClass: SpyLocation },
+                ViewerExtensionDirective,
+                {provide: ElementRef, useClass: MockElementRef},
+                ViewerRenderComponent,
+                { provide: ChangeDetectorRef, useValue: { detectChanges: () => {} } }
+            ]
+        });
         extensionViewerDirective = TestBed.inject(ViewerExtensionDirective);
         extensionViewerDirective.templateModel = {template: '', isVisible: false};
     });