[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
Alfresco · Jul 15, 2023 · f45d69e · f45d69e
1 parent 574bff2
commit f45d69e
Show file tree

Hide file tree

Showing 329 changed files with 3,314 additions and 4,030 deletions.
diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.spec.ts b/lib/content-services/src/lib/aspect-list/aspect-list.component.spec.ts
@@ -16,7 +16,6 @@
  */
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { setupTestBed } from '@alfresco/adf-core';
 import { NodesApiService } from '../common/services/nodes-api.service';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
@@ -110,12 +109,14 @@ describe('AspectListComponent', () => {
     let aspectListService: AspectListService;
     let nodeService: NodesApiService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            ContentTestingModule
-        ],
-        providers: [AspectListService]
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                ContentTestingModule
+            ],
+            providers: [AspectListService]
+        });
     });
 
     describe('Loading', () => {

diff --git a/lib/content-services/src/lib/aspect-list/services/dialog-aspect-list.service.spec.ts b/lib/content-services/src/lib/aspect-list/services/dialog-aspect-list.service.spec.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-import { setupTestBed } from '@alfresco/adf-core';
 import { TranslateModule } from '@ngx-translate/core';
 import { ContentTestingModule } from '../../testing/content.testing.module';
 import { DialogAspectListService } from '@alfresco/adf-content-services';
@@ -27,14 +26,13 @@ describe('DialogAspectListService', () => {
     let dialogAspectListService: DialogAspectListService;
     let dialog: MatDialog;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            ContentTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                ContentTestingModule
+            ]
+        });
         dialogAspectListService = TestBed.inject(DialogAspectListService);
         dialog = TestBed.inject(MatDialog);
     });

diff --git a/lib/content-services/src/lib/aspect-list/services/node-aspect.service.spec.ts b/lib/content-services/src/lib/aspect-list/services/node-aspect.service.spec.ts
@@ -18,7 +18,6 @@
 import { MinimalNode } from '@alfresco/js-api';
 import { TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { setupTestBed } from '@alfresco/adf-core';
 import { NodesApiService } from '../../common/services/nodes-api.service';
 import { EMPTY, of } from 'rxjs';
 import { ContentTestingModule } from '../../testing/content.testing.module';
@@ -34,14 +33,13 @@ describe('NodeAspectService', () => {
     let nodeApiService: NodesApiService;
     let cardViewContentUpdateService: CardViewContentUpdateService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            ContentTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                ContentTestingModule
+            ]
+        });
         dialogAspectListService = TestBed.inject(DialogAspectListService);
         nodeAspectService = TestBed.inject(NodeAspectService);
         nodeApiService = TestBed.inject(NodesApiService);

diff --git a/lib/content-services/src/lib/audit/audit.service.spec.ts b/lib/content-services/src/lib/audit/audit.service.spec.ts
@@ -16,7 +16,7 @@
  */
 
 import { AuditService } from './audit.service';
-import { AppConfigService, setupTestBed } from '@alfresco/adf-core';
+import { AppConfigService } from '@alfresco/adf-core';
 import { TranslateModule } from '@ngx-translate/core';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { TestBed } from '@angular/core/testing';
@@ -26,14 +26,13 @@ declare let jasmine: any;
 describe('AuditService', () => {
     let service: AuditService;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            ContentTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                ContentTestingModule
+            ]
+        });
         const appConfig: AppConfigService = TestBed.inject(AppConfigService);
         appConfig.config = {
             ecmHost: 'http://localhost:9876/ecm',

diff --git a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.spec.ts b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.spec.ts
@@ -18,7 +18,6 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Node } from '@alfresco/js-api';
-import { setupTestBed } from '@alfresco/adf-core';
 import { fakeNodeWithCreatePermission } from '../mock';
 import { DocumentListComponent, DocumentListService } from '../document-list';
 import { BreadcrumbComponent } from './breadcrumb.component';
@@ -36,16 +35,15 @@ describe('Breadcrumb', () => {
     });
     let documentListComponent: DocumentListComponent;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            ContentTestingModule
-        ],
-        schemas: [CUSTOM_ELEMENTS_SCHEMA],
-        providers : [{ provide: DocumentListService, useValue: documentListService }]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                ContentTestingModule
+            ],
+            schemas: [CUSTOM_ELEMENTS_SCHEMA],
+            providers : [{ provide: DocumentListService, useValue: documentListService }]
+        });
         fixture = TestBed.createComponent(BreadcrumbComponent);
         component = fixture.componentInstance;
         documentListComponent = TestBed.createComponent<DocumentListComponent>(DocumentListComponent).componentInstance;

diff --git a/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.spec.ts b/lib/content-services/src/lib/breadcrumb/dropdown-breadcrumb.component.spec.ts
@@ -18,7 +18,6 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { setupTestBed } from '@alfresco/adf-core';
 import { fakeNodeWithCreatePermission } from '../mock';
 import { DocumentListComponent, DocumentListService } from '../document-list';
 import { DropdownBreadcrumbComponent } from './dropdown-breadcrumb.component';
@@ -33,16 +32,15 @@ describe('DropdownBreadcrumb', () => {
     let documentList: DocumentListComponent;
     let documentListService: DocumentListService = jasmine.createSpyObj({ loadFolderByNodeId: of(''), isCustomSourceService: false });
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            ContentTestingModule
-        ],
-        schemas: [CUSTOM_ELEMENTS_SCHEMA],
-        providers: [{ provide: DocumentListService, useValue: documentListService }]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                ContentTestingModule
+            ],
+            schemas: [CUSTOM_ELEMENTS_SCHEMA],
+            providers: [{ provide: DocumentListService, useValue: documentListService }]
+        });
         fixture = TestBed.createComponent(DropdownBreadcrumbComponent);
         component = fixture.componentInstance;
         documentList = TestBed.createComponent<DocumentListComponent>(DocumentListComponent).componentInstance;

diff --git a/lib/content-services/src/lib/common/services/content.service.spec.ts b/lib/content-services/src/lib/common/services/content.service.spec.ts
@@ -17,7 +17,7 @@
 
 import { TestBed } from '@angular/core/testing';
 import { ContentService } from './content.service';
-import { AppConfigService, AuthenticationService, StorageService, setupTestBed, CoreTestingModule } from '@alfresco/adf-core';
+import { AppConfigService, AuthenticationService, StorageService, CoreTestingModule } from '@alfresco/adf-core';
 import { Node } from '@alfresco/js-api';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -32,14 +32,13 @@ describe('ContentService', () => {
 
     const nodeId = 'fake-node-id';
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         authService = TestBed.inject(AuthenticationService);
         contentService = TestBed.inject(ContentService);
         storage = TestBed.inject(StorageService);

diff --git a/lib/content-services/src/lib/common/services/sites.service.spec.ts b/lib/content-services/src/lib/common/services/sites.service.spec.ts
@@ -16,24 +16,22 @@
  */
 
 import { TestBed } from '@angular/core/testing';
-import { AppConfigService, setupTestBed, CoreTestingModule } from '@alfresco/adf-core';
+import { AppConfigService, CoreTestingModule } from '@alfresco/adf-core';
 import { SitesService } from './sites.service';
 import { TranslateModule } from '@ngx-translate/core';
 
 declare let jasmine: any;
 
 describe('Sites service', () => {
-
-    let service;
-
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule
-        ]
-    });
+    let service: SitesService;
 
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule
+            ]
+        });
         const appConfig: AppConfigService = TestBed.inject(AppConfigService);
         appConfig.config = {
             ecmHost: 'http://localhost:9876/ecm',

diff --git a/lib/content-services/src/lib/common/services/upload.service.spec.ts b/lib/content-services/src/lib/common/services/upload.service.spec.ts
@@ -17,7 +17,7 @@
 
 import { EventEmitter } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { AppConfigModule, AppConfigService, setupTestBed, CoreTestingModule } from '@alfresco/adf-core';
+import { AppConfigModule, AppConfigService, CoreTestingModule } from '@alfresco/adf-core';
 import { UploadService } from './upload.service';
 import { RepositoryInfo } from '@alfresco/js-api';
 import { TranslateModule } from '@ngx-translate/core';
@@ -34,23 +34,22 @@ describe('UploadService', () => {
 
     const mockProductInfo = new BehaviorSubject<RepositoryInfo>(null);
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            CoreTestingModule,
-            AppConfigModule
-        ],
-        providers: [
-            {
-                provide: DiscoveryApiService,
-                useValue: {
-                    ecmProductInfo$: mockProductInfo
-                }
-            }
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                CoreTestingModule,
+                AppConfigModule
+            ],
+            providers: [
+                {
+                    provide: DiscoveryApiService,
+                    useValue: {
+                        ecmProductInfo$: mockProductInfo
+                    }
+                }
+            ]
+        });
         appConfigService = TestBed.inject(AppConfigService);
         appConfigService.config = {
             ecmHost: 'http://localhost:9876/ecm',

diff --git a/...content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts b/...content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts
@@ -20,7 +20,6 @@ import { By } from '@angular/platform-browser';
 import { Node } from '@alfresco/js-api';
 import { ContentMetadataCardComponent } from './content-metadata-card.component';
 import { ContentMetadataComponent } from '../content-metadata/content-metadata.component';
-import { setupTestBed } from '@alfresco/adf-core';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 import { SimpleChange } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -38,14 +37,13 @@ describe('ContentMetadataCardComponent', () => {
     const preset = 'custom-preset';
     let nodeAspectService: NodeAspectService = null;
 
-    setupTestBed({
-        imports: [
-            TranslateModule.forRoot(),
-            ContentTestingModule
-        ]
-    });
-
     beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                ContentTestingModule
+            ]
+        });
         fixture = TestBed.createComponent(ContentMetadataCardComponent);
         contentMetadataService = TestBed.inject(ContentMetadataService);
         component = fixture.componentInstance;