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 index d687f047b6..83c318da3a 100644 --- 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 index a5d56fe849..44b3768775 100644 --- 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 index 2009c306f0..a949a4f8c6 100644 --- 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 index 21e8f9ee4c..dad1a0330e 100644 --- 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 index 73456d490f..65e1a2dddc 100644 --- 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).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 index 9bb1d6210f..1552ed7084 100644 --- 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).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 index 6ccf428e98..f73838d4ec 100644 --- 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 index cff3313dc6..915a6b1c20 100644 --- 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 index 40549d5db4..15893ab5a8 100644 --- 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(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/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts index 883444c8c0..3e4bab59b2 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.spec.ts +++ b/lib/content-services/src/lib/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; diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts index 1703d30a18..1db41f65e8 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata/content-metadata.component.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ComponentFixture, TestBed, tick, fakeAsync } from '@angular/core/testing'; +import { ComponentFixture, TestBed, tick, fakeAsync, discardPeriodicTasks, flush } from '@angular/core/testing'; import { DebugElement, SimpleChange } from '@angular/core'; import { By } from '@angular/platform-browser'; import { Category, CategoryPaging, ClassesApi, MinimalNode, Node, Tag, TagBody, TagEntry, TagPaging, TagPagingList } from '@alfresco/js-api'; @@ -23,7 +23,7 @@ import { ContentMetadataComponent } from './content-metadata.component'; import { ContentMetadataService } from '../../services/content-metadata.service'; import { CardViewBaseItemModel, CardViewComponent, - LogService, setupTestBed, AppConfigService, UpdateNotification + LogService, AppConfigService, UpdateNotification } from '@alfresco/adf-core'; import { NodesApiService } from '../../../common/services/nodes-api.service'; import { throwError, of, EMPTY } from 'rxjs'; @@ -100,37 +100,37 @@ describe('ContentMetadataComponent', () => { return fixture.debugElement.query(By.css('.adf-metadata-categories-title button')).nativeElement; } - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - { - provide: LogService, - useValue: { - error: jasmine.createSpy('error') - } - }, - { - provide: TagService, - useValue: { - getTagsByNodeId: () => EMPTY, - removeTag: () => EMPTY, - assignTagsToNode: () => EMPTY - } - }, - { - provide: CategoryService, - useValue: { - getCategoryLinksForNode: () => EMPTY, - linkNodeToCategory: () => EMPTY, - unlinkNodeFromCategory: () => EMPTY - } - }] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + { + provide: LogService, + useValue: { + error: jasmine.createSpy('error') + } + }, + { + provide: TagService, + useValue: { + getTagsByNodeId: () => EMPTY, + removeTag: () => EMPTY, + assignTagsToNode: () => EMPTY + } + }, + { + provide: CategoryService, + useValue: { + getCategoryLinksForNode: () => EMPTY, + linkNodeToCategory: () => EMPTY, + unlinkNodeFromCategory: () => EMPTY + } + } + ] + }); fixture = TestBed.createComponent(ContentMetadataComponent); component = fixture.componentInstance; contentMetadataService = TestBed.inject(ContentMetadataService); @@ -290,7 +290,7 @@ describe('ContentMetadataComponent', () => { expect(tagService.getTagsByNodeId).toHaveBeenCalledWith(node.id); })); - it('should throw error on unsuccessful save', fakeAsync((done) => { + it('should throw error on unsuccessful save', fakeAsync(() => { const logService: LogService = TestBed.inject(LogService); component.editable = true; const property = { key: 'properties.property-key', value: 'original-value' } as CardViewBaseItemModel; @@ -302,13 +302,14 @@ describe('ContentMetadataComponent', () => { expect(err.statusCode).toBe(0); expect(err.message).toBe('METADATA.ERRORS.GENERIC'); sub.unsubscribe(); - done(); }); spyOn(nodesApiService, 'updateNode').and.returnValue(throwError(new Error('My bad'))); fixture.detectChanges(); fixture.whenStable().then(() => clickOnSave()); + discardPeriodicTasks(); + flush(); })); it('should open the confirm dialog when content type is changed', fakeAsync(() => { @@ -329,6 +330,7 @@ describe('ContentMetadataComponent', () => { expect(component.node).toEqual(expectedNode); expect(contentMetadataService.openConfirmDialog).toHaveBeenCalledWith({nodeType: 'ft:poppoli'}); expect(nodesApiService.updateNode).toHaveBeenCalled(); + discardPeriodicTasks(); })); it('should call removeTag and assignTagsToNode on TagService after confirming confirmation dialog when content type is changed', fakeAsync(() => { @@ -1241,6 +1243,8 @@ describe('ContentMetadataComponent', () => { expect(categories[0].textContent).toBe(category1.name); expect(categories[1].textContent).toBe(category2.name); expect(categoryService.getCategoryLinksForNode).toHaveBeenCalledWith(node.id); + discardPeriodicTasks(); + flush(); })); it('should be hidden when editable is true', () => { @@ -1333,6 +1337,8 @@ describe('ContentMetadataComponent', () => { clickOnSave(); expect(categoriesManagementComponent.disableRemoval).toBeFalse(); + discardPeriodicTasks(); + flush(); })); it('should set categoryNameControlVisible to false after saving', () => { diff --git a/lib/content-services/src/lib/content-metadata/services/config/content-metadata-config.factory.spec.ts b/lib/content-services/src/lib/content-metadata/services/config/content-metadata-config.factory.spec.ts index e4f7efa6ee..515412722b 100644 --- a/lib/content-services/src/lib/content-metadata/services/config/content-metadata-config.factory.spec.ts +++ b/lib/content-services/src/lib/content-metadata/services/config/content-metadata-config.factory.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { AppConfigService, LogService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService, LogService } from '@alfresco/adf-core'; import { IndifferentConfigService } from './indifferent-config.service'; import { AspectOrientedConfigService } from './aspect-oriented-config.service'; import { LayoutOrientedConfigService } from './layout-oriented-config.service'; @@ -30,20 +30,19 @@ describe('ContentMetadataConfigFactory', () => { let appConfig: AppConfigService; let config: ContentMetadataConfig; - setupTestBed({ - imports: [ - HttpClientModule - ], - providers: [ - { - provide: LogService, useValue: { - error: () => {} - } - } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientModule + ], + providers: [ + { + provide: LogService, useValue: { + error: () => {} + } + } + ] + }); factory = TestBed.inject(ContentMetadataConfigFactory); appConfig = TestBed.inject(AppConfigService); }); diff --git a/lib/content-services/src/lib/content-metadata/services/content-metadata.service.spec.ts b/lib/content-services/src/lib/content-metadata/services/content-metadata.service.spec.ts index 07289811ae..bd031b9873 100644 --- a/lib/content-services/src/lib/content-metadata/services/content-metadata.service.spec.ts +++ b/lib/content-services/src/lib/content-metadata/services/content-metadata.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { ClassesApi, Node } from '@alfresco/js-api'; import { TestBed } from '@angular/core/testing'; import { ContentMetadataService } from './content-metadata.service'; @@ -138,10 +138,6 @@ describe('ContentMetaDataService', () => { } }; - setupTestBed({ - imports: [TranslateModule.forRoot(), ContentTestingModule] - }); - const setConfig = (presetName, presetConfig) => { appConfig.config['content-metadata'] = { presets: { @@ -151,6 +147,9 @@ describe('ContentMetaDataService', () => { }; beforeEach(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), ContentTestingModule] + }); service = TestBed.inject(ContentMetadataService); contentPropertyService = TestBed.inject(ContentTypePropertiesService); const propertyDescriptorsService = TestBed.inject( diff --git a/lib/content-services/src/lib/content-metadata/services/content-type-property.service.spec.ts b/lib/content-services/src/lib/content-metadata/services/content-type-property.service.spec.ts index f5a03079ae..6281c2abcc 100644 --- a/lib/content-services/src/lib/content-metadata/services/content-type-property.service.spec.ts +++ b/lib/content-services/src/lib/content-metadata/services/content-type-property.service.spec.ts @@ -17,7 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { ContentTypePropertiesService } from './content-type-property.service'; -import { CardViewItem, CardViewSelectItemModel, CardViewTextItemModel, setupTestBed } from '@alfresco/adf-core'; +import { CardViewItem, CardViewSelectItemModel, CardViewTextItemModel } from '@alfresco/adf-core'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; import { ContentTypeService } from '../../content-type'; @@ -114,14 +114,13 @@ describe('ContentTypePropertyService', () => { } ]; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); service = TestBed.inject(ContentTypePropertiesService); versionCompatibilityService = TestBed.inject(VersionCompatibilityService); contentTypeService = TestBed.inject(ContentTypeService); diff --git a/lib/content-services/src/lib/content-metadata/services/property-descriptors.service.spec.ts b/lib/content-services/src/lib/content-metadata/services/property-descriptors.service.spec.ts index 6259b65246..f50c8cfaf9 100644 --- a/lib/content-services/src/lib/content-metadata/services/property-descriptors.service.spec.ts +++ b/lib/content-services/src/lib/content-metadata/services/property-descriptors.service.spec.ts @@ -17,7 +17,6 @@ import { TestBed } from '@angular/core/testing'; import { PropertyDescriptorsService } from './property-descriptors.service'; -import { setupTestBed } from '@alfresco/adf-core'; import { ClassesApi } from '@alfresco/js-api'; import { PropertyGroup } from '../interfaces/content-metadata.interfaces'; import { ContentTestingModule } from '../../testing/content.testing.module'; @@ -28,14 +27,13 @@ describe('PropertyDescriptorLoaderService', () => { let service: PropertyDescriptorsService; let classesApi: ClassesApi; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); service = TestBed.inject(PropertyDescriptorsService); classesApi = service['classesApi']; }); diff --git a/lib/content-services/src/lib/content-metadata/services/property-groups-translator.service.spec.ts b/lib/content-services/src/lib/content-metadata/services/property-groups-translator.service.spec.ts index 8ca3abc074..dad4c454f1 100644 --- a/lib/content-services/src/lib/content-metadata/services/property-groups-translator.service.spec.ts +++ b/lib/content-services/src/lib/content-metadata/services/property-groups-translator.service.spec.ts @@ -29,7 +29,6 @@ import { CardViewBoolItemModel, CardViewDatetimeItemModel, CardViewSelectItemModel, - setupTestBed, CardViewSelectItemProperties } from '@alfresco/adf-core'; import { ContentTestingModule } from '../../testing/content.testing.module'; @@ -45,14 +44,13 @@ describe('PropertyGroupTranslatorService', () => { let propertyValues: { [key: string]: any }; let logService: LogService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); logService = TestBed.inject(LogService); service = TestBed.inject(PropertyGroupTranslatorService); diff --git a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts index 8edee7d400..3bedd23dec 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.spec.ts @@ -17,7 +17,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing'; import { NodeEntry, Node, SitePaging, Site } from '@alfresco/js-api'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { DocumentListService } from '../document-list/services/document-list.service'; import { ContentNodeDialogService } from './content-node-dialog.service'; import { MatDialog } from '@angular/material/dialog'; @@ -69,14 +69,13 @@ describe('ContentNodeDialogService', () => { let spyOnDialogOpen: jasmine.Spy; let afterOpenObservable: Subject; - 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/content-node-selector/content-node-selector-panel.component-search.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component-search.spec.ts index 367f5a72cd..edcc847a5b 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component-search.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component-search.spec.ts @@ -16,7 +16,7 @@ */ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; +import { ComponentFixture, fakeAsync, flush, TestBed, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { MinimalNode, @@ -28,7 +28,6 @@ import { SiteEntry, SitePaging } from '@alfresco/js-api'; -import { setupTestBed } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component'; import { ContentTestingModule } from '../testing/content.testing.module'; @@ -83,12 +82,14 @@ describe('ContentNodeSelectorPanelComponent', () => { component.queryBuilderService.executed.next(searchResults); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); }); describe('General component features', () => { @@ -518,6 +519,7 @@ describe('ContentNodeSelectorPanelComponent', () => { expect(searchSpy.calls.count()).toBe(1, 'no other search has been performed'); expect(component.clearSearch).toHaveBeenCalled(); expect(component.folderIdToShow).toBe('cat-girl-nuku-nuku', 'back to the folder in which the search was performed'); + flush(); })); it('should folderIdToShow equal the folder node id when navigation changes', async () => { @@ -692,6 +694,7 @@ describe('ContentNodeSelectorPanelComponent', () => { fixture.detectChanges(); expect(component.folderIdToShow).toBe('cat-girl-nuku-nuku'); + flush(); })); it('should set the folderIdToShow to the default "currentFolderId" if siteId is undefined', (done) => { diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts index 003d20b5bc..d9e15a287b 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts @@ -30,7 +30,6 @@ import { } from '@alfresco/js-api'; import { AppConfigService, - setupTestBed, DataRow, ThumbnailService, DataColumn @@ -90,12 +89,14 @@ describe('ContentNodeSelectorPanelComponent', () => { component.queryBuilderService.executed.next(searchResults); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); }); describe('General component features', () => { diff --git a/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.spec.ts b/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.spec.ts index 744ab9b4bc..4164fc82f8 100644 --- a/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/name-location-cell/name-location-cell.component.spec.ts @@ -18,20 +18,19 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NameLocationCellComponent } from './name-location-cell.component'; import { By } from '@angular/platform-browser'; -import { DataRow, setupTestBed } from '@alfresco/adf-core'; +import { DataRow } from '@alfresco/adf-core'; describe('NameLocationCellComponent', () => { let component: NameLocationCellComponent; let fixture: ComponentFixture; let rowData: DataRow; - setupTestBed({ - declarations: [ - NameLocationCellComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [ + NameLocationCellComponent + ] + }); fixture = TestBed.createComponent(NameLocationCellComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts index aa17896060..907d659765 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts @@ -18,11 +18,7 @@ import { TestBed, fakeAsync, ComponentFixture, tick } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog'; import { of } from 'rxjs'; -import { - setupTestBed, - NotificationService, - AppConfigService -} from '@alfresco/adf-core'; +import { NotificationService, AppConfigService } from '@alfresco/adf-core'; import { NodesApiService } from '../common/services/nodes-api.service'; import { RenditionService } from '../common/services/rendition.service'; @@ -52,24 +48,23 @@ describe('ShareDialogComponent', () => { const clickShareToggleButton = () => fixture.nativeElement.querySelector(`${shareToggleId} label`) .dispatchEvent(new MouseEvent('click')); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - {provide: NotificationService, useValue: notificationServiceMock}, - { - provide: MatDialogRef, useValue: { - close: () => { - } - } - }, - {provide: MAT_DIALOG_DATA, useValue: {}} - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + {provide: NotificationService, useValue: notificationServiceMock}, + { + provide: MatDialogRef, useValue: { + close: () => { + } + } + }, + {provide: MAT_DIALOG_DATA, useValue: {}} + ] + }); fixture = TestBed.createComponent(ShareDialogComponent); component = fixture.componentInstance; component.maxDebounceTime = 0; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts index 873f42ac44..d2fc9f6ccf 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts @@ -20,7 +20,7 @@ import { By } from '@angular/platform-browser'; import { Component } from '@angular/core'; import { DOCUMENT } from '@angular/common'; import { ContentTestingModule } from '../testing/content.testing.module'; -import { setupTestBed, CoreModule } from '@alfresco/adf-core'; +import { CoreModule } from '@alfresco/adf-core'; import { ContentNodeShareModule } from './content-node-share.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -50,19 +50,18 @@ describe('NodeSharedDirective', () => { let shareButtonElement; let selection; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreModule.forRoot(), - ContentTestingModule, - ContentNodeShareModule - ], - declarations: [ - NodeShareTestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreModule.forRoot(), + ContentTestingModule, + ContentNodeShareModule + ], + declarations: [ + NodeShareTestComponent + ] + }); fixture = TestBed.createComponent(NodeShareTestComponent); document = TestBed.inject(DOCUMENT); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts b/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts index 829765830c..3d82c178f1 100644 --- a/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts +++ b/lib/content-services/src/lib/content-user-info/content-user-info.component.spec.ts @@ -15,13 +15,7 @@ * limitations under the License. */ -import { - CoreTestingModule, - IdentityUserModel, - InitialUsernamePipe, - setupTestBed, - UserInfoMode -} from '@alfresco/adf-core'; +import { CoreTestingModule, IdentityUserModel, InitialUsernamePipe, UserInfoMode } from '@alfresco/adf-core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatMenuModule } from '@angular/material/menu'; import { By, DomSanitizer } from '@angular/platform-browser'; @@ -85,16 +79,15 @@ describe('ContentUserInfoComponent', () => { fixture.detectChanges(); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - ContentTestingModule, - MatMenuModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + ContentTestingModule, + MatMenuModule + ] + }); fixture = TestBed.createComponent(ContentUserInfoComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts b/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts index 6bf9a55b5d..aa69747195 100644 --- a/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts @@ -17,7 +17,6 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { setupTestBed } from '@alfresco/adf-core'; import { ConfirmDialogComponent } from './confirm.dialog'; import { ContentTestingModule } from '../testing/content.testing.module'; import { By } from '@angular/platform-browser'; @@ -38,18 +37,17 @@ describe('Confirm Dialog Component', () => { noLabel: 'MAYBE NO' }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - { provide: MatDialogRef, useValue: dialogRef }, - { provide: MAT_DIALOG_DATA, useValue: data } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + { provide: MatDialogRef, useValue: dialogRef }, + { provide: MAT_DIALOG_DATA, useValue: data } + ] + }); dialogRef.close.calls.reset(); fixture = TestBed.createComponent(ConfirmDialogComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts index 12e10a798e..579fc0b006 100755 --- a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts @@ -18,7 +18,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { DownloadZipDialogComponent } from './download-zip.dialog'; -import { CoreTestingModule, setupTestBed } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { DownloadZipService } from './services/download-zip.service'; import { Observable } from 'rxjs'; import { TranslateModule } from '@ngx-translate/core'; @@ -39,18 +39,17 @@ describe('DownloadZipDialogComponent', () => { ] }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ], - providers: [ - { provide: MatDialogRef, useValue: dialogRef }, - { provide: MAT_DIALOG_DATA, useValue: dataMock } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ], + providers: [ + { provide: MatDialogRef, useValue: dialogRef }, + { provide: MAT_DIALOG_DATA, useValue: dataMock } + ] + }); dialogRef.close.calls.reset(); fixture = TestBed.createComponent(DownloadZipDialogComponent); downloadZipService = TestBed.inject(DownloadZipService); diff --git a/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts b/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts index fe7b64e279..e0df827bf5 100644 --- a/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts @@ -17,7 +17,6 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material/dialog'; -import { setupTestBed } from '@alfresco/adf-core'; import { NodesApiService } from '../common/services/nodes-api.service'; import { FolderDialogComponent } from './folder.dialog'; @@ -34,17 +33,16 @@ describe('FolderDialogComponent', () => { close: jasmine.createSpy('close') }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - { provide: MatDialogRef, useValue: dialogRef } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + { provide: MatDialogRef, useValue: dialogRef } + ] + }); dialogRef.close.calls.reset(); fixture = TestBed.createComponent(FolderDialogComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts b/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts index 5d199617e5..9f53574f14 100644 --- a/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts @@ -19,7 +19,6 @@ import { LibraryDialogComponent } from './library.dialog'; import { TestBed, fakeAsync, tick, flush, ComponentFixture, flushMicrotasks } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA } from '@angular/core'; import { MatDialogRef } from '@angular/material/dialog'; -import { setupTestBed } from '@alfresco/adf-core'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; import { of, throwError } from 'rxjs'; @@ -37,18 +36,17 @@ describe('LibraryDialogComponent', () => { close: jasmine.createSpy('close') }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - { provide: MatDialogRef, useValue: dialogRef } - ], - schemas: [NO_ERRORS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + { provide: MatDialogRef, useValue: dialogRef } + ], + schemas: [NO_ERRORS_SCHEMA] + }); fixture = TestBed.createComponent(LibraryDialogComponent); component = fixture.componentInstance; sitesService = TestBed.inject(SitesService); diff --git a/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts b/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts index e50355271d..583b75adbd 100644 --- a/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts @@ -19,7 +19,6 @@ import moment from 'moment'; import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material/dialog'; -import { setupTestBed } from '@alfresco/adf-core'; import { NodeLockDialogComponent } from './node-lock.dialog'; import { ContentTestingModule } from '../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -33,17 +32,16 @@ describe('NodeLockDialogComponent', () => { close: jasmine.createSpy('close') }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - { provide: MatDialogRef, useValue: dialogRef } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + { provide: MatDialogRef, useValue: dialogRef } + ] + }); fixture = TestBed.createComponent(NodeLockDialogComponent); component = fixture.componentInstance; }); diff --git a/lib/content-services/src/lib/directives/check-allowable-operation.directive.spec.ts b/lib/content-services/src/lib/directives/check-allowable-operation.directive.spec.ts index e6ea4bc4f6..878cad49b8 100644 --- a/lib/content-services/src/lib/directives/check-allowable-operation.directive.spec.ts +++ b/lib/content-services/src/lib/directives/check-allowable-operation.directive.spec.ts @@ -16,7 +16,7 @@ */ import { ChangeDetectorRef, Component, ElementRef, SimpleChange } from '@angular/core'; -import { CoreTestingModule, setupTestBed } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { ContentService } from '../common/services/content.service'; import { CheckAllowableOperationDirective } from './check-allowable-operation.directive'; import { TestBed } from '@angular/core/testing'; @@ -32,17 +32,15 @@ class TestComponent implements NodeAllowableOperationSubject { } describe('CheckAllowableOperationDirective', () => { - let changeDetectorMock: ChangeDetectorRef; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); changeDetectorMock = { detectChanges: () => {} } as ChangeDetectorRef; }); diff --git a/lib/content-services/src/lib/directives/node-delete.directive.spec.ts b/lib/content-services/src/lib/directives/node-delete.directive.spec.ts index 43308b83fc..63e63b4ac2 100644 --- a/lib/content-services/src/lib/directives/node-delete.directive.spec.ts +++ b/lib/content-services/src/lib/directives/node-delete.directive.spec.ts @@ -19,7 +19,7 @@ import { Component, DebugElement, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NodeDeleteDirective } from './node-delete.directive'; -import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { ContentDirectiveModule } from './content-directive.module'; @@ -88,20 +88,19 @@ describe('NodeDeleteDirective', () => { let deleteNodePermanentSpy: any; let purgeDeletedNodePermanentSpy: any; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - ContentDirectiveModule - ], - declarations: [ - TestComponent, - TestWithPermissionsComponent, - TestDeletePermanentComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + ContentDirectiveModule + ], + declarations: [ + TestComponent, + TestWithPermissionsComponent, + TestDeletePermanentComponent + ] + }); fixture = TestBed.createComponent(TestComponent); fixtureWithPermissions = TestBed.createComponent(TestWithPermissionsComponent); fixtureWithPermanentComponent = TestBed.createComponent(TestDeletePermanentComponent); diff --git a/lib/content-services/src/lib/directives/node-download.directive.spec.ts b/lib/content-services/src/lib/directives/node-download.directive.spec.ts index c4baf37b3f..18c897af38 100755 --- a/lib/content-services/src/lib/directives/node-download.directive.spec.ts +++ b/lib/content-services/src/lib/directives/node-download.directive.spec.ts @@ -19,7 +19,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { MatDialog } from '@angular/material/dialog'; import { Component, DebugElement, ViewChild } from '@angular/core'; -import { setupTestBed, AlfrescoApiService, CoreTestingModule } from '@alfresco/adf-core'; +import { AlfrescoApiService, CoreTestingModule } from '@alfresco/adf-core'; import { NodeDownloadDirective } from './node-download.directive'; import { TranslateModule } from '@ngx-translate/core'; import { ContentDirectiveModule } from '@alfresco/adf-content-services'; @@ -51,18 +51,17 @@ describe('NodeDownloadDirective', () => { reply: jasmine.createSpy('reply') }; - setupTestBed({ - imports: [ - ContentDirectiveModule, - TranslateModule.forRoot(), - CoreTestingModule - ], - declarations: [ - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + ContentDirectiveModule, + TranslateModule.forRoot(), + CoreTestingModule + ], + declarations: [ + TestComponent + ] + }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; element = fixture.debugElement.query(By.directive(NodeDownloadDirective)); diff --git a/lib/content-services/src/lib/directives/node-favorite.directive.spec.ts b/lib/content-services/src/lib/directives/node-favorite.directive.spec.ts index 3ba0f218f9..6188d3e299 100644 --- a/lib/content-services/src/lib/directives/node-favorite.directive.spec.ts +++ b/lib/content-services/src/lib/directives/node-favorite.directive.spec.ts @@ -19,21 +19,20 @@ import { SimpleChange } from '@angular/core'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { NodeFavoriteDirective } from './node-favorite.directive'; import { TranslateModule } from '@ngx-translate/core'; -import { AlfrescoApiService, CoreTestingModule, setupTestBed } from '@alfresco/adf-core'; +import { AlfrescoApiService, CoreTestingModule } from '@alfresco/adf-core'; describe('NodeFavoriteDirective', () => { let directive: NodeFavoriteDirective; let alfrescoApiService: AlfrescoApiService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); alfrescoApiService = TestBed.inject(AlfrescoApiService); directive = new NodeFavoriteDirective( alfrescoApiService); }); diff --git a/lib/content-services/src/lib/directives/node-lock.directive.spec.ts b/lib/content-services/src/lib/directives/node-lock.directive.spec.ts index 795c3f8a22..db98e35e82 100644 --- a/lib/content-services/src/lib/directives/node-lock.directive.spec.ts +++ b/lib/content-services/src/lib/directives/node-lock.directive.spec.ts @@ -18,11 +18,9 @@ import { TestBed, ComponentFixture, fakeAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Component, DebugElement } from '@angular/core'; - import { NodeLockDirective } from './node-lock.directive'; import { Node } from '@alfresco/js-api'; import { ContentNodeDialogService } from '../content-node-selector/content-node-dialog.service'; -import { setupTestBed } from '@alfresco/adf-core'; import { ContentTestingModule } from '../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -45,17 +43,16 @@ describe('NodeLock Directive', () => { let element: DebugElement; let contentNodeDialogService: ContentNodeDialogService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - declarations: [ - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + declarations: [ + TestComponent + ] + }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; element = fixture.debugElement.query(By.directive(NodeLockDirective)); diff --git a/lib/content-services/src/lib/directives/node-restore.directive.spec.ts b/lib/content-services/src/lib/directives/node-restore.directive.spec.ts index ac0c500cb5..1a86697f05 100644 --- a/lib/content-services/src/lib/directives/node-restore.directive.spec.ts +++ b/lib/content-services/src/lib/directives/node-restore.directive.spec.ts @@ -20,7 +20,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NodeRestoreDirective } from './node-restore.directive'; import { TranslateModule } from '@ngx-translate/core'; -import { TranslationService, setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { TranslationService, CoreTestingModule } from '@alfresco/adf-core'; import { ContentDirectiveModule } from './content-directive.module'; @Component({ @@ -44,18 +44,17 @@ describe('NodeRestoreDirective', () => { let restoreNodeSpy: any; let translationService: TranslationService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - ContentDirectiveModule - ], - declarations: [ - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + ContentDirectiveModule + ], + declarations: [ + TestComponent + ] + }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; element = fixture.debugElement.query(By.directive(NodeRestoreDirective)); diff --git a/lib/content-services/src/lib/document-list/components/content-action/content-action-list.component.spec.ts b/lib/content-services/src/lib/document-list/components/content-action/content-action-list.component.spec.ts index 054bb6ab48..64523fc0e8 100644 --- a/lib/content-services/src/lib/document-list/components/content-action/content-action-list.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/content-action/content-action-list.component.spec.ts @@ -17,7 +17,6 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { ContentActionModel } from './../../models/content-action.model'; import { DocumentListComponent } from './../document-list.component'; import { ContentActionListComponent } from './content-action-list.component'; @@ -29,15 +28,14 @@ describe('ContentColumnList', () => { let documentList: DocumentListComponent; let actionList: ContentActionListComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); documentList = (TestBed.createComponent(DocumentListComponent).componentInstance as DocumentListComponent); actionList = new ContentActionListComponent(documentList); }); diff --git a/lib/content-services/src/lib/document-list/components/content-action/content-action.component.spec.ts b/lib/content-services/src/lib/document-list/components/content-action/content-action.component.spec.ts index bd026b66a5..7a94fd53c5 100644 --- a/lib/content-services/src/lib/document-list/components/content-action/content-action.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/content-action/content-action.component.spec.ts @@ -17,7 +17,6 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, EventEmitter } from '@angular/core'; import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { FileNode } from '../../../mock'; import { ContentActionModel } from './../../models/content-action.model'; import { DocumentActionsService } from './../../services/document-actions.service'; @@ -39,15 +38,14 @@ describe('ContentAction', () => { let contentService: ContentService; let nodeActionsService: NodeActionsService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); contentService = TestBed.inject(ContentService); nodeActionsService = new NodeActionsService(null, null, null); documentActions = new DocumentActionsService(nodeActionsService, null, null, null); diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts index f64706c49d..1b2104240e 100644 --- a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts @@ -18,7 +18,6 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, QueryList, Component, ViewChild, SimpleChanges } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { - setupTestBed, AlfrescoApiService, DataColumnListComponent, DataColumnComponent, @@ -86,18 +85,17 @@ describe('DocumentList', () => { let spyFolder: any; let spyFolderNode: any; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA], - providers: [ - { provide: MatDialog, useValue: mockDialog } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + providers: [ + { provide: MatDialog, useValue: mockDialog } + ] + }); eventMock = { preventDefault: () => {} }; @@ -1839,17 +1837,16 @@ describe('DocumentListComponent rendering', () => { let component: CustomTemplateComponent; let element: HTMLElement; - setupTestBed({ - declarations: [CustomTemplateComponent], - imports: [ - TranslateModule.forRoot(), - ContentTestingModule, - DataTableModule, - DocumentListModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [CustomTemplateComponent], + imports: [ + TranslateModule.forRoot(), + ContentTestingModule, + DataTableModule, + DocumentListModule + ] + }); fixture = TestBed.createComponent(CustomTemplateComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.spec.ts b/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.spec.ts index 1d825b8aaa..aa9b5e85bd 100644 --- a/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.spec.ts @@ -18,7 +18,7 @@ import { Subject, BehaviorSubject } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { setupTestBed, DataTableComponent, DataSorting } from '@alfresco/adf-core'; +import { DataTableComponent, DataSorting } from '@alfresco/adf-core'; import { SearchService } from '../../../search/services/search.service'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { SimpleChange } from '@angular/core'; @@ -48,21 +48,20 @@ describe('FilterHeaderComponent', () => { reload: () => jasmine.createSpy('reload') }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - { provide: ADF_DOCUMENT_PARENT_COMPONENT, useExisting: DocumentListComponent }, - { provide: SearchService, useValue: searchMock }, - { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchHeaderQueryBuilderService }, - { provide: DocumentListComponent, useValue: documentListMock }, - DataTableComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + { provide: ADF_DOCUMENT_PARENT_COMPONENT, useExisting: DocumentListComponent }, + { provide: SearchService, useValue: searchMock }, + { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchHeaderQueryBuilderService }, + { provide: DocumentListComponent, useValue: documentListMock }, + DataTableComponent + ] + }); fixture = TestBed.createComponent(FilterHeaderComponent); component = fixture.componentInstance; queryBuilder = fixture.componentInstance['searchFilterQueryBuilder']; diff --git a/lib/content-services/src/lib/document-list/components/library-name-column/library-name-column.component.spec.ts b/lib/content-services/src/lib/document-list/components/library-name-column/library-name-column.component.spec.ts index 854ad58819..468208b6ed 100644 --- a/lib/content-services/src/lib/document-list/components/library-name-column/library-name-column.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/library-name-column/library-name-column.component.spec.ts @@ -17,7 +17,6 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { setupTestBed } from '@alfresco/adf-core'; import { LibraryNameColumnComponent } from './library-name-column.component'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -27,24 +26,20 @@ describe('LibraryNameColumnComponent', () => { let component: LibraryNameColumnComponent; let node; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA] + }); node = { id: 'nodeId', path: { elements: [] } }; - }); - - beforeEach(() => { fixture = TestBed.createComponent(LibraryNameColumnComponent); component = fixture.componentInstance; }); diff --git a/lib/content-services/src/lib/document-list/components/library-role-column/library-role-column.component.spec.ts b/lib/content-services/src/lib/document-list/components/library-role-column/library-role-column.component.spec.ts index 18c50eb577..558a82a66c 100644 --- a/lib/content-services/src/lib/document-list/components/library-role-column/library-role-column.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/library-role-column/library-role-column.component.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { setupTestBed } from '@alfresco/adf-core'; import { LibraryRoleColumnComponent } from './library-role-column.component'; import { TestBed, ComponentFixture } from '@angular/core/testing'; import { NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; @@ -26,15 +25,14 @@ describe('LibraryRoleColumnComponent', () => { let fixture: ComponentFixture; let component: LibraryRoleColumnComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA] + }); fixture = TestBed.createComponent(LibraryRoleColumnComponent); component = fixture.componentInstance; }); diff --git a/lib/content-services/src/lib/document-list/data/share-datatable-adapter.spec.ts b/lib/content-services/src/lib/document-list/data/share-datatable-adapter.spec.ts index 9bd3cf03ce..6f7a8b938a 100644 --- a/lib/content-services/src/lib/document-list/data/share-datatable-adapter.spec.ts +++ b/lib/content-services/src/lib/document-list/data/share-datatable-adapter.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { DataColumn, DataRow, DataSorting, ThumbnailService, setupTestBed } from '@alfresco/adf-core'; +import { DataColumn, DataRow, DataSorting, ThumbnailService } from '@alfresco/adf-core'; import { FileNode, FolderNode, SmartFolderNode, RuleFolderNode, LinkFolderNode } from './../../mock'; import { ERR_OBJECT_NOT_FOUND, ShareDataRow } from './share-data-row.model'; import { ERR_COL_NOT_FOUND, ERR_ROW_NOT_FOUND, ShareDataTableAdapter } from './share-datatable-adapter'; @@ -29,14 +29,13 @@ describe('ShareDataTableAdapter', () => { let thumbnailService: ThumbnailService; let contentService: ContentService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); const imageUrl: string = 'http://'; contentService = TestBed.inject(ContentService); diff --git a/lib/content-services/src/lib/document-list/services/document-actions.service.spec.ts b/lib/content-services/src/lib/document-list/services/document-actions.service.spec.ts index c1614dd7c6..54acf8decb 100644 --- a/lib/content-services/src/lib/document-list/services/document-actions.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/document-actions.service.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { setupTestBed } from '@alfresco/adf-core'; import { FileNode, FolderNode } from '../../mock'; import { ContentActionHandler } from '../models/content-action.model'; import { DocumentActionsService } from './document-actions.service'; @@ -30,14 +29,13 @@ describe('DocumentActionsService', () => { let service: DocumentActionsService; let documentListService: DocumentListService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); documentListService = TestBed.inject(DocumentListService); service = TestBed.inject(DocumentActionsService); }); diff --git a/lib/content-services/src/lib/document-list/services/document-list.service.spec.ts b/lib/content-services/src/lib/document-list/services/document-list.service.spec.ts index 0af5976686..c37f6a3f34 100644 --- a/lib/content-services/src/lib/document-list/services/document-list.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/document-list.service.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { setupTestBed } from '@alfresco/adf-core'; import { DocumentListService } from './document-list.service'; import { fakeAsync, TestBed } from '@angular/core/testing'; import { ContentTestingModule } from '../../testing/content.testing.module'; @@ -61,14 +60,13 @@ describe('DocumentListService', () => { } }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); service = TestBed.inject(DocumentListService); jasmine.Ajax.install(); }); diff --git a/lib/content-services/src/lib/document-list/services/folder-actions.service.spec.ts b/lib/content-services/src/lib/document-list/services/folder-actions.service.spec.ts index 6a4da0a640..236a909e24 100644 --- a/lib/content-services/src/lib/document-list/services/folder-actions.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/folder-actions.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { Observable } from 'rxjs'; import { FileNode, FolderNode } from '../../mock'; import { ContentActionHandler } from '../models/content-action.model'; @@ -30,14 +30,13 @@ describe('FolderActionsService', () => { let service: FolderActionsService; let documentListService: DocumentListService; - 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/document-list/services/lock.service.spec.ts b/lib/content-services/src/lib/document-list/services/lock.service.spec.ts index 04480b2bf0..c4afc940ee 100644 --- a/lib/content-services/src/lib/document-list/services/lock.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/lock.service.spec.ts @@ -17,7 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { LockService } from './lock.service'; -import { CoreTestingModule, setupTestBed, AlfrescoApiService } from '@alfresco/adf-core'; +import { CoreTestingModule, AlfrescoApiService } from '@alfresco/adf-core'; import { Node } from '@alfresco/js-api'; import moment from 'moment'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,14 +31,13 @@ describe('PeopleProcessService', () => { const fakeFolderNode: Node = { name: 'unlocked', isLocked: false, isFile: false, isFolder: true } as Node; const fakeNodeNoProperty: Node = { name: 'unlocked', isLocked: true, isFile: true, properties: {} } as Node; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); service = TestBed.inject(LockService); apiService = TestBed.inject(AlfrescoApiService); }); diff --git a/lib/content-services/src/lib/document-list/services/node-actions.service.spec.ts b/lib/content-services/src/lib/document-list/services/node-actions.service.spec.ts index 339f1ed665..2bb86cbc10 100644 --- a/lib/content-services/src/lib/document-list/services/node-actions.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/node-actions.service.spec.ts @@ -17,7 +17,7 @@ import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { Node, NodeEntry } from '@alfresco/js-api'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { DocumentListService } from './document-list.service'; import { NodeActionsService } from './node-actions.service'; import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service'; @@ -40,17 +40,16 @@ describe('NodeActionsService', () => { open: jasmine.createSpy('open') }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - { provide: MatDialogRef, useValue: dialogRef } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + { provide: MatDialogRef, useValue: dialogRef } + ] + }); const appConfig: AppConfigService = TestBed.inject(AppConfigService); appConfig.config.ecmHost = 'http://localhost:9876/ecm'; diff --git a/lib/content-services/src/lib/folder-directive/folder-create.directive.spec.ts b/lib/content-services/src/lib/folder-directive/folder-create.directive.spec.ts index b06b4c79d3..650822ce62 100644 --- a/lib/content-services/src/lib/folder-directive/folder-create.directive.spec.ts +++ b/lib/content-services/src/lib/folder-directive/folder-create.directive.spec.ts @@ -20,8 +20,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { By } from '@angular/platform-browser'; import { Subject, of } from 'rxjs'; - -import { setupTestBed } from '@alfresco/adf-core'; import { FolderCreateDirective } from './folder-create.directive'; import { Node } from '@alfresco/js-api'; import { ContentTestingModule } from '../testing/content.testing.module'; @@ -63,25 +61,22 @@ describe('FolderCreateDirective', () => { const event = { type: 'click', preventDefault: () => null }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - declarations: [ - TestTypeComponent, - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + declarations: [ + TestTypeComponent, + TestComponent + ] + }); fixture = TestBed.createComponent(TestComponent); element = fixture.debugElement.query(By.directive(FolderCreateDirective)); dialog = TestBed.inject(MatDialog); contentService = TestBed.inject(ContentService); - }); - beforeEach(() => { dialogRefMock = { afterClosed: (val) => of(val), componentInstance: { @@ -92,7 +87,6 @@ describe('FolderCreateDirective', () => { }); describe('With overrides', () => { - beforeEach(() => { fixture = TestBed.createComponent(TestTypeComponent); element = fixture.debugElement.query(By.directive(FolderCreateDirective)); diff --git a/lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts b/lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts index 77bfcebc68..4edaec862f 100644 --- a/lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts +++ b/lib/content-services/src/lib/folder-directive/folder-edit.directive.spec.ts @@ -20,8 +20,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { By } from '@angular/platform-browser'; import { Subject, of } from 'rxjs'; - -import { setupTestBed } from '@alfresco/adf-core'; import { FolderEditDirective } from './folder-edit.directive'; import { Node } from '@alfresco/js-api'; import { ContentTestingModule } from '../testing/content.testing.module'; @@ -52,24 +50,21 @@ describe('FolderEditDirective', () => { preventDefault: () => null }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - declarations: [ - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + declarations: [ + TestComponent + ] + }); fixture = TestBed.createComponent(TestComponent); element = fixture.debugElement.query(By.directive(FolderEditDirective)); dialog = TestBed.inject(MatDialog); contentService = TestBed.inject(ContentService); - }); - beforeEach(() => { dialogRefMock = { afterClosed: (val) => of(val), componentInstance: { diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts index 816491c330..61c84183dd 100644 --- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts +++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.dialog.spec.ts @@ -18,7 +18,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TranslateModule } from '@ngx-translate/core'; -import { setupTestBed } from '@alfresco/adf-core'; import { mockFile, mockNode } from '../mock'; import { ContentTestingModule } from '../testing/content.testing.module'; import { UploadVersionButtonComponent } from '../upload'; @@ -44,27 +43,26 @@ describe('NewVersionUploaderDialog', () => { }; const showVersionsOnly = true; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - declarations: [ - NewVersionUploaderDialogComponent, - VersionListComponent, - VersionUploadComponent, - UploadVersionButtonComponent, - VersionComparisonComponent - ], - providers: [ - { provide: MAT_DIALOG_DATA, useValue: { node: mockNode, showVersionsOnly, file: mockFile } }, - { - provide: MatDialogRef, useValue: mockDialogRef - } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + declarations: [ + NewVersionUploaderDialogComponent, + VersionListComponent, + VersionUploadComponent, + UploadVersionButtonComponent, + VersionComparisonComponent + ], + providers: [ + { provide: MAT_DIALOG_DATA, useValue: { node: mockNode, showVersionsOnly, file: mockFile } }, + { + provide: MatDialogRef, useValue: mockDialogRef + } + ] + }); fixture = TestBed.createComponent(NewVersionUploaderDialogComponent); component = fixture.componentInstance; nativeElement = fixture.debugElement.nativeElement; diff --git a/lib/content-services/src/lib/node-comments/services/node-comments.service.spec.ts b/lib/content-services/src/lib/node-comments/services/node-comments.service.spec.ts index 6183c26720..7f2841827f 100644 --- a/lib/content-services/src/lib/node-comments/services/node-comments.service.spec.ts +++ b/lib/content-services/src/lib/node-comments/services/node-comments.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { CommentModel, setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CommentModel, CoreTestingModule } from '@alfresco/adf-core'; import { fakeContentComment, fakeContentComments } from '../mocks/node-comments.mock'; import { TranslateModule } from '@ngx-translate/core'; import { NodeCommentsService } from './node-comments.service'; @@ -27,14 +27,13 @@ describe('NodeCommentsService', () => { let service: NodeCommentsService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); service = TestBed.inject(NodeCommentsService); jasmine.Ajax.install(); diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts index 11f5b8b05a..7e1525055b 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-dialog.component.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { setupTestBed } from '@alfresco/adf-core'; import { Node, PermissionElement } from '@alfresco/js-api'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { ComponentFixture, TestBed } from '@angular/core/testing'; @@ -60,18 +59,17 @@ describe('AddPermissionDialog', () => { close: jasmine.createSpy('close') }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - { provide: MatDialogRef, useValue: dialogRef }, - { provide: MAT_DIALOG_DATA, useValue: data } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + { provide: MatDialogRef, useValue: dialogRef }, + { provide: MAT_DIALOG_DATA, useValue: data } + ] + }); fixture = TestBed.createComponent(AddPermissionDialogComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.spec.ts index 68f365cd74..2eda94b4b0 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission-panel.component.spec.ts @@ -18,7 +18,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AddPermissionPanelComponent } from './add-permission-panel.component'; import { By } from '@angular/platform-browser'; -import { setupTestBed } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { fakeAuthorityListResult, fakeNameListResult } from '../../../mock/add-permission.component.mock'; import { ContentTestingModule } from '../../../testing/content.testing.module'; @@ -34,15 +33,14 @@ describe('AddPermissionPanelComponent', () => { let searchApiService: SearchService; let debugElement: DebugElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule, - MatIconTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule, + MatIconTestingModule + ] + }); fixture = TestBed.createComponent(AddPermissionPanelComponent); searchApiService = fixture.componentRef.injector.get(SearchService); diff --git a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.spec.ts index bd28adf9cb..84013df843 100644 --- a/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/add-permission/add-permission.component.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { setupTestBed } from '@alfresco/adf-core'; import { Node } from '@alfresco/js-api'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AddPermissionComponent } from './add-permission.component'; @@ -33,14 +32,13 @@ describe('AddPermissionComponent', () => { let element: HTMLElement; let nodePermissionService: NodePermissionService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); nodePermissionService = TestBed.inject(NodePermissionService); const response: any = { node: { id: 'fake-node', allowableOperations: ['updatePermissions']}, roles: [{ label: 'Test' , role: 'test'}] }; spyOn(nodePermissionService, 'getNodeWithRoles').and.returnValue(of(response)); diff --git a/lib/content-services/src/lib/permission-manager/components/inherited-button.directive.spec.ts b/lib/content-services/src/lib/permission-manager/components/inherited-button.directive.spec.ts index f2ed357801..d96f0a8a31 100644 --- a/lib/content-services/src/lib/permission-manager/components/inherited-button.directive.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/inherited-button.directive.spec.ts @@ -17,7 +17,6 @@ import { SimpleInheritedPermissionTestComponent } from '../../mock/inherited-permission.component.mock'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -34,17 +33,16 @@ describe('InheritPermissionDirective', () => { let component: SimpleInheritedPermissionTestComponent; let nodeService: NodesApiService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - declarations: [ - SimpleInheritedPermissionTestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + declarations: [ + SimpleInheritedPermissionTestComponent + ] + }); fixture = TestBed.createComponent(SimpleInheritedPermissionTestComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.spec.ts index 71cb4a827e..a45fcc70a3 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/permission-container/permission-container.component.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { setupTestBed } from '@alfresco/adf-core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; @@ -28,14 +27,13 @@ describe('PermissionContainerComponent', () => { let component: PermissionContainerComponent; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(PermissionContainerComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.spec.ts index 264a567bf9..51e8502f48 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.component.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { setupTestBed } from '@alfresco/adf-core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; @@ -50,14 +49,13 @@ describe('PermissionListComponent', () => { let searchQuerySpy: jasmine.Spy; const fakeLocalPermission = JSON.parse(JSON.stringify(fakeNodeWithOnlyLocally)); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(PermissionListComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.service.spec.ts b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.service.spec.ts index 22bf1bbb73..2bb8f8595a 100644 --- a/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.service.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/permission-list/permission-list.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { NotificationService, setupTestBed } from '@alfresco/adf-core'; +import { NotificationService } from '@alfresco/adf-core'; import { NodesApiService } from '../../../common/services/nodes-api.service'; import { TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; @@ -38,14 +38,13 @@ describe('PermissionListService', () => { }) ]; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); service = TestBed.inject(PermissionListService); nodePermissionService = TestBed.inject(NodePermissionService); notificationService = TestBed.inject(NotificationService); diff --git a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.spec.ts index 99d7d7bd18..de5b27501f 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/user-icon-column/user-icon-column.component.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { setupTestBed } from '@alfresco/adf-core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ContentTestingModule } from '../../../testing/content.testing.module'; @@ -38,14 +37,13 @@ describe('UserIconColumnComponent', () => { displayName: 'fake authority' }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(UserIconColumnComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.spec.ts index 3c8fdf4a45..e21559849b 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/user-name-column/user-name-column.component.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { setupTestBed } from '@alfresco/adf-core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { ContentTestingModule } from '../../../testing/content.testing.module'; @@ -38,14 +37,13 @@ describe('UserNameColumnComponent', () => { displayName: 'fake authority' }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(UserNameColumnComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.spec.ts b/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.spec.ts index 402d60b806..7bdeac2260 100644 --- a/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.spec.ts +++ b/lib/content-services/src/lib/permission-manager/services/node-permission-dialog.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { NodePermissionDialogService } from './node-permission-dialog.service'; import { MatDialog } from '@angular/material/dialog'; import { of, Subject, throwError } from 'rxjs'; @@ -33,14 +33,13 @@ describe('NodePermissionDialogService', () => { let afterOpenObservable: Subject; let nodePermissionService: NodePermissionService; - 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'; service = TestBed.inject(NodePermissionDialogService); diff --git a/lib/content-services/src/lib/permission-manager/services/node-permission.service.spec.ts b/lib/content-services/src/lib/permission-manager/services/node-permission.service.spec.ts index 091f1232f7..ac9ec0500b 100644 --- a/lib/content-services/src/lib/permission-manager/services/node-permission.service.spec.ts +++ b/lib/content-services/src/lib/permission-manager/services/node-permission.service.spec.ts @@ -17,7 +17,6 @@ import { TestBed } from '@angular/core/testing'; import { NodePermissionService } from './node-permission.service'; -import { setupTestBed } from '@alfresco/adf-core'; import { SearchService } from '../../search/services/search.service'; import { Node, PermissionElement } from '@alfresco/js-api'; import { of, throwError } from 'rxjs'; @@ -51,14 +50,13 @@ describe('NodePermissionService', () => { } ]; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); service = TestBed.inject(NodePermissionService); searchApiService = TestBed.inject(SearchService); nodeService = TestBed.inject(NodesApiService); diff --git a/lib/content-services/src/lib/search/components/reset-search.directive.spec.ts b/lib/content-services/src/lib/search/components/reset-search.directive.spec.ts index 9b90e28307..484e99e065 100644 --- a/lib/content-services/src/lib/search/components/reset-search.directive.spec.ts +++ b/lib/content-services/src/lib/search/components/reset-search.directive.spec.ts @@ -17,7 +17,6 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { SearchFacetFiltersService } from '../services/search-facet-filters.service'; @@ -34,15 +33,14 @@ describe('Directive: ResetSearchDirective', () => { let searchFacetFiltersService: SearchFacetFiltersService; let queryBuilder: SearchQueryBuilderService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - declarations: [TestComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + declarations: [TestComponent] + }); fixture = TestBed.createComponent(TestComponent); searchFacetFiltersService = TestBed.inject(SearchFacetFiltersService); queryBuilder = TestBed.inject(SearchQueryBuilderService); diff --git a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.spec.ts b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.spec.ts index d002ee68af..e0a2e0d535 100644 --- a/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-check-list/search-check-list.component.spec.ts @@ -17,7 +17,6 @@ import { SearchCheckListComponent, SearchListOption } from './search-check-list.component'; import { SearchFilterList } from '../../models/search-filter-list.model'; -import { setupTestBed } from '@alfresco/adf-core'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { sizeOptions, stepOne, stepThree } from '../../../mock'; @@ -28,14 +27,13 @@ describe('SearchCheckListComponent', () => { let fixture: ComponentFixture; let component: SearchCheckListComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(SearchCheckListComponent); component = fixture.componentInstance; }); diff --git a/lib/content-services/src/lib/search/components/search-control.component.spec.ts b/lib/content-services/src/lib/search/components/search-control.component.spec.ts index 6e373f56fb..a8005f72cf 100644 --- a/lib/content-services/src/lib/search/components/search-control.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-control.component.spec.ts @@ -18,12 +18,7 @@ import { Component, DebugElement, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { - AuthenticationService, - SearchTextInputComponent, - setupTestBed, - UserPreferencesService -} from '@alfresco/adf-core'; +import { AuthenticationService, SearchTextInputComponent, UserPreferencesService } from '@alfresco/adf-core'; import { noResult, results } from '../../mock'; import { SearchControlComponent } from './search-control.component'; import { SearchService } from '../services/search.service'; @@ -64,17 +59,16 @@ describe('SearchControlComponent', () => { let searchServiceSpy: jasmine.Spy; let userPreferencesService: UserPreferencesService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - declarations: [ - SimpleSearchTestCustomEmptyComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + declarations: [ + SimpleSearchTestCustomEmptyComponent + ] + }); fixture = TestBed.createComponent(SearchControlComponent); debugElement = fixture.debugElement; searchService = TestBed.inject(SearchService); diff --git a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.spec.ts b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.spec.ts index c99d6a466e..e22bcab0af 100644 --- a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.spec.ts @@ -16,7 +16,7 @@ */ import { SearchDateRangeComponent } from './search-date-range.component'; -import { MomentDateAdapter, setupTestBed } from '@alfresco/adf-core'; +import { MomentDateAdapter } from '@alfresco/adf-core'; import { DateAdapter } from '@angular/material/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ContentTestingModule } from '../../../testing/content.testing.module'; @@ -33,14 +33,13 @@ describe('SearchDateRangeComponent', () => { const maxDate = '10-Mar-20'; const dateFormatFixture = 'DD-MMM-YY'; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(SearchDateRangeComponent); adapter = fixture.debugElement.injector.get(DateAdapter) as MomentDateAdapter; component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts b/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts index 1a6e408aab..554e36de6e 100644 --- a/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-datetime-range/search-datetime-range.component.spec.ts @@ -16,7 +16,6 @@ */ import { SearchDatetimeRangeComponent } from './search-datetime-range.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,14 +30,13 @@ describe('SearchDatetimeRangeComponent', () => { const maxDatetime = '10-Mar-20 20:00'; const datetimeFormatFixture = 'DD-MMM-YY HH:mm'; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(SearchDatetimeRangeComponent); component = fixture.componentInstance; }); diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.spec.ts index 8fbce766ed..8b84cdeeb2 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip/search-facet-chip.component.spec.ts @@ -21,7 +21,6 @@ import { ContentTestingModule } from '../../../../testing/content.testing.module import { TranslateModule } from '@ngx-translate/core'; import { By } from '@angular/platform-browser'; import { SearchQueryBuilderService } from '../../../services/search-query-builder.service'; -import { setupTestBed } from '@alfresco/adf-core'; import { SearchFilterList } from '../../../models/search-filter-list.model'; describe('SearchFacetChipComponent', () => { @@ -29,14 +28,13 @@ describe('SearchFacetChipComponent', () => { let fixture: ComponentFixture; let queryBuilder: SearchQueryBuilderService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(SearchFacetChipComponent); component = fixture.componentInstance; queryBuilder = TestBed.inject(SearchQueryBuilderService); diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.spec.ts index 8fc2da477b..fd58033331 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-menu-card/search-filter-menu-card.component.spec.ts @@ -19,20 +19,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchFilterMenuCardComponent } from './search-filter-menu-card.component'; import { TranslateModule } from '@ngx-translate/core'; import { ContentTestingModule } from '../../../../testing/content.testing.module'; -import { setupTestBed } from '@alfresco/adf-core'; describe('SearchFilterMenuComponent', () => { let component: SearchFilterMenuCardComponent; let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(SearchFilterMenuCardComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts index 88474fc78e..749e179881 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-widget-chip/search-widget-chip.component.spec.ts @@ -18,7 +18,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchWidgetChipComponent } from './search-widget-chip.component'; import { simpleCategories } from '../../../../mock'; -import { setupTestBed } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { ContentTestingModule } from '../../../../testing/content.testing.module'; import { MatMenuModule } from '@angular/material/menu'; @@ -30,22 +29,21 @@ describe('SearchWidgetChipComponent', () => { let fixture: ComponentFixture; let queryBuilder: SearchQueryBuilderService; - setupTestBed({ - imports: [ - MatMenuModule, - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { - queryBuilder = TestBed.inject(SearchQueryBuilderService); - fixture = TestBed.createComponent(SearchWidgetChipComponent); - component = fixture.componentInstance; - spyOn(queryBuilder, 'update').and.stub(); + TestBed.configureTestingModule({ + imports: [ + MatMenuModule, + TranslateModule.forRoot(), + ContentTestingModule + ] + }); + queryBuilder = TestBed.inject(SearchQueryBuilderService); + fixture = TestBed.createComponent(SearchWidgetChipComponent); + component = fixture.componentInstance; + spyOn(queryBuilder, 'update').and.stub(); - component.category = simpleCategories[1]; - fixture.detectChanges(); + component.category = simpleCategories[1]; + fixture.detectChanges(); }); it('should update search query on apply click', () => { diff --git a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts index a0bd6625de..62a8038f4a 100644 --- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts @@ -18,7 +18,6 @@ import { Subject } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { setupTestBed } from '@alfresco/adf-core'; import { SearchService } from '../../services/search.service'; import { SearchHeaderQueryBuilderService } from '../../services/search-header-query-builder.service'; import { ContentTestingModule } from '../../../testing/content.testing.module'; @@ -53,18 +52,17 @@ describe('SearchFilterContainerComponent', () => { dataLoaded: new Subject() }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - { provide: SearchService, useValue: searchMock }, - { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchHeaderQueryBuilderService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + { provide: SearchService, useValue: searchMock }, + { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchHeaderQueryBuilderService } + ] + }); fixture = TestBed.createComponent(SearchFilterContainerComponent); component = fixture.componentInstance; queryBuilder = fixture.componentInstance['searchFilterQueryBuilder']; diff --git a/lib/content-services/src/lib/search/components/search-form/search-form.component.spec.ts b/lib/content-services/src/lib/search/components/search-form/search-form.component.spec.ts index 0f09875775..319c84aaa3 100644 --- a/lib/content-services/src/lib/search/components/search-form/search-form.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-form/search-form.component.spec.ts @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchFormComponent } from './search-form.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token'; @@ -35,23 +34,22 @@ describe('SearchFormComponent', () => { { default: false, index: 2, name: 'Second', selected: false } ]; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [ - { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchQueryBuilderService } - ] - }); - beforeEach(() => { - fixture = TestBed.createComponent(SearchFormComponent); - component = fixture.componentInstance; - queryBuilder = TestBed.inject(SEARCH_QUERY_SERVICE_TOKEN); - queryBuilder.searchForms.next(mockSearchForms); - fixture.detectChanges(); - }); + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [ + { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchQueryBuilderService } + ] + }); + fixture = TestBed.createComponent(SearchFormComponent); + component = fixture.componentInstance; + queryBuilder = TestBed.inject(SEARCH_QUERY_SERVICE_TOKEN); + queryBuilder.searchForms.next(mockSearchForms); + fixture.detectChanges(); + }); it('should show search forms', () => { const title = fixture.debugElement.query(By.css('.adf-search-form-title')); diff --git a/lib/content-services/src/lib/search/components/search-panel/search-panel.component.spec.ts b/lib/content-services/src/lib/search/components/search-panel/search-panel.component.spec.ts index ad0da667c3..7242373914 100644 --- a/lib/content-services/src/lib/search/components/search-panel/search-panel.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-panel/search-panel.component.spec.ts @@ -17,7 +17,6 @@ import { SearchCheckListComponent, SearchListOption } from '../search-check-list/search-check-list.component'; import { SearchFilterList } from '../../models/search-filter-list.model'; -import { setupTestBed } from '@alfresco/adf-core'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { sizeOptions, stepOne, stepThree } from '../../../mock'; @@ -28,14 +27,13 @@ describe('SearchCheckListComponent', () => { let fixture: ComponentFixture; let component: SearchCheckListComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(SearchCheckListComponent); component = fixture.componentInstance; }); diff --git a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.spec.ts b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.spec.ts index 2e77e36b8c..221ee0b037 100644 --- a/lib/content-services/src/lib/search/components/search-radio/search-radio.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-radio/search-radio.component.spec.ts @@ -19,7 +19,6 @@ import { sizeOptions, stepOne, stepThree } from '../../../mock'; import { By } from '@angular/platform-browser'; import { SearchRadioComponent } from './search-radio.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -27,14 +26,13 @@ describe('SearchRadioComponent', () => { let fixture: ComponentFixture; let component: SearchRadioComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(SearchRadioComponent); component = fixture.componentInstance; }); diff --git a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.spec.ts b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.spec.ts index 88689d491c..624fada56b 100644 --- a/lib/content-services/src/lib/search/components/search-slider/search-slider.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-slider/search-slider.component.spec.ts @@ -17,7 +17,6 @@ import { MatSliderChange } from '@angular/material/slider'; import { SearchSliderComponent } from './search-slider.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; @@ -26,14 +25,13 @@ describe('SearchSliderComponent', () => { let fixture: ComponentFixture; let component: SearchSliderComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(SearchSliderComponent); component = fixture.componentInstance; }); diff --git a/lib/content-services/src/lib/search/components/search-text/search-text.component.spec.ts b/lib/content-services/src/lib/search/components/search-text/search-text.component.spec.ts index 8c528e5d50..b33b0ef7df 100644 --- a/lib/content-services/src/lib/search/components/search-text/search-text.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-text/search-text.component.spec.ts @@ -16,7 +16,6 @@ */ import { SearchTextComponent } from './search-text.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; @@ -25,14 +24,13 @@ describe('SearchTextComponent', () => { let fixture: ComponentFixture; let component: SearchTextComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(SearchTextComponent); component = fixture.componentInstance; component.id = 'text'; diff --git a/lib/content-services/src/lib/search/components/search.component.spec.ts b/lib/content-services/src/lib/search/components/search.component.spec.ts index 66602f7352..6e7c36e48f 100644 --- a/lib/content-services/src/lib/search/components/search.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search.component.spec.ts @@ -16,7 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { SearchService } from '../services/search.service'; import { differentResult, result, SimpleSearchTestComponent } from '../../mock'; import { of, throwError } from 'rxjs'; @@ -30,15 +29,14 @@ describe('SearchComponent', () => { let component: SimpleSearchTestComponent; let searchService: SearchService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - declarations: [SimpleSearchTestComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + declarations: [SimpleSearchTestComponent] + }); fixture = TestBed.createComponent(SimpleSearchTestComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/content-services/src/lib/search/services/search.service.spec.ts b/lib/content-services/src/lib/search/services/search.service.spec.ts index 7358477be9..c14945ec07 100644 --- a/lib/content-services/src/lib/search/services/search.service.spec.ts +++ b/lib/content-services/src/lib/search/services/search.service.spec.ts @@ -18,22 +18,20 @@ import { TestBed } from '@angular/core/testing'; import { mockError, fakeSearch } from '../mocks/search.service.mock'; import { SearchService } from './search.service'; -import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { NodePaging } from '@alfresco/js-api'; describe('SearchService', () => { - let service: SearchService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); service = TestBed.inject(SearchService); }); diff --git a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts index b7682c0cdf..02fa9ecbbd 100644 --- a/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts +++ b/lib/content-services/src/lib/site-dropdown/sites-dropdown.component.spec.ts @@ -19,7 +19,7 @@ import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { DropdownSitesComponent, Relations } from './sites-dropdown.component'; -import { AuthenticationService, setupTestBed } from '@alfresco/adf-core'; +import { AuthenticationService } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { getFakeSitePaging, getFakeSitePagingNoMoreItems, @@ -59,11 +59,13 @@ describe('DropdownSitesComponent', () => { let siteService: SitesService; let authService: AuthenticationService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); }); describe('Rendering tests', () => { diff --git a/lib/content-services/src/lib/social/like.component.spec.ts b/lib/content-services/src/lib/social/like.component.spec.ts index 9b00fa0ba0..207db9a02d 100644 --- a/lib/content-services/src/lib/social/like.component.spec.ts +++ b/lib/content-services/src/lib/social/like.component.spec.ts @@ -17,8 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { LikeComponent } from './like.component'; -import { setupTestBed } from '@alfresco/adf-core'; - import { ContentTestingModule } from '../testing/content.testing.module'; import { of } from 'rxjs'; import { RatingService } from './services/rating.service'; @@ -31,14 +29,13 @@ describe('Like component', () => { let element: HTMLElement; let service: RatingService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); service = TestBed.inject(RatingService); spyOn(service, 'getRating').and.returnValue(of({ diff --git a/lib/content-services/src/lib/social/rating.component.spec.ts b/lib/content-services/src/lib/social/rating.component.spec.ts index d2bd41467c..8b4b2960a4 100644 --- a/lib/content-services/src/lib/social/rating.component.spec.ts +++ b/lib/content-services/src/lib/social/rating.component.spec.ts @@ -17,8 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { RatingComponent } from './rating.component'; -import { setupTestBed } from '@alfresco/adf-core'; - import { ContentTestingModule } from '../testing/content.testing.module'; import { of } from 'rxjs'; import { RatingService } from './services/rating.service'; @@ -31,14 +29,13 @@ describe('Rating component', () => { let element: HTMLElement; let service: RatingService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(RatingComponent); service = TestBed.inject(RatingService); diff --git a/lib/content-services/src/lib/social/services/rating.service.spec.ts b/lib/content-services/src/lib/social/services/rating.service.spec.ts index 7270f86d5e..f636c9f873 100644 --- a/lib/content-services/src/lib/social/services/rating.service.spec.ts +++ b/lib/content-services/src/lib/social/services/rating.service.spec.ts @@ -16,7 +16,6 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { RatingService } from './rating.service'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -25,17 +24,15 @@ import { ratingOneMock, ratingThreeMock } from '../mock/rating-response.mock'; declare let jasmine: any; describe('Rating service', () => { - - let service; - - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); + let service: RatingService; beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); service = TestBed.inject(RatingService); }); diff --git a/lib/content-services/src/lib/tag/services/tag.service.spec.ts b/lib/content-services/src/lib/tag/services/tag.service.spec.ts index c4cdfd2c7f..5cc57a1ffb 100644 --- a/lib/content-services/src/lib/tag/services/tag.service.spec.ts +++ b/lib/content-services/src/lib/tag/services/tag.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { LogService, setupTestBed, UserPreferencesService } from '@alfresco/adf-core'; +import { LogService, UserPreferencesService } from '@alfresco/adf-core'; import { TagService } from './tag.service'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { ContentTestingModule } from '../../testing/content.testing.module'; @@ -41,14 +41,13 @@ describe('TagService', () => { return tagPaging; }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); service = TestBed.inject(TagService); logService = TestBed.inject(LogService); userPreferencesService = TestBed.inject(UserPreferencesService); diff --git a/lib/content-services/src/lib/tag/tag-actions.component.spec.ts b/lib/content-services/src/lib/tag/tag-actions.component.spec.ts index 6c65ec67cc..38cf7039b3 100644 --- a/lib/content-services/src/lib/tag/tag-actions.component.spec.ts +++ b/lib/content-services/src/lib/tag/tag-actions.component.spec.ts @@ -16,7 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { TagActionsComponent } from './tag-actions.component'; import { TagService } from './services/tag.service'; import { of } from 'rxjs'; @@ -47,14 +46,13 @@ describe('TagActionsComponent', () => { let element: HTMLElement; let tagService: TagService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(TagActionsComponent); tagService = TestBed.inject(TagService); spyOn(tagService, 'getTagsByNodeId').and.returnValue(of(dataTag)); diff --git a/lib/content-services/src/lib/tag/tag-list.component.spec.ts b/lib/content-services/src/lib/tag/tag-list.component.spec.ts index 36c1f55d3e..507f63ac08 100644 --- a/lib/content-services/src/lib/tag/tag-list.component.spec.ts +++ b/lib/content-services/src/lib/tag/tag-list.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { TagService } from './services/tag.service'; import { TagListComponent } from '././tag-list.component'; import { of } from 'rxjs'; @@ -47,14 +47,13 @@ describe('TagList', () => { let element: HTMLElement; let tagService: TagService; - 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/tag/tag-node-list.component.spec.ts b/lib/content-services/src/lib/tag/tag-node-list.component.spec.ts index d87592cf75..2fedddbb24 100644 --- a/lib/content-services/src/lib/tag/tag-node-list.component.spec.ts +++ b/lib/content-services/src/lib/tag/tag-node-list.component.spec.ts @@ -16,7 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { TagNodeListComponent } from './tag-node-list.component'; import { TagService } from './services/tag.service'; import { of } from 'rxjs'; @@ -66,14 +65,13 @@ describe('TagNodeList', () => { return element.querySelectorAll('.adf-tag-chips'); } - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); const resizeObserverSpy = spyOn(window, 'ResizeObserver').and.callThrough(); fixture = TestBed.createComponent(TagNodeListComponent); diff --git a/lib/content-services/src/lib/tree-view/components/tree-view.component.spec.ts b/lib/content-services/src/lib/tree-view/components/tree-view.component.spec.ts index 60457e026a..43bf8235c1 100644 --- a/lib/content-services/src/lib/tree-view/components/tree-view.component.spec.ts +++ b/lib/content-services/src/lib/tree-view/components/tree-view.component.spec.ts @@ -16,7 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { TreeViewComponent } from './tree-view.component'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { TreeViewService } from '../services/tree-view.service'; @@ -72,11 +71,13 @@ describe('TreeViewComponent', () => { } }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); }); describe('When there is a nodeId', () => { diff --git a/lib/content-services/src/lib/tree-view/services/tree-view.service.spec.ts b/lib/content-services/src/lib/tree-view/services/tree-view.service.spec.ts index 9f024ea982..ad408cbc8a 100644 --- a/lib/content-services/src/lib/tree-view/services/tree-view.service.spec.ts +++ b/lib/content-services/src/lib/tree-view/services/tree-view.service.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { setupTestBed } from '@alfresco/adf-core'; import { NodesApiService } from '../../common/services/nodes-api.service'; import { TreeViewService } from './tree-view.service'; import { TestBed } from '@angular/core/testing'; @@ -39,14 +38,13 @@ describe('TreeViewService', () => { { entry: { id: 'fake-file-id', name: 'fake-file-name', isFolder: false } } ] } }); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); service = TestBed.inject(TreeViewService); nodeService = TestBed.inject(NodesApiService); }); diff --git a/lib/content-services/src/lib/upload/components/base-upload/upload-base.spec.ts b/lib/content-services/src/lib/upload/components/base-upload/upload-base.spec.ts index 46617689b5..9225ceebd2 100644 --- a/lib/content-services/src/lib/upload/components/base-upload/upload-base.spec.ts +++ b/lib/content-services/src/lib/upload/components/base-upload/upload-base.spec.ts @@ -17,7 +17,6 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { UploadBase } from './upload-base'; import { UploadFilesEvent } from '../upload-files.event'; import { ContentTestingModule } from '../../../testing/content.testing.module'; @@ -42,17 +41,16 @@ describe('UploadBase', () => { let fixture: ComponentFixture; let uploadService: UploadService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - declarations: [ - UploadTestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + declarations: [ + UploadTestComponent + ] + }); fixture = TestBed.createComponent(UploadTestComponent); uploadService = TestBed.inject(UploadService); diff --git a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.spec.ts b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.spec.ts index b653ba3add..6e17de7e47 100644 --- a/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.spec.ts +++ b/lib/content-services/src/lib/upload/components/file-uploading-dialog.component.spec.ts @@ -17,9 +17,7 @@ import { EventEmitter } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { - setupTestBed, UserPreferencesService -} from '@alfresco/adf-core'; +import { UserPreferencesService } from '@alfresco/adf-core'; import { UploadModule } from '../upload.module'; import { FileUploadingDialogComponent } from './file-uploading-dialog.component'; import { ContentTestingModule } from '../../testing/content.testing.module'; @@ -36,15 +34,14 @@ describe('FileUploadingDialogComponent', () => { let emitter: EventEmitter; let fileList: FileModel[]; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule, - UploadModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule, + UploadModule + ] + }); fixture = TestBed.createComponent(FileUploadingDialogComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.spec.ts b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.spec.ts index 3bef616869..9f347a2b2e 100644 --- a/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.spec.ts +++ b/lib/content-services/src/lib/upload/components/file-uploading-list-row.component.spec.ts @@ -16,7 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { FileUploadingListRowComponent } from './file-uploading-list-row.component'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -28,14 +27,13 @@ describe('FileUploadingListRowComponent', () => { let component: FileUploadingListRowComponent; const file = new FileModel({ name: 'fake-name' } as File); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(FileUploadingListRowComponent); component = fixture.componentInstance; }); diff --git a/lib/content-services/src/lib/upload/components/file-uploading-list.component.spec.ts b/lib/content-services/src/lib/upload/components/file-uploading-list.component.spec.ts index 6b24c5dbf8..5cb420d354 100644 --- a/lib/content-services/src/lib/upload/components/file-uploading-list.component.spec.ts +++ b/lib/content-services/src/lib/upload/components/file-uploading-list.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslationService, setupTestBed } from '@alfresco/adf-core'; +import { TranslationService } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { FileUploadingListComponent } from './file-uploading-list.component'; import { ContentTestingModule } from '../../testing/content.testing.module'; @@ -37,14 +37,13 @@ describe('FileUploadingListComponent', () => { file = { data: { entry: { id: 'x' } } }; }); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); nodesApiService = TestBed.inject(NodesApiService); uploadService = TestBed.inject(UploadService); diff --git a/lib/content-services/src/lib/upload/components/upload-drag-area.component.spec.ts b/lib/content-services/src/lib/upload/components/upload-drag-area.component.spec.ts index 4b77fc6bf4..610ec758da 100644 --- a/lib/content-services/src/lib/upload/components/upload-drag-area.component.spec.ts +++ b/lib/content-services/src/lib/upload/components/upload-drag-area.component.spec.ts @@ -16,7 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { UploadDragAreaComponent } from './upload-drag-area.component'; import { ContentTestingModule } from '../../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -105,14 +104,13 @@ describe('UploadDragAreaComponent', () => { let fixture: ComponentFixture; let uploadService: UploadService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ] + }); fixture = TestBed.createComponent(UploadDragAreaComponent); uploadService = TestBed.inject(UploadService); diff --git a/lib/content-services/src/lib/upload/directives/toggle-icon.directive.spec.ts b/lib/content-services/src/lib/upload/directives/toggle-icon.directive.spec.ts index 5b8b034c1b..f3faffa082 100644 --- a/lib/content-services/src/lib/upload/directives/toggle-icon.directive.spec.ts +++ b/lib/content-services/src/lib/upload/directives/toggle-icon.directive.spec.ts @@ -17,7 +17,6 @@ import { Component, ViewChild } from '@angular/core'; import { ToggleIconDirective } from './toggle-icon.directive'; -import { setupTestBed } from '@alfresco/adf-core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; @Component({ @@ -35,14 +34,13 @@ describe('ToggleIconDirective', () => { let fixture: ComponentFixture; let component: TestComponent; - setupTestBed({ - declarations: [ - TestComponent, - ToggleIconDirective - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [ + TestComponent, + ToggleIconDirective + ] + }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts b/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts index ea7a42f7c4..cbdc18c7e6 100644 --- a/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts +++ b/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts @@ -19,7 +19,7 @@ import { Component } from '@angular/core'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { VersionCompatibilityService } from './version-compatibility.service'; import { VersionInfo } from '@alfresco/js-api'; import { VersionCompatibilityModule } from './version-compatibility.module'; @@ -59,16 +59,15 @@ describe('VersionCompatibilityDirective', () => { patch: '1' }); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - VersionCompatibilityModule - ], - declarations: [TestComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + VersionCompatibilityModule + ], + declarations: [TestComponent] + }); fixture = TestBed.createComponent(TestComponent); versionCompatibilityService = TestBed.inject(VersionCompatibilityService); spyOn(versionCompatibilityService, 'getAcsVersion').and.returnValue(acsResponceMock); diff --git a/lib/content-services/src/lib/version-compatibility/version-compatibility.service.spec.ts b/lib/content-services/src/lib/version-compatibility/version-compatibility.service.spec.ts index 370bd79603..d96621ac6a 100644 --- a/lib/content-services/src/lib/version-compatibility/version-compatibility.service.spec.ts +++ b/lib/content-services/src/lib/version-compatibility/version-compatibility.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { CoreTestingModule, setupTestBed } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { RepositoryInfo } from '@alfresco/js-api'; import { TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; @@ -37,22 +37,21 @@ describe('VersionCompatibilityService', () => { } }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ], - providers: [ - { - provide: DiscoveryApiService, - useValue: { - ecmProductInfo$: mockProductInfo - } - } - ] - }); - beforeEach(async () => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ], + providers: [ + { + provide: DiscoveryApiService, + useValue: { + ecmProductInfo$: mockProductInfo + } + } + ] + }); discoveryApiService = TestBed.inject(DiscoveryApiService); versionCompatibilityService = TestBed.inject(VersionCompatibilityService); mockProductInfo.next(acsResponceMock as RepositoryInfo); diff --git a/lib/content-services/src/lib/version-manager/version-comparison.component.spec.ts b/lib/content-services/src/lib/version-manager/version-comparison.component.spec.ts index d2d8c19e7b..8ee7ccaa23 100644 --- a/lib/content-services/src/lib/version-manager/version-comparison.component.spec.ts +++ b/lib/content-services/src/lib/version-manager/version-comparison.component.spec.ts @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { VersionComparisonComponent } from './version-comparison.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { ContentTestingModule } from '../testing/content.testing.module'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; @@ -51,15 +50,14 @@ describe('VersionComparisonComponent', () => { slice: null } as File; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(VersionComparisonComponent); component = fixture.componentInstance; component.node = node; diff --git a/lib/content-services/src/lib/version-manager/version-list.component.spec.ts b/lib/content-services/src/lib/version-manager/version-list.component.spec.ts index a1fd9e1c91..82973d687c 100644 --- a/lib/content-services/src/lib/version-manager/version-list.component.spec.ts +++ b/lib/content-services/src/lib/version-manager/version-list.component.spec.ts @@ -19,7 +19,6 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { VersionListComponent } from './version-list.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { MatDialog } from '@angular/material/dialog'; import { of } from 'rxjs'; import { Node, VersionPaging, VersionEntry, NodeEntry } from '@alfresco/js-api'; @@ -41,20 +40,19 @@ describe('VersionListComponent', () => { { entry: { name: 'test-file-name-two', id: '1.0', versionComment: 'test-version-comment' } } as VersionEntry ]; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - afterEach(() => { fixture.destroy(); TestBed.resetTestingModule(); }); beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(VersionListComponent); dialog = TestBed.inject(MatDialog); contentVersionService = TestBed.inject(ContentVersionService); diff --git a/lib/content-services/src/lib/version-manager/version-manager.component.spec.ts b/lib/content-services/src/lib/version-manager/version-manager.component.spec.ts index 68279d3222..b4964b5a08 100644 --- a/lib/content-services/src/lib/version-manager/version-manager.component.spec.ts +++ b/lib/content-services/src/lib/version-manager/version-manager.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 { Node, VersionPaging } from '@alfresco/js-api'; import { VersionManagerComponent } from './version-manager.component'; import { ContentTestingModule } from '../testing/content.testing.module'; @@ -45,15 +44,14 @@ describe('VersionManagerComponent', () => { } }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(VersionManagerComponent); component = fixture.componentInstance; component.node = node; diff --git a/lib/content-services/src/lib/version-manager/version-upload.component.spec.ts b/lib/content-services/src/lib/version-manager/version-upload.component.spec.ts index 2615d2a8fd..51232eba62 100644 --- a/lib/content-services/src/lib/version-manager/version-upload.component.spec.ts +++ b/lib/content-services/src/lib/version-manager/version-upload.component.spec.ts @@ -19,7 +19,6 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { VersionUploadComponent } from './version-upload.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { ContentTestingModule } from '../testing/content.testing.module'; import { Node } from '@alfresco/js-api'; import { UploadService } from '../common/services/upload.service'; @@ -48,16 +47,15 @@ describe('VersionUploadComponent', () => { } }); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentTestingModule - ], - providers: [UploadService], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentTestingModule + ], + providers: [UploadService], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(VersionUploadComponent); component = fixture.componentInstance; uploadService = TestBed.inject(UploadService); diff --git a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts index 361080d671..e5dc4d355b 100644 --- a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts +++ b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts @@ -18,7 +18,6 @@ import { Location } from '@angular/common'; import { SpyLocation } from '@angular/common/testing'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; - import { TranslateModule } from '@ngx-translate/core'; import { MatDialog } from '@angular/material/dialog'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; @@ -27,12 +26,7 @@ import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { NodeEntry, VersionEntry } from '@alfresco/js-api'; import { AlfrescoViewerComponent, NodeActionsService, RenditionService } from '@alfresco/adf-content-services'; -import { - CoreTestingModule, - setupTestBed, - EventMock, - ViewUtilService, ViewerComponent -} from '@alfresco/adf-core'; +import { CoreTestingModule, EventMock, ViewUtilService, ViewerComponent } from '@alfresco/adf-core'; import { NodesApiService } from '../../common/services/nodes-api.service'; import { UploadService } from '../../common/services/upload.service'; import { FileModel } from '../../common/models/file.model'; @@ -152,35 +146,34 @@ describe('AlfrescoViewerComponent', () => { let viewUtilService: ViewUtilService; let nodeActionsService: NodeActionsService; - setupTestBed({ - imports: [ - NoopAnimationsModule, - TranslateModule.forRoot(), - CoreTestingModule, - MatButtonModule, - MatIconModule - ], - declarations: [ - ViewerWithCustomToolbarComponent, - ViewerWithCustomSidebarComponent, - ViewerWithCustomOpenWithComponent, - ViewerWithCustomMoreActionsComponent, - ViewerWithCustomToolbarActionsComponent - ], - providers: [ - { - provide: RenditionService, useValue: { - getNodeRendition: () => throwError('thrown'), - generateMediaTracksRendition: () => {} - } - }, - {provide: Location, useClass: SpyLocation}, - MatDialog - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, + TranslateModule.forRoot(), + CoreTestingModule, + MatButtonModule, + MatIconModule + ], + declarations: [ + ViewerWithCustomToolbarComponent, + ViewerWithCustomSidebarComponent, + ViewerWithCustomOpenWithComponent, + ViewerWithCustomMoreActionsComponent, + ViewerWithCustomToolbarActionsComponent + ], + providers: [ + { + provide: RenditionService, useValue: { + getNodeRendition: () => throwError('thrown'), + generateMediaTracksRendition: () => {} + } + }, + {provide: Location, useClass: SpyLocation}, + MatDialog + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(AlfrescoViewerComponent); element = fixture.nativeElement; component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/webscript/webscript.component.spec.ts b/lib/content-services/src/lib/webscript/webscript.component.spec.ts index 7bc6eefb3a..d6f799dd85 100644 --- a/lib/content-services/src/lib/webscript/webscript.component.spec.ts +++ b/lib/content-services/src/lib/webscript/webscript.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { WebscriptComponent } from './webscript.component'; import { ContentTestingModule } from '../testing/content.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -29,14 +29,13 @@ describe('WebscriptComponent', () => { let fixture: ComponentFixture; let element: HTMLElement; - 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/core/src/lib/about/about-github-link/about-github-link.component.spec.ts b/lib/core/src/lib/about/about-github-link/about-github-link.component.spec.ts index f399ed9c5b..c7b9c1a51d 100644 --- a/lib/core/src/lib/about/about-github-link/about-github-link.component.spec.ts +++ b/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; let component: AboutGithubLinkComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); fixture = TestBed.createComponent(AboutGithubLinkComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/lib/core/src/lib/about/about-server-settings/about-server-settings.component.spec.ts b/lib/core/src/lib/about/about-server-settings/about-server-settings.component.spec.ts index b9576dd467..c3f4ba6787 100644 --- a/lib/core/src/lib/about/about-server-settings/about-server-settings.component.spec.ts +++ b/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); diff --git a/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts index f4f5b2b6e3..40288684c2 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts +++ b/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); diff --git a/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts index b8f54cd2b9..70856196fa 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts +++ b/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); diff --git a/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts index f73173cdca..feab33cf95 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts +++ b/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); diff --git a/lib/core/src/lib/auth/guard/auth-guard.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard.service.spec.ts index 21a146b27f..54e1d50d4d 100644 --- a/lib/core/src/lib/auth/guard/auth-guard.service.spec.ts +++ b/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); diff --git a/lib/core/src/lib/auth/services/identity-group.service.spec.ts b/lib/core/src/lib/auth/services/identity-group.service.spec.ts index cce4838b12..2f1fcad3a0 100644 --- a/lib/core/src/lib/auth/services/identity-group.service.spec.ts +++ b/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'); diff --git a/lib/core/src/lib/auth/services/identity-role.service.spec.ts b/lib/core/src/lib/auth/services/identity-role.service.spec.ts index 1387aa3963..21caeab505 100644 --- a/lib/core/src/lib/auth/services/identity-role.service.spec.ts +++ b/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); }); diff --git a/lib/core/src/lib/auth/services/identity-user.service.spec.ts b/lib/core/src/lib/auth/services/identity-user.service.spec.ts index 5357f21ba7..05407fef13 100644 --- a/lib/core/src/lib/auth/services/identity-user.service.spec.ts +++ b/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); diff --git a/lib/core/src/lib/auth/services/jwt-helper.service.spec.ts b/lib/core/src/lib/auth/services/jwt-helper.service.spec.ts index 860fc5f993..824030150d 100644 --- a/lib/core/src/lib/auth/services/jwt-helper.service.spec.ts +++ b/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); }); diff --git a/lib/core/src/lib/auth/services/user-access.service.spec.ts b/lib/core/src/lib/auth/services/user-access.service.spec.ts index 7de2934f93..3032441733 100644 --- a/lib/core/src/lib/auth/services/user-access.service.spec.ts +++ b/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); diff --git a/lib/core/src/lib/buttons-menu/buttons-menu.component.spec.ts b/lib/core/src/lib/buttons-menu/buttons-menu.component.spec.ts index 884b723388..c10388801e 100644 --- a/lib/core/src/lib/buttons-menu/buttons-menu.component.spec.ts +++ b/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; 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; }); diff --git a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts index bbeb2a4d15..39b5e4a3b8 100644 --- a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts +++ b/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'); diff --git a/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts index bf946487b3..645e39f9ea 100644 --- a/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts +++ b/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; 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({ diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts index 2e1a2299de..fa7be54f03 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts +++ b/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', diff --git a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts index ec89ff3fe3..433bff1d6f 100644 --- a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts index 698423a32e..ab1111ce37 100644 --- a/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts index 94a124813b..23480211a4 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts +++ b/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); diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts index a50713907b..14969645ae 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts +++ b/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', () => { diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts index 7fd0d736f8..a7357de86c 100644 --- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts +++ b/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; }); diff --git a/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts b/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts index fd070f3ffc..ac69d0dd1f 100644 --- a/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts +++ b/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; let component: CardViewComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); fixture = TestBed.createComponent(CardViewComponent); component = fixture.componentInstance; }); diff --git a/lib/core/src/lib/clipboard/clipboard.directive.spec.ts b/lib/core/src/lib/clipboard/clipboard.directive.spec.ts index ef16b8205c..1dd1666264 100644 --- a/lib/core/src/lib/clipboard/clipboard.directive.spec.ts +++ b/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; 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; 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(); diff --git a/lib/core/src/lib/clipboard/clipboard.service.spec.ts b/lib/core/src/lib/clipboard/clipboard.service.spec.ts index f5022c20bb..cd5ee501f9 100644 --- a/lib/core/src/lib/clipboard/clipboard.service.spec.ts +++ b/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'); diff --git a/lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts b/lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts index d5497c4c5f..6441096369 100644 --- a/lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts +++ b/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; 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; diff --git a/lib/core/src/lib/comments/comments.component.spec.ts b/lib/core/src/lib/comments/comments.component.spec.ts index 31e996e1f0..9006cb848a 100644 --- a/lib/core/src/lib/comments/comments.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/common/services/directionality-config.service.spec.ts b/lib/core/src/lib/common/services/directionality-config.service.spec.ts index dfd29721c1..91a7ca0cb2 100644 --- a/lib/core/src/lib/common/services/directionality-config.service.spec.ts +++ b/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); }); diff --git a/lib/core/src/lib/common/services/log.service.spec.ts b/lib/core/src/lib/common/services/log.service.spec.ts index 4726ae4dbc..2759a5595b 100644 --- a/lib/core/src/lib/common/services/log.service.spec.ts +++ b/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; 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); }); diff --git a/lib/core/src/lib/common/services/storage.service.spec.ts b/lib/core/src/lib/common/services/storage.service.spec.ts index 01a17813af..a20f29e6e0 100644 --- a/lib/core/src/lib/common/services/storage.service.spec.ts +++ b/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: { diff --git a/lib/core/src/lib/common/services/thumbnail.service.spec.ts b/lib/core/src/lib/common/services/thumbnail.service.spec.ts index 18c782ec1e..98ab43f022 100644 --- a/lib/core/src/lib/common/services/thumbnail.service.spec.ts +++ b/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); }); diff --git a/lib/core/src/lib/common/services/user-preferences.service.spec.ts b/lib/core/src/lib/common/services/user-preferences.service.spec.ts index a226bf9122..0e7a3964ea 100644 --- a/lib/core/src/lib/common/services/user-preferences.service.spec.ts +++ b/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'); }); }); }); diff --git a/lib/core/src/lib/context-menu/context-menu-overlay.service.spec.ts b/lib/core/src/lib/context-menu/context-menu-overlay.service.spec.ts index 6e6c8e6eb5..e14a3fda70 100644 --- a/lib/core/src/lib/context-menu/context-menu-overlay.service.spec.ts +++ b/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); }); diff --git a/lib/core/src/lib/context-menu/context-menu.spec.ts b/lib/core/src/lib/context-menu/context-menu.spec.ts index f0c6d27fca..a899726949 100644 --- a/lib/core/src/lib/context-menu/context-menu.spec.ts +++ b/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(); diff --git a/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts b/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts index 2aa39236e1..11e3a96ada 100644 --- a/lib/core/src/lib/datatable/components/datatable/datatable.component.spec.ts +++ b/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; - 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 = [ diff --git a/lib/core/src/lib/datatable/components/empty-list/empty-list.component.spec.ts b/lib/core/src/lib/datatable/components/empty-list/empty-list.component.spec.ts index d19adbed4a..900c485a53 100644 --- a/lib/core/src/lib/datatable/components/empty-list/empty-list.component.spec.ts +++ b/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; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); fixture = TestBed.createComponent(EmptyListComponent); }); diff --git a/lib/core/src/lib/datatable/components/json-cell/json-cell.component.spec.ts b/lib/core/src/lib/datatable/components/json-cell/json-cell.component.spec.ts index 3e29f2361b..dd692ed18a 100644 --- a/lib/core/src/lib/datatable/components/json-cell/json-cell.component.spec.ts +++ b/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; }); diff --git a/lib/core/src/lib/datatable/components/location-cell/location-cell.component.spec.ts b/lib/core/src/lib/datatable/components/location-cell/location-cell.component.spec.ts index 314349bca8..9f9a83cd44 100644 --- a/lib/core/src/lib/datatable/components/location-cell/location-cell.component.spec.ts +++ b/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; }); diff --git a/lib/core/src/lib/datatable/data-column/data-column.component.spec.ts b/lib/core/src/lib/datatable/data-column/data-column.component.spec.ts index 44087a97f2..1386966e97 100644 --- a/lib/core/src/lib/datatable/data-column/data-column.component.spec.ts +++ b/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', () => { diff --git a/lib/core/src/lib/datatable/directives/header-filter-template.directive.spec.ts b/lib/core/src/lib/datatable/directives/header-filter-template.directive.spec.ts index 2122a5ac9c..820c734966 100644 --- a/lib/core/src/lib/datatable/directives/header-filter-template.directive.spec.ts +++ b/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); diff --git a/lib/core/src/lib/datatable/directives/loading-template.directive.spec.ts b/lib/core/src/lib/datatable/directives/loading-template.directive.spec.ts index 39f172196f..96fb35b29c 100644 --- a/lib/core/src/lib/datatable/directives/loading-template.directive.spec.ts +++ b/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); diff --git a/lib/core/src/lib/datatable/directives/no-content-template.directive.spec.ts b/lib/core/src/lib/datatable/directives/no-content-template.directive.spec.ts index 23f92ac9d8..c55f09cd05 100644 --- a/lib/core/src/lib/datatable/directives/no-content-template.directive.spec.ts +++ b/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); diff --git a/lib/core/src/lib/datatable/directives/no-permission-template.directive.spec.ts b/lib/core/src/lib/datatable/directives/no-permission-template.directive.spec.ts index 1f6ffd6ef1..6afaf68077 100644 --- a/lib/core/src/lib/datatable/directives/no-permission-template.directive.spec.ts +++ b/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); diff --git a/lib/core/src/lib/directives/highlight.directive.spec.ts b/lib/core/src/lib/directives/highlight.directive.spec.ts index ef0b53636b..bc586d36af 100644 --- a/lib/core/src/lib/directives/highlight.directive.spec.ts +++ b/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; 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(); diff --git a/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts b/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts index a199c1368e..a1a98c49a8 100644 --- a/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts +++ b/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; 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; }); diff --git a/lib/core/src/lib/directives/logout.directive.spec.ts b/lib/core/src/lib/directives/logout.directive.spec.ts index c7416b9cff..705f150aef 100644 --- a/lib/core/src/lib/directives/logout.directive.spec.ts +++ b/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); diff --git a/lib/core/src/lib/form/components/form-field/form-field.component.spec.ts b/lib/core/src/lib/form/components/form-field/form-field.component.spec.ts index 2ac69fc423..7cd79802ed 100644 --- a/lib/core/src/lib/form/components/form-field/form-field.component.spec.ts +++ b/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); diff --git a/lib/core/src/lib/form/components/form-renderer.component.spec.ts b/lib/core/src/lib/form/components/form-renderer.component.spec.ts index e7d3c96d66..f026c60db2 100644 --- a/lib/core/src/lib/form/components/form-renderer.component.spec.ts +++ b/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; - 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); diff --git a/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts b/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts index 9d8601d79a..eddcf5a869 100644 --- a/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts +++ b/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; 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; 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; - 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; diff --git a/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.spec.ts b/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.spec.ts index 78a0dbe01c..7d3c763126 100644 --- a/lib/core/src/lib/form/components/widgets/checkbox/checkbox.widget.spec.ts +++ b/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; 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; diff --git a/lib/core/src/lib/form/components/widgets/core/form.model.spec.ts b/lib/core/src/lib/form/components/widgets/core/form.model.spec.ts index 0ac607fc8c..d79f9d6713 100644 --- a/lib/core/src/lib/form/components/widgets/core/form.model.spec.ts +++ b/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(); }); diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts index 7952015f2b..3c91a1cb6f 100644 --- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts +++ b/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; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - MatTooltipModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + MatTooltipModule + ] + }); fixture = TestBed.createComponent(DateTimeWidgetComponent); element = fixture.nativeElement; diff --git a/lib/core/src/lib/form/components/widgets/date/date.widget.spec.ts b/lib/core/src/lib/form/components/widgets/date/date.widget.spec.ts index d9fcead5fc..b679890e98 100644 --- a/lib/core/src/lib/form/components/widgets/date/date.widget.spec.ts +++ b/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; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); fixture = TestBed.createComponent(DateWidgetComponent); element = fixture.nativeElement; diff --git a/lib/core/src/lib/form/components/widgets/error/error.component.spec.ts b/lib/core/src/lib/form/components/widgets/error/error.component.spec.ts index 05f121643d..eeb45f3749 100644 --- a/lib/core/src/lib/form/components/widgets/error/error.component.spec.ts +++ b/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; let element: HTMLElement; - setupTestBed({ - imports: [ - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + CoreTestingModule + ] + }); fixture = TestBed.createComponent(ErrorWidgetComponent); widget = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.spec.ts b/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.spec.ts index 337691ea76..9b9e2b2f92 100644 --- a/lib/core/src/lib/form/components/widgets/hyperlink/hyperlink.widget.spec.ts +++ b/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; 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; diff --git a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts b/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts index 7e67ba4985..3dd345afa5 100644 --- a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts +++ b/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; 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; diff --git a/lib/core/src/lib/form/components/widgets/number/number.widget.spec.ts b/lib/core/src/lib/form/components/widgets/number/number.widget.spec.ts index cc93ad68f0..a6cc048322 100644 --- a/lib/core/src/lib/form/components/widgets/number/number.widget.spec.ts +++ b/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; 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; diff --git a/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts b/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts index 1d97c2c344..a98ec30d78 100644 --- a/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts +++ b/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; diff --git a/lib/core/src/lib/form/components/widgets/widget.component.spec.ts b/lib/core/src/lib/form/components/widgets/widget.component.spec.ts index b4b70af7d5..be1303d853 100644 --- a/lib/core/src/lib/form/components/widgets/widget.component.spec.ts +++ b/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; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); fixture = TestBed.createComponent(WidgetComponent); element = fixture.nativeElement; diff --git a/lib/core/src/lib/form/models/form-rules.model.spec.ts b/lib/core/src/lib/form/models/form-rules.model.spec.ts index 1c2fec8c5c..50b2595c89 100644 --- a/lib/core/src/lib/form/models/form-rules.model.spec.ts +++ b/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; let getRulesSpy: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - FormBaseModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + FormBaseModule + ] + }); injector = TestBed.inject(Injector); rulesManager = formRulesManagerFactory(injector); getRulesSpy = spyOn(rulesManager, 'getRules'); diff --git a/lib/core/src/lib/form/services/form.service.spec.ts b/lib/core/src/lib/form/services/form.service.spec.ts index 298d6850bd..792e83ad63 100644 --- a/lib/core/src/lib/form/services/form.service.spec.ts +++ b/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', () => { diff --git a/lib/core/src/lib/form/services/widget-visibility-cloud.service.spec.ts b/lib/core/src/lib/form/services/widget-visibility-cloud.service.spec.ts index 4625fbb000..ec3f03a26f 100644 --- a/lib/core/src/lib/form/services/widget-visibility-cloud.service.spec.ts +++ b/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(); }); diff --git a/lib/core/src/lib/form/services/widget-visibility.service.spec.ts b/lib/core/src/lib/form/services/widget-visibility.service.spec.ts index bc3412a481..72f94c8e1a 100644 --- a/lib/core/src/lib/form/services/widget-visibility.service.spec.ts +++ b/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); }); diff --git a/lib/core/src/lib/identity-user-info/identity-user-info.component.spec.ts b/lib/core/src/lib/identity-user-info/identity-user-info.component.spec.ts index 3beb58ba98..703a8ea1da 100644 --- a/lib/core/src/lib/identity-user-info/identity-user-info.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/layout/components/header/header.component.spec.ts b/lib/core/src/lib/layout/components/header/header.component.spec.ts index f454fc45b4..1772dbdf02 100644 --- a/lib/core/src/lib/layout/components/header/header.component.spec.ts +++ b/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', () => { diff --git a/lib/core/src/lib/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts b/lib/core/src/lib/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts index a84cde06e7..ac94814de9 100644 --- a/lib/core/src/lib/layout/components/sidebar-action/sidebar-action-menu.component.spec.ts +++ b/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; - 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; diff --git a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts index dd7e10ea89..8174c4db04 100644 --- a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts +++ b/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(); diff --git a/lib/core/src/lib/login/components/login-dialog-panel.component.spec.ts b/lib/core/src/lib/login/components/login-dialog-panel.component.spec.ts index 85e423fb15..8a59359409 100644 --- a/lib/core/src/lib/login/components/login-dialog-panel.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/login/components/login.component.spec.ts b/lib/core/src/lib/login/components/login.component.spec.ts index 001a7ee7a6..ee2450f3aa 100644 --- a/lib/core/src/lib/login/components/login.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/login/directives/login-footer.directive.spec.ts b/lib/core/src/lib/login/directives/login-footer.directive.spec.ts index f948ebd53c..bce4351a80 100644 --- a/lib/core/src/lib/login/directives/login-footer.directive.spec.ts +++ b/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); diff --git a/lib/core/src/lib/login/directives/login-header.directive.spec.ts b/lib/core/src/lib/login/directives/login-header.directive.spec.ts index 5681ee12e5..635eca7c57 100644 --- a/lib/core/src/lib/login/directives/login-header.directive.spec.ts +++ b/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); diff --git a/lib/core/src/lib/notifications/components/notification-history.component.spec.ts b/lib/core/src/lib/notifications/components/notification-history.component.spec.ts index 53b94417a3..4badb74015 100644 --- a/lib/core/src/lib/notifications/components/notification-history.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/notifications/services/notification.service.spec.ts b/lib/core/src/lib/notifications/services/notification.service.spec.ts index 1aa5f89e6b..bceb28fa69 100644 --- a/lib/core/src/lib/notifications/services/notification.service.spec.ts +++ b/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; 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(); diff --git a/lib/core/src/lib/pagination/infinite-pagination.component.spec.ts b/lib/core/src/lib/pagination/infinite-pagination.component.spec.ts index d7b98f3a4c..c48bbf9ae5 100644 --- a/lib/core/src/lib/pagination/infinite-pagination.component.spec.ts +++ b/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); diff --git a/lib/core/src/lib/pagination/pagination.component.spec.ts b/lib/core/src/lib/pagination/pagination.component.spec.ts index 4df8e1200d..a8cab5df57 100644 --- a/lib/core/src/lib/pagination/pagination.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/pipes/decimal-number.pipe.spec.ts b/lib/core/src/lib/pipes/decimal-number.pipe.spec.ts index 6c5f18d572..ffb1d2c5f6 100644 --- a/lib/core/src/lib/pipes/decimal-number.pipe.spec.ts +++ b/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)); diff --git a/lib/core/src/lib/pipes/localized-date.pipe.spec.ts b/lib/core/src/lib/pipes/localized-date.pipe.spec.ts index 80d2d5ea36..8269776807 100644 --- a/lib/core/src/lib/pipes/localized-date.pipe.spec.ts +++ b/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)); diff --git a/lib/core/src/lib/pipes/multi-value.pipe.spec.ts b/lib/core/src/lib/pipes/multi-value.pipe.spec.ts index 55da80b1a9..5977cb180a 100644 --- a/lib/core/src/lib/pipes/multi-value.pipe.spec.ts +++ b/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); }); diff --git a/lib/core/src/lib/pipes/time-ago.pipe.spec.ts b/lib/core/src/lib/pipes/time-ago.pipe.spec.ts index 00ae34aa13..9b2ff1557a 100644 --- a/lib/core/src/lib/pipes/time-ago.pipe.spec.ts +++ b/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)); diff --git a/lib/core/src/lib/search-text/search-text-input.component.spec.ts b/lib/core/src/lib/search-text/search-text-input.component.spec.ts index 5b009a477f..52ebe15843 100644 --- a/lib/core/src/lib/search-text/search-text-input.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/templates/empty-content/empty-content.component.spec.ts b/lib/core/src/lib/templates/empty-content/empty-content.component.spec.ts index 17f40d271c..6797c3eb91 100644 --- a/lib/core/src/lib/templates/empty-content/empty-content.component.spec.ts +++ b/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; 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); }); diff --git a/lib/core/src/lib/templates/error-content/error-content.component.spec.ts b/lib/core/src/lib/templates/error-content/error-content.component.spec.ts index 7b19fa18c0..8d5b738673 100644 --- a/lib/core/src/lib/templates/error-content/error-content.component.spec.ts +++ b/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(); diff --git a/lib/core/src/lib/testing/core.testing.module.ts b/lib/core/src/lib/testing/core.testing.module.ts index 09273dce3f..a90762bedb 100644 --- a/lib/core/src/lib/testing/core.testing.module.ts +++ b/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 {} diff --git a/lib/core/src/lib/testing/setup-test-bed.ts b/lib/core/src/lib/testing/setup-test-bed.ts index a588e04b96..3abacaed48 100644 --- a/lib/core/src/lib/testing/setup-test-bed.ts +++ b/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(); diff --git a/lib/core/src/lib/translation/translate-loader.spec.ts b/lib/core/src/lib/translation/translate-loader.spec.ts index dad2250557..a02da25253 100644 --- a/lib/core/src/lib/translation/translate-loader.spec.ts +++ b/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; diff --git a/lib/core/src/lib/viewer/components/img-viewer.component.spec.ts b/lib/core/src/lib/viewer/components/img-viewer.component.spec.ts index fe897a48c9..9e15ec85d4 100644 --- a/lib/core/src/lib/viewer/components/img-viewer.component.spec.ts +++ b/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', () => { diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.spec.ts b/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.spec.ts index bfd1f37618..b4302e533f 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer-password-dialog.spec.ts +++ b/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; let dialogRef: MatDialogRef; - 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); diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumb.component.spec.ts b/lib/core/src/lib/viewer/components/pdf-viewer-thumb.component.spec.ts index 68c7ee6bb5..e94a38adee 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer-thumb.component.spec.ts +++ b/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; }); diff --git a/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails.component.spec.ts b/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails.component.spec.ts index 51ac68ec13..896b663698 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer-thumbnails.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/viewer/components/pdf-viewer.component.spec.ts b/lib/core/src/lib/viewer/components/pdf-viewer.component.spec.ts index e157accbfd..5f482b4d29 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer.component.spec.ts +++ b/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); diff --git a/lib/core/src/lib/viewer/components/txt-viewer.component.spec.ts b/lib/core/src/lib/viewer/components/txt-viewer.component.spec.ts index 4d998bf3ff..ef361aae3a 100644 --- a/lib/core/src/lib/viewer/components/txt-viewer.component.spec.ts +++ b/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; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); fixture = TestBed.createComponent(TxtViewerComponent); element = fixture.nativeElement; diff --git a/lib/core/src/lib/viewer/components/viewer-render.component.spec.ts b/lib/core/src/lib/viewer/components/viewer-render.component.spec.ts index 324bca5f46..750c54fe18 100644 --- a/lib/core/src/lib/viewer/components/viewer-render.component.spec.ts +++ b/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; diff --git a/lib/core/src/lib/viewer/directives/viewer-extension.directive.spec.ts b/lib/core/src/lib/viewer/directives/viewer-extension.directive.spec.ts index 40b2506db4..10fc39a265 100644 --- a/lib/core/src/lib/viewer/directives/viewer-extension.directive.spec.ts +++ b/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}; }); diff --git a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.spec.ts b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.spec.ts index 5a19405928..da635c04c9 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-generator.component.spec.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-generator.component.spec.ts @@ -21,7 +21,6 @@ import { Chart } from '../../diagram/models/chart/chart.model'; import { ReportQuery } from '../../diagram/models/report/report-query.model'; import * as analyticMock from '../../mock'; import { AnalyticsGeneratorComponent } from '../components/analytics-generator.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -32,14 +31,13 @@ describe('AnalyticsGeneratorComponent', () => { let component: any; let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(AnalyticsGeneratorComponent); component = fixture.componentInstance; diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-heat-map.component.spec.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-heat-map.component.spec.ts index b25569ee07..0294220f18 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-heat-map.component.spec.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-heat-map.component.spec.ts @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AnalyticsReportHeatMapComponent } from '../components/analytics-report-heat-map.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -37,14 +36,13 @@ describe('AnalyticsReportHeatMapComponent', () => { const totalTimeValues: any = { 'sid-fake-id': 1, 'fake-start-event': 4 }; const avgTimeValues: any = { 'sid-fake-id': 4, 'fake-start-event': 5 }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(AnalyticsReportHeatMapComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.spec.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.spec.ts index 0704209f8e..d2d901887d 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.spec.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-list.component.spec.ts @@ -18,7 +18,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AnalyticsReportListComponent, LAYOUT_GRID, LAYOUT_LIST } from '../components/analytics-report-list.component'; import { ReportParametersModel } from '../../diagram/models/report/report-parameters.model'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -40,14 +39,13 @@ describe('AnalyticsReportListComponent', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(AnalyticsReportListComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.spec.ts b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.spec.ts index 20847460c1..3f051ec906 100644 --- a/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.spec.ts +++ b/lib/insights/src/lib/analytics-process/components/analytics-report-parameters.component.spec.ts @@ -20,7 +20,6 @@ import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; import { ReportParametersModel } from '../../diagram/models/report/report-parameters.model'; import * as analyticParamsMock from '../../mock'; import { AnalyticsReportParametersComponent } from '../components/analytics-report-parameters.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { AnalyticsService } from '../services/analytics.service'; import { of } from 'rxjs'; @@ -36,14 +35,13 @@ describe('AnalyticsReportParametersComponent', () => { let validForm = false; let service: AnalyticsService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(AnalyticsReportParametersComponent); service = TestBed.inject(AnalyticsService); component = fixture.componentInstance; diff --git a/lib/insights/src/lib/analytics-process/components/analytics.component.spec.ts b/lib/insights/src/lib/analytics-process/components/analytics.component.spec.ts deleted file mode 100644 index 96a1d5befd..0000000000 --- a/lib/insights/src/lib/analytics-process/components/analytics.component.spec.ts +++ /dev/null @@ -1,44 +0,0 @@ -/*! - * @license - * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AnalyticsComponent } from '../components/analytics.component'; -import { setupTestBed } from '@alfresco/adf-core'; -import { InsightsTestingModule } from '../../testing/insights.testing.module'; -import { TranslateModule } from '@ngx-translate/core'; - -describe('AnalyticsComponent', () => { - - let fixture: ComponentFixture; - - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - - beforeEach(() => { - fixture = TestBed.createComponent(AnalyticsComponent); - fixture.detectChanges(); - }); - - it('should create component', () => { - expect(fixture.componentInstance).toBeDefined(); - }); -}); diff --git a/lib/insights/src/lib/analytics-process/services/analytics.service.spec.ts b/lib/insights/src/lib/analytics-process/services/analytics.service.spec.ts index 58283c9743..568f702d79 100644 --- a/lib/insights/src/lib/analytics-process/services/analytics.service.spec.ts +++ b/lib/insights/src/lib/analytics-process/services/analytics.service.spec.ts @@ -18,7 +18,6 @@ import { TestBed } from '@angular/core/testing'; import { fakeReportList } from '../../mock'; import { AnalyticsService } from './analytics.service'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -28,14 +27,13 @@ describe('AnalyticsService', () => { let service: AnalyticsService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); service = TestBed.inject(AnalyticsService); }); diff --git a/lib/insights/src/lib/diagram/components/diagram.component.activities.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.activities.spec.ts index 4394f29f46..7adb7313f9 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.activities.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.activities.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import * as diagramsActivitiesMock from '../../mock/diagram/diagram-activities.mock'; import { DiagramComponent } from './diagram.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,14 +30,13 @@ describe('Diagrams activities', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(DiagramComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.boundary.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.boundary.spec.ts index 91970ff7c2..0f34e6188a 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.boundary.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.boundary.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import * as boundaryEventMock from '../../mock/diagram/diagram-boundary.mock'; import { DiagramComponent } from './diagram.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,14 +30,13 @@ describe('Diagrams boundary', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(DiagramComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.catching.events.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.catching.events.spec.ts index bc4da3c103..a211c978b3 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.catching.events.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.catching.events.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import * as intermediateCatchingMock from '../../mock/diagram/diagram-intermediate.mock'; import { DiagramComponent } from './diagram.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,14 +30,13 @@ describe('Diagrams Catching', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(DiagramComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.events.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.events.spec.ts index 7531216c1a..1d5d5dc1ce 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.events.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.events.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import * as diagramsEventsMock from '../../mock/diagram/diagram-events.mock'; import { DiagramComponent } from './diagram.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,21 +30,18 @@ describe('Diagrams events', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(DiagramComponent); component = fixture.componentInstance; element = fixture.nativeElement; fixture.detectChanges(); - }); - beforeEach(() => { jasmine.Ajax.install(); component.processInstanceId = '38399'; component.processDefinitionId = 'fakeprocess:24:38399'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.flows.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.flows.spec.ts index fec4123323..d58f74fadd 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.flows.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.flows.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import * as flowsMock from '../../mock/diagram/diagram-flows.mock'; import { DiagramComponent } from './diagram.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,14 +30,13 @@ describe('Diagrams flows', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(DiagramComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.gateways.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.gateways.spec.ts index b43c4c4f8b..4e1e633285 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.gateways.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.gateways.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import * as diagramsGatewaysMock from '../../mock/diagram/diagram-gateways.mock'; import { DiagramComponent } from './diagram.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,21 +30,18 @@ describe('Diagrams gateways', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(DiagramComponent); component = fixture.componentInstance; element = fixture.nativeElement; fixture.detectChanges(); - }); - beforeEach(() => { jasmine.Ajax.install(); component.processInstanceId = '38399'; component.processDefinitionId = 'fakeprocess:24:38399'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.structural.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.structural.spec.ts index 15516490fb..0bd5b5d7ab 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.structural.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.structural.spec.ts @@ -16,10 +16,8 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; - import * as structuralMock from '../../mock/diagram/diagram-structural.mock'; import { DiagramComponent } from './diagram.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,21 +29,18 @@ describe('Diagrams structural', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(DiagramComponent); component = fixture.componentInstance; element = fixture.nativeElement; fixture.detectChanges(); - }); - beforeEach(() => { jasmine.Ajax.install(); component.processInstanceId = '38399'; component.processDefinitionId = 'fakeprocess:24:38399'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.swim.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.swim.spec.ts index 42fa4084a3..8c090a15ad 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.swim.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.swim.spec.ts @@ -16,10 +16,8 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; - import * as swimLanesMock from '../../mock/diagram/diagram-swimlanes.mock'; import { DiagramComponent } from './diagram.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,21 +29,18 @@ describe('Diagrams swim', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); fixture = TestBed.createComponent(DiagramComponent); component = fixture.componentInstance; element = fixture.nativeElement; fixture.detectChanges(); - }); - beforeEach(() => { jasmine.Ajax.install(); component.processInstanceId = '38399'; component.processDefinitionId = 'fakeprocess:24:38399'; diff --git a/lib/insights/src/lib/diagram/components/diagram.component.throw.spec.ts b/lib/insights/src/lib/diagram/components/diagram.component.throw.spec.ts index 5d41c5b3d1..8791f182d5 100644 --- a/lib/insights/src/lib/diagram/components/diagram.component.throw.spec.ts +++ b/lib/insights/src/lib/diagram/components/diagram.component.throw.spec.ts @@ -16,10 +16,8 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; - import * as throwEventMock from '../../mock/diagram/diagram-throw.mock'; import { DiagramComponent } from './diagram.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -31,14 +29,13 @@ describe('Diagrams throw', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); jasmine.Ajax.install(); fixture = TestBed.createComponent(DiagramComponent); diff --git a/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.spec.ts b/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.spec.ts index 1153819c1a..c789a4b2a8 100644 --- a/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.spec.ts +++ b/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.spec.ts @@ -19,7 +19,6 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { DiagramTooltipComponent } from './diagram-tooltip.component'; -import { setupTestBed } from '@alfresco/adf-core'; @Component({ template: ` @@ -40,11 +39,10 @@ describe('DiagramTooltipComponent', () => { let component: DiagramTooltipComponent; let data; - setupTestBed({ - declarations: [DiagramTooltipComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [DiagramTooltipComponent] + }); fixture = TestBed.createComponent(DiagramTooltipComponent); component = fixture.componentInstance; data = { @@ -123,16 +121,13 @@ describe('DiagramTooltipComponent', () => { }); describe('Tooltip functionality', () => { - let fixture: ComponentFixture; - setupTestBed({ - declarations: [DiagramTooltipComponent, TestHostComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + declarations: [DiagramTooltipComponent, TestHostComponent] + }); fixture = TestBed.createComponent(TestHostComponent); - fixture.detectChanges(); }); diff --git a/lib/insights/src/lib/diagram/services/diagrams.service.spec.ts b/lib/insights/src/lib/diagram/services/diagrams.service.spec.ts index c784a1cada..5f9b066263 100644 --- a/lib/insights/src/lib/diagram/services/diagrams.service.spec.ts +++ b/lib/insights/src/lib/diagram/services/diagrams.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { DiagramsService } from './diagrams.service'; import { InsightsTestingModule } from '../../testing/insights.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -24,17 +24,15 @@ import { TranslateModule } from '@ngx-translate/core'; declare let jasmine: any; describe('DiagramsService', () => { - let service: DiagramsService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - InsightsTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + InsightsTestingModule + ] + }); const appConfig: AppConfigService = TestBed.inject(AppConfigService); appConfig.config.ecmHost = 'http://localhost:9876/ecm'; diff --git a/lib/process-services-cloud/karma.conf.js b/lib/process-services-cloud/karma.conf.js index f72cd47e97..48ac3023c9 100644 --- a/lib/process-services-cloud/karma.conf.js +++ b/lib/process-services-cloud/karma.conf.js @@ -17,12 +17,6 @@ module.exports = function (config) { }, { pattern: 'node_modules/chart.js/dist/Chart.js', included: true, watched: false }, { pattern: 'node_modules/raphael/raphael.min.js', included: true, watched: false }, - { - pattern: 'node_modules/ng2-charts/bundles/ng2-charts.umd.js', - included: false, - served: true, - watched: false - }, { pattern: 'node_modules/moment/min/moment.min.js', included: true, watched: false }, { pattern: 'lib/core/src/lib/i18n/**/en.json', included: false, served: true, watched: false }, { pattern: 'lib/process-services-cloud/src/lib/i18n/*.json', included: false, served: true, watched: false }, diff --git a/lib/process-services-cloud/src/lib/app/components/app-details-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/app/components/app-details-cloud.component.spec.ts index fc9d5aca5d..88d7dec32b 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-details-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/app/components/app-details-cloud.component.spec.ts @@ -16,8 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; - import { fakeApplicationInstance } from '../mock/app-model.mock'; import { AppDetailsCloudComponent } from './app-details-cloud.component'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; @@ -30,15 +28,14 @@ describe('AppDetailsCloudComponent', () => { let component: AppDetailsCloudComponent; let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - AppListCloudModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + AppListCloudModule + ] + }); fixture = TestBed.createComponent(AppDetailsCloudComponent); component = fixture.componentInstance; component.applicationInstance = fakeApplicationInstance[0]; diff --git a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts index 256ba520a6..5a57924714 100644 --- a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts @@ -17,7 +17,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed, AlfrescoApiService } from '@alfresco/adf-core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { of, throwError } from 'rxjs'; import { fakeApplicationInstance } from '../mock/app-model.mock'; @@ -55,15 +55,14 @@ describe('AppListCloudComponent', () => { class CustomEmptyAppListCloudTemplateComponent { } - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [CustomEmptyAppListCloudTemplateComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [CustomEmptyAppListCloudTemplateComponent] + }); fixture = TestBed.createComponent(AppListCloudComponent); component = fixture.componentInstance; alfrescoApiService = TestBed.inject(AlfrescoApiService); diff --git a/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.spec.ts index 617e0a5cba..a3319609d9 100644 --- a/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.spec.ts @@ -17,7 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { throwError } from 'rxjs'; -import { setupTestBed, AppConfigService, AlfrescoApiService, CoreTestingModule } from '@alfresco/adf-core'; +import { AppConfigService, AlfrescoApiService, CoreTestingModule } from '@alfresco/adf-core'; import { HttpErrorResponse } from '@angular/common/http'; import { AppsProcessCloudService } from './apps-process-cloud.service'; import { fakeApplicationInstance, fakeApplicationInstanceWithEnvironment } from '../mock/app-model.mock'; @@ -34,19 +34,18 @@ describe('AppsProcessCloudService', () => { const apiMockResponse: any = Promise.resolve({list : { entries: [ {entry: fakeApplicationInstance[0]}, {entry: fakeApplicationInstance[1]}] }}); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - ProcessServiceCloudTestingModule - ], - providers: [ - AlfrescoApiService, - AppConfigService - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + ProcessServiceCloudTestingModule + ], + providers: [ + AlfrescoApiService, + AppConfigService + ] + }); adfHttpClient = TestBed.inject(AdfHttpClient); spyOn(adfHttpClient, 'request').and.returnValue(apiMockResponse); diff --git a/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.spec.ts b/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.spec.ts index 31025aa8a3..c3faf1e187 100644 --- a/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.spec.ts +++ b/lib/process-services-cloud/src/lib/common/date-range-filter/date-range-filter.component.spec.ts @@ -17,7 +17,6 @@ import { DateRangeFilterComponent } from './date-range-filter.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { MatSelectChange } from '@angular/material/select'; @@ -31,14 +30,13 @@ describe('DateRangeFilterComponent', () => { let fixture: ComponentFixture; let service: DateRangeFilterService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); fixture = TestBed.createComponent(DateRangeFilterComponent); component = fixture.componentInstance; service = TestBed.inject(DateRangeFilterService); diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud-custom-outcomes.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud-custom-outcomes.component.spec.ts index 7e7a4d845c..359daa79f0 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud-custom-outcomes.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud-custom-outcomes.component.spec.ts @@ -15,13 +15,8 @@ * limitations under the License. */ -import { - FormModel, setupTestBed -} from '@alfresco/adf-core'; -import { - Component, - DebugElement, ViewChild -} from '@angular/core'; +import { FormModel } from '@alfresco/adf-core'; +import { Component, DebugElement, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { TranslateModule } from '@ngx-translate/core'; @@ -60,15 +55,14 @@ describe('FormCloudWithCustomOutComesComponent', () => { let customComponent: FormCloudWithCustomOutComesComponent; let debugElement: DebugElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [FormCloudWithCustomOutComesComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [FormCloudWithCustomOutComesComponent] + }); fixture = TestBed.createComponent(FormCloudWithCustomOutComesComponent); customComponent = fixture.componentInstance; debugElement = fixture.debugElement; diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts index fddc165652..803db3b824 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts @@ -24,7 +24,7 @@ import { FormFieldTypes, FormModel, FormOutcomeEvent, - FormOutcomeModel, FormRenderingService, FormService, setupTestBed, + FormOutcomeModel, FormRenderingService, FormService, TRANSLATION_PROVIDER, UploadWidgetContentLinkModel, WidgetVisibilityService } from '@alfresco/adf-core'; import { Node } from '@alfresco/js-api'; @@ -92,20 +92,19 @@ describe('FormCloudComponent', () => { return componentRef.instance; }; - setupTestBed({ - imports: [ - ProcessServiceCloudTestingModule - ], - providers: [ - { - provide: VersionCompatibilityService, - useValue: {} - }, - { provide: FormRenderingService, useClass: CloudFormRenderingService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + ProcessServiceCloudTestingModule + ], + providers: [ + { + provide: VersionCompatibilityService, + useValue: {} + }, + { provide: FormRenderingService, useClass: CloudFormRenderingService } + ] + }); const apiService = TestBed.inject(AlfrescoApiService); spyOn(apiService, 'getInstance').and.returnValue(mockOauth2Auth); @@ -1148,25 +1147,24 @@ describe('Multilingual Form', () => { let formComponent: FormCloudComponent; let fixture: ComponentFixture; - setupTestBed({ - imports: [ - NoopAnimationsModule, - TranslateModule.forRoot(), - CoreModule.forRoot() - ], - providers: [ - { - provide: TRANSLATION_PROVIDER, - multi: true, - useValue: { - name: 'app', - source: 'resources' - } - } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, + TranslateModule.forRoot(), + CoreModule.forRoot() + ], + providers: [ + { + provide: TRANSLATION_PROVIDER, + multi: true, + useValue: { + name: 'app', + source: 'resources' + } + } + ] + }); translateService = TestBed.inject(TranslateService); formCloudService = TestBed.inject(FormCloudService); @@ -1214,30 +1212,6 @@ describe('Multilingual Form', () => { }); describe('retrieve metadata on submit', () => { - - setupTestBed({ - imports: [ - NoopAnimationsModule, - TranslateModule.forRoot(), - CoreModule.forRoot(), - FormCloudModule - ], - providers: [ - { - provide: TRANSLATION_PROVIDER, - multi: true, - useValue: { - name: 'app', - source: 'resources' - } - }, - { - provide: VersionCompatibilityService, - useValue: {} - } - ] - }); - let formComponent: FormCloudComponent; let fixture: ComponentFixture; let formService: FormService; @@ -1255,6 +1229,28 @@ describe('retrieve metadata on submit', () => { } as Node; beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + NoopAnimationsModule, + TranslateModule.forRoot(), + CoreModule.forRoot(), + FormCloudModule + ], + providers: [ + { + provide: TRANSLATION_PROVIDER, + multi: true, + useValue: { + name: 'app', + source: 'resources' + } + }, + { + provide: VersionCompatibilityService, + useValue: {} + } + ] + }); const apiService = TestBed.inject(AlfrescoApiService); spyOn(apiService, 'getInstance').and.returnValue(mockOauth2Auth); diff --git a/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.spec.ts index 00c129cd5c..47cba1b71e 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-definition-selector-cloud.component.spec.ts @@ -16,7 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { FormDefinitionSelectorCloudComponent } from './form-definition-selector-cloud.component'; @@ -32,15 +31,14 @@ describe('FormDefinitionCloudComponent', () => { let element: HTMLElement; let getFormsSpy: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(FormDefinitionSelectorCloudComponent); element = fixture.nativeElement; service = TestBed.inject(FormDefinitionSelectorCloudService); diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.spec.ts index 0ffb137697..92de22c175 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.spec.ts @@ -21,7 +21,6 @@ import { ContentCloudNodeSelectorService } from '../../../services/content-cloud import { ProcessCloudContentService } from '../../../services/process-cloud-content.service'; import { AttachFileCloudWidgetComponent } from './attach-file-cloud-widget.component'; import { - setupTestBed, FormFieldModel, FormModel, FormFieldTypes, @@ -133,17 +132,16 @@ describe('AttachFileCloudWidgetComponent', () => { attachButton.click(); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - FormCloudModule, - ContentModule.forRoot() - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + FormCloudModule, + ContentModule.forRoot() + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); downloadService = TestBed.inject(DownloadService); fixture = TestBed.createComponent(AttachFileCloudWidgetComponent); widget = fixture.componentInstance; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.spec.ts index d79bcc9ccb..832f7757c3 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DateCloudWidgetComponent } from './date-cloud.widget'; -import { setupTestBed, FormFieldModel, FormModel, FormFieldTypes } from '@alfresco/adf-core'; +import { FormFieldModel, FormModel, FormFieldTypes } from '@alfresco/adf-core'; import moment from 'moment'; import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -30,14 +30,13 @@ describe('DateWidgetComponent', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); fixture = TestBed.createComponent(DateCloudWidgetComponent); widget = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/display-rich-text/display-rich-text.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/display-rich-text/display-rich-text.widget.spec.ts index e20bd6d0f0..324c81391b 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/display-rich-text/display-rich-text.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/display-rich-text/display-rich-text.widget.spec.ts @@ -18,7 +18,7 @@ import { DebugElement } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { CoreTestingModule, setupTestBed } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { DisplayRichTextWidgetComponent } from './display-rich-text.widget'; @@ -61,13 +61,12 @@ describe('DisplayRichTextWidgetComponent', () => { } }; - setupTestBed({ - imports: [ - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + CoreTestingModule + ] + }); fixture = TestBed.createComponent(DisplayRichTextWidgetComponent); widget = fixture.componentInstance; debugEl = fixture.debugElement; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts index 3d13bef038..ed96719b4c 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/dropdown/dropdown-cloud.widget.spec.ts @@ -23,7 +23,6 @@ import { FormFieldModel, FormModel, FormService, - setupTestBed, FormFieldEvent, FormFieldTypes, LogService @@ -63,14 +62,13 @@ describe('DropdownCloudWidgetComponent', () => { fixture.detectChanges(); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); fixture = TestBed.createComponent(DropdownCloudWidgetComponent); widget = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/group/group-cloud.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/group/group-cloud.widget.spec.ts index d5e5187021..ecf65dc5cc 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/group/group-cloud.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/group/group-cloud.widget.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { FormFieldModel, FormFieldTypes, FormModel, IdentityGroupModel, setupTestBed } from '@alfresco/adf-core'; +import { FormFieldModel, FormFieldTypes, FormModel, IdentityGroupModel } from '@alfresco/adf-core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { GroupCloudWidgetComponent } from './group-cloud.widget'; import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module'; @@ -28,20 +28,19 @@ describe('GroupCloudWidgetComponent', () => { let widget: GroupCloudWidgetComponent; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [ - GroupCloudWidgetComponent - ], - schemas: [ - CUSTOM_ELEMENTS_SCHEMA - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [ + GroupCloudWidgetComponent + ], + schemas: [ + CUSTOM_ELEMENTS_SCHEMA + ] + }); fixture = TestBed.createComponent(GroupCloudWidgetComponent); widget = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/people/people-cloud.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/people/people-cloud.widget.spec.ts index cb01d8899b..61b3c5d94d 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/people/people-cloud.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/people/people-cloud.widget.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { FormFieldModel, FormFieldTypes, FormModel, IdentityUserModel, setupTestBed } from '@alfresco/adf-core'; +import { FormFieldModel, FormFieldTypes, FormModel, IdentityUserModel } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { PeopleCloudWidgetComponent } from './people-cloud.widget'; @@ -31,20 +31,19 @@ describe('PeopleCloudWidgetComponent', () => { let element: HTMLElement; let identityUserService: IdentityUserService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [ - PeopleCloudWidgetComponent - ], - schemas: [ - CUSTOM_ELEMENTS_SCHEMA - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [ + PeopleCloudWidgetComponent + ], + schemas: [ + CUSTOM_ELEMENTS_SCHEMA + ] + }); identityUserService = TestBed.inject(IdentityUserService); fixture = TestBed.createComponent(PeopleCloudWidgetComponent); widget = fixture.componentInstance; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer-wrapper/properties-viewer.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer-wrapper/properties-viewer.widget.spec.ts index 5f35a8299a..21461be3ac 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer-wrapper/properties-viewer.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer-wrapper/properties-viewer.widget.spec.ts @@ -16,9 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { - setupTestBed -} from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { PropertiesViewerWrapperComponent } from './properties-viewer-wrapper.component'; import { ProcessServiceCloudTestingModule } from '../../../../../testing/process-service-cloud.testing.module'; @@ -31,18 +28,17 @@ describe('PropertiesViewerWidgetComponent', () => { let fixture: ComponentFixture; let nodesApiService: NodesApiService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - providers: [ - NodesApiService, - { provide: BasicPropertiesService, useValue: { getProperties: () => [] } } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + providers: [ + NodesApiService, + { provide: BasicPropertiesService, useValue: { getProperties: () => [] } } + ] + }); fixture = TestBed.createComponent(PropertiesViewerWrapperComponent); component = fixture.componentInstance; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.spec.ts index d5e70317a9..7f36ddea9e 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/properties-viewer/properties-viewer.widget.spec.ts @@ -16,11 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { - FormFieldModel, - FormModel, - setupTestBed -} from '@alfresco/adf-core'; +import { FormFieldModel, FormModel } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { PropertiesViewerWidgetComponent } from './properties-viewer.widget'; import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module'; @@ -50,19 +46,18 @@ describe('PropertiesViewerWidgetComponent', () => { createdBy: { id: 1001, firstName: 'Admin', lastName: 'admin', email: 'admin@example.com' } }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [PropertiesViewerWrapperComponent], - providers: [ - NodesApiService, - { provide: BasicPropertiesService, useValue: { getProperties: () => [] } } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [PropertiesViewerWrapperComponent], + providers: [ + NodesApiService, + { provide: BasicPropertiesService, useValue: { getProperties: () => [] } } + ] + }); fixture = TestBed.createComponent(PropertiesViewerWidgetComponent); nodesApiService = TestBed.inject(NodesApiService); widget = fixture.componentInstance; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/radio-buttons/radio-buttons-cloud.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/radio-buttons/radio-buttons-cloud.widget.spec.ts index c0a6c9c5db..073f96b107 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/radio-buttons/radio-buttons-cloud.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/radio-buttons/radio-buttons-cloud.widget.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { FormFieldModel, FormFieldOption, FormFieldTypes, FormModel, setupTestBed } from '@alfresco/adf-core'; +import { FormFieldModel, FormFieldOption, FormFieldTypes, FormModel } from '@alfresco/adf-core'; import { FormCloudService } from '../../../services/form-cloud.service'; import { RadioButtonsCloudWidgetComponent } from './radio-buttons-cloud.widget'; import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module'; @@ -40,14 +40,13 @@ describe('RadioButtonsCloudWidgetComponent', () => { } ]; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); formCloudService = TestBed.inject(FormCloudService); fixture = TestBed.createComponent(RadioButtonsCloudWidgetComponent); widget = fixture.componentInstance; diff --git a/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts b/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts index a701d3c04e..48af074828 100644 --- a/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts +++ b/lib/process-services-cloud/src/lib/form/services/content-cloud-node-selector.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { AlfrescoApiService, AlfrescoApiServiceMock, NotificationService, setupTestBed } from '@alfresco/adf-core'; +import { AlfrescoApiService, AlfrescoApiServiceMock, NotificationService } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { TranslateModule } from '@ngx-translate/core'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; @@ -49,14 +49,13 @@ describe('ContentCloudNodeSelectorService', () => { } }; - setupTestBed({ - imports: [TranslateModule.forRoot(), ProcessServiceCloudTestingModule, MatDialogModule], - providers: [ - { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [TranslateModule.forRoot(), ProcessServiceCloudTestingModule, MatDialogModule], + providers: [ + { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock } + ] + }); service = TestBed.inject(ContentCloudNodeSelectorService); notificationService = TestBed.inject(NotificationService); dialog = TestBed.inject(MatDialog); diff --git a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts index 5f49ea073b..15d7a3a72c 100644 --- a/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/form/services/form-cloud.service.spec.ts @@ -17,7 +17,6 @@ import { TestBed } from '@angular/core/testing'; import { FormCloudService } from './form-cloud.service'; -import { setupTestBed } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -39,14 +38,13 @@ describe('Form Cloud service', () => { const taskId = 'task-id'; const processInstanceId = 'process-instance-id'; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); service = TestBed.inject(FormCloudService); adfHttpClient = TestBed.inject(AdfHttpClient); requestSpy = spyOn(adfHttpClient, 'request'); diff --git a/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.spec.ts index c287c673bb..7d5b4d8ffa 100644 --- a/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/form/services/form-definition-selector-cloud.service.spec.ts @@ -16,7 +16,6 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { FormDefinitionSelectorCloudService } from './form-definition-selector-cloud.service'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -29,14 +28,13 @@ describe('Form Definition Selector Cloud Service', () => { let adfHttpClient: AdfHttpClient; const appName = 'app-name'; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); service = TestBed.inject(FormDefinitionSelectorCloudService); adfHttpClient = TestBed.inject(AdfHttpClient); spyOn(adfHttpClient, 'request').and.returnValue(Promise.resolve(mockFormRepresentations)); diff --git a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts index a2ea107888..4833fbb4c3 100644 --- a/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/group/components/group-cloud.component.spec.ts @@ -19,13 +19,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; import { ProcessServiceCloudTestingModule } from './../../testing/process-service-cloud.testing.module'; - import { GroupCloudModule } from '../group-cloud.module'; import { GroupCloudComponent } from './group-cloud.component'; -import { - setupTestBed, - CoreTestingModule -} from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { SimpleChange } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { IdentityGroupService } from '../services/identity-group.service'; @@ -72,16 +68,15 @@ describe('GroupCloudComponent', () => { return fixture.debugElement.queryAll(By.css('[data-automation-id="adf-cloud-group-row"]')); } - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - ProcessServiceCloudTestingModule, - GroupCloudModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + ProcessServiceCloudTestingModule, + GroupCloudModule + ] + }); fixture = TestBed.createComponent(GroupCloudComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services-cloud/src/lib/group/services/identity-group.service.spec.ts b/lib/process-services-cloud/src/lib/group/services/identity-group.service.spec.ts index 4462476cef..0da48e3672 100644 --- a/lib/process-services-cloud/src/lib/group/services/identity-group.service.spec.ts +++ b/lib/process-services-cloud/src/lib/group/services/identity-group.service.spec.ts @@ -17,7 +17,6 @@ import { TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { IdentityGroupService } from './identity-group.service'; import { @@ -35,14 +34,13 @@ describe('IdentityGroupService', () => { let adfHttpClient: AdfHttpClient; let requestSpy: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); service = TestBed.inject(IdentityGroupService); adfHttpClient = TestBed.inject(AdfHttpClient); requestSpy = spyOn(adfHttpClient, 'request'); diff --git a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts index b2928ac81a..d0afae77b5 100644 --- a/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/people/components/people-cloud.component.spec.ts @@ -17,7 +17,7 @@ import { PeopleCloudComponent } from './people-cloud.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { PeopleCloudModule } from '../people-cloud.module'; import { DebugElement, SimpleChange } from '@angular/core'; @@ -83,16 +83,15 @@ describe('PeopleCloudComponent', () => { return element.querySelector('[data-automation-id="adf-people-cloud-row"]'); } - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - ProcessServiceCloudTestingModule, - PeopleCloudModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + ProcessServiceCloudTestingModule, + PeopleCloudModule + ] + }); fixture = TestBed.createComponent(PeopleCloudComponent); component = fixture.componentInstance; diff --git a/lib/process-services-cloud/src/lib/people/services/identity-user.service.spec.ts b/lib/process-services-cloud/src/lib/people/services/identity-user.service.spec.ts index 486dc7cc45..30e449eef3 100644 --- a/lib/process-services-cloud/src/lib/people/services/identity-user.service.spec.ts +++ b/lib/process-services-cloud/src/lib/people/services/identity-user.service.spec.ts @@ -17,7 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { JwtHelperService, setupTestBed } from '@alfresco/adf-core'; +import { JwtHelperService } from '@alfresco/adf-core'; import { IdentityUserService } from './identity-user.service'; import { mockToken } from '../mock/jwt-helper.service.spec'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; @@ -40,14 +40,13 @@ describe('IdentityUserService', () => { let adfHttpClient: AdfHttpClient; let requestSpy: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); service = TestBed.inject(IdentityUserService); adfHttpClient = TestBed.inject(AdfHttpClient); requestSpy = spyOn(adfHttpClient, 'request'); diff --git a/lib/process-services-cloud/src/lib/pipes/process-name-cloud.pipe.spec.ts b/lib/process-services-cloud/src/lib/pipes/process-name-cloud.pipe.spec.ts index 686029f425..595e581a41 100644 --- a/lib/process-services-cloud/src/lib/pipes/process-name-cloud.pipe.spec.ts +++ b/lib/process-services-cloud/src/lib/pipes/process-name-cloud.pipe.spec.ts @@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import moment from 'moment'; import { ProcessNameCloudPipe } from './process-name-cloud.pipe'; -import { setupTestBed, LocalizedDatePipe, CoreTestingModule } from '@alfresco/adf-core'; +import { LocalizedDatePipe, CoreTestingModule } from '@alfresco/adf-core'; import { ProcessInstanceCloud } from '../process/start-process/models/process-instance-cloud.model'; describe('ProcessNameCloudPipe', () => { @@ -35,14 +35,13 @@ describe('ProcessNameCloudPipe', () => { const nameWithAllIdentifiers = `${defaultName} ${processDefinitionIdentifier} - ${datetimeIdentifier}`; const fakeProcessInstanceDetails: ProcessInstanceCloud = { processDefinitionName: 'my-process-definition' }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); const localizedDatePipe = TestBed.inject(LocalizedDatePipe); processNamePipe = new ProcessNameCloudPipe(localizedDatePipe); }); diff --git a/lib/process-services-cloud/src/lib/process/directives/cancel-process.directive.spec.ts b/lib/process-services-cloud/src/lib/process/directives/cancel-process.directive.spec.ts index 8de4cac8b2..0c53b5f4cf 100644 --- a/lib/process-services-cloud/src/lib/process/directives/cancel-process.directive.spec.ts +++ b/lib/process-services-cloud/src/lib/process/directives/cancel-process.directive.spec.ts @@ -17,7 +17,6 @@ import { Component, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { CancelProcessDirective } from './cancel-process.directive'; import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -43,17 +42,16 @@ describe('CancelProcessDirective', () => { let identityUserService: IdentityUserService; let component: TestComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [ - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [ + TestComponent + ] + }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; identityUserService = TestBed.inject(IdentityUserService); diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts index 916c45c554..931e34d74f 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.spec.ts @@ -18,8 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SimpleChange } from '@angular/core'; import { By } from '@angular/platform-browser'; - -import { setupTestBed, AlfrescoApiService } from '@alfresco/adf-core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; import { MatDialog } from '@angular/material/dialog'; import { of } from 'rxjs'; @@ -75,20 +74,19 @@ describe('EditProcessFilterCloudComponent', () => { reply: jasmine.createSpy('reply') }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessFiltersCloudModule, - ProcessServiceCloudTestingModule, - MatIconTestingModule - ], - providers: [ - MatDialog, - { provide: PROCESS_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessFiltersCloudModule, + ProcessServiceCloudTestingModule, + MatIconTestingModule + ], + providers: [ + MatDialog, + { provide: PROCESS_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } + ] + }); fixture = TestBed.createComponent(EditProcessFilterCloudComponent); component = fixture.componentInstance; service = TestBed.inject(ProcessFilterCloudService); diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.spec.ts index 2dc63e9d1f..5d32a2d054 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.spec.ts @@ -18,7 +18,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { ProcessFilterDialogCloudComponent } from './process-filter-dialog-cloud.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; import { ProcessFiltersCloudModule } from '../process-filters-cloud.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -36,19 +35,18 @@ describe('ProcessFilterDialogCloudComponent', () => { data: {name: 'Mock-Title'} }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - ProcessFiltersCloudModule - ], - providers: [ - { provide: MatDialogRef, useValue: mockDialogRef }, - { provide: MAT_DIALOG_DATA, useValue: mockDialogData } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + ProcessFiltersCloudModule + ], + providers: [ + { provide: MatDialogRef, useValue: mockDialogRef }, + { provide: MAT_DIALOG_DATA, useValue: mockDialogData } + ] + }); fixture = TestBed.createComponent(ProcessFilterDialogCloudComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts index ebfe7c276b..c4db9f7d70 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filters-cloud.component.spec.ts @@ -17,7 +17,6 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { of, throwError } from 'rxjs'; import { ProcessFilterCloudService } from '../services/process-filter-cloud.service'; import { ProcessFiltersCloudComponent } from './process-filters-cloud.component'; @@ -35,18 +34,17 @@ describe('ProcessFiltersCloudComponent', () => { let fixture: ComponentFixture; let getProcessFiltersSpy: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - ProcessFiltersCloudModule - ], - providers: [ - { provide: PROCESS_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + ProcessFiltersCloudModule + ], + providers: [ + { provide: PROCESS_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } + ] + }); fixture = TestBed.createComponent(ProcessFiltersCloudComponent); component = fixture.componentInstance; diff --git a/lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.spec.ts index 532c38dd94..4c3aba61e8 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/services/process-filter-cloud.service.spec.ts @@ -16,7 +16,6 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { ProcessFilterCloudService } from './process-filter-cloud.service'; import { PROCESS_FILTERS_SERVICE_TOKEN } from '../../../services/cloud-token.service'; @@ -42,17 +41,16 @@ describe('ProcessFilterCloudService', () => { email: 'fakeIdentity@email.com' }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - providers: [ - { provide: PROCESS_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + providers: [ + { provide: PROCESS_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } + ] + }); service = TestBed.inject(ProcessFilterCloudService); const preferenceCloudService = service.preferenceService; diff --git a/lib/process-services-cloud/src/lib/process/process-header/components/process-header-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-header/components/process-header-cloud.component.spec.ts index e147460f80..7417e2658e 100644 --- a/lib/process-services-cloud/src/lib/process/process-header/components/process-header-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-header/components/process-header-cloud.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed, AppConfigService } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; @@ -32,15 +32,14 @@ describe('ProcessHeaderCloudComponent', () => { let service: ProcessCloudService; let appConfigService: AppConfigService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - ProcessHeaderCloudModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + ProcessHeaderCloudModule + ] + }); fixture = TestBed.createComponent(ProcessHeaderCloudComponent); component = fixture.componentInstance; service = TestBed.inject(ProcessCloudService); diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts index 25f4977205..fee25b5ea0 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts @@ -26,8 +26,7 @@ import { DataRowEvent, DataTableModule, getDataColumnMock, - ObjectDataRow, - setupTestBed + ObjectDataRow, User } from '@alfresco/adf-core'; import { ProcessListCloudService } from '../services/process-list-cloud.service'; import { ProcessListCloudComponent } from './process-list-cloud.component'; @@ -62,6 +61,10 @@ import { PreferenceCloudServiceInterface } from '@alfresco/adf-process-services- class CustomTaskListComponent { @ViewChild(ProcessListCloudComponent) processListCloud: ProcessListCloudComponent; + + getFullName(person: User): string { + return `${person.firstName} ${person.lastName}`; + } } describe('ProcessListCloudComponent', () => { @@ -73,14 +76,13 @@ describe('ProcessListCloudComponent', () => { const fakeCustomSchemaName = 'fakeCustomSchema'; const schemaWithVariable = 'schemaWithVariableId'; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); appConfig = TestBed.inject(AppConfigService); processListCloudService = TestBed.inject(ProcessListCloudService); preferencesService = TestBed.inject(PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN); @@ -580,62 +582,64 @@ describe('ProcessListCloudComponent', () => { }); }); - describe('Injecting custom colums for tasklist - CustomTaskListComponent', () => { - let fixtureCustom: ComponentFixture; - let componentCustom: CustomTaskListComponent; +}); - setupTestBed({ +describe('ProcessListCloudComponent: Injecting custom columns for task list - CustomTaskListComponent', () => { + let fixtureCustom: ComponentFixture; + let componentCustom: CustomTaskListComponent; + + beforeEach(() => { + TestBed.configureTestingModule({ imports: [ TranslateModule.forRoot(), ProcessServiceCloudTestingModule ], declarations: [CustomTaskListComponent] }); - - beforeEach(() => { - fixtureCustom = TestBed.createComponent(CustomTaskListComponent); - fixtureCustom.detectChanges(); - componentCustom = fixtureCustom.componentInstance; - }); - - afterEach(() => { - fixtureCustom.destroy(); - }); - - it('should fetch custom schemaColumn from html', () => { - fixture.detectChanges(); - expect(componentCustom.processListCloud.columnList).toBeDefined(); - expect(componentCustom.processListCloud.columns[0]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.NAME'); - expect(componentCustom.processListCloud.columns[1]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.CREATED'); - expect(componentCustom.processListCloud.columns.length).toEqual(3); - }); + fixtureCustom = TestBed.createComponent(CustomTaskListComponent); + fixtureCustom.detectChanges(); + componentCustom = fixtureCustom.componentInstance; }); - describe('Creating an empty custom template - EmptyTemplateComponent', () => { + afterEach(() => { + fixtureCustom.destroy(); + }); - @Component({ - template: ` + it('should fetch custom schemaColumn from html', () => { + fixtureCustom.detectChanges(); + expect(componentCustom.processListCloud.columnList).toBeDefined(); + expect(componentCustom.processListCloud.columns[0]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.NAME'); + expect(componentCustom.processListCloud.columns[1]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.CREATED'); + expect(componentCustom.processListCloud.columns.length).toEqual(3); + }); +}); + +describe('ProcessListCloudComponent: Creating an empty custom template - EmptyTemplateComponent', () => { + let preferencesService: PreferenceCloudServiceInterface; + @Component({ + template: `

TEST

 ` - }) + }) - class EmptyTemplateComponent { - @ViewChild(ProcessListCloudComponent) - processListCloud: ProcessListCloudComponent; - } + class EmptyTemplateComponent { + @ViewChild(ProcessListCloudComponent) + processListCloud: ProcessListCloudComponent; + } - let fixtureEmpty: ComponentFixture; - preferencesService = jasmine.createSpyObj('preferencesService', { - getPreferences: of({}), - updatePreference: of({}) - }); + let fixtureEmpty: ComponentFixture; + preferencesService = jasmine.createSpyObj('preferencesService', { + getPreferences: of({}), + updatePreference: of({}) + }); - setupTestBed({ + beforeEach(() => { + TestBed.configureTestingModule({ imports: [ TranslateModule.forRoot(), HttpClientModule, @@ -646,24 +650,21 @@ describe('ProcessListCloudComponent', () => { providers: [{ provide: PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN, useValue: preferencesService }], declarations: [EmptyTemplateComponent, ProcessListCloudComponent, CustomEmptyContentTemplateDirective] }); + fixtureEmpty = TestBed.createComponent(EmptyTemplateComponent); + fixtureEmpty.detectChanges(); + }); - beforeEach(() => { - fixtureEmpty = TestBed.createComponent(EmptyTemplateComponent); - fixtureEmpty.detectChanges(); - }); + afterEach(() => { + fixtureEmpty.destroy(); + }); - afterEach(() => { - fixtureEmpty.destroy(); - }); + it('should render the custom template', () => { + fixtureEmpty.componentInstance.processListCloud.isLoading = false; - it('should render the custom template', () => { - fixtureEmpty.componentInstance.processListCloud.isLoading = false; + fixtureEmpty.detectChanges(); - fixtureEmpty.detectChanges(); + expect(fixtureEmpty.debugElement.query(By.css('#custom-id'))).not.toBeNull(); + expect(fixtureEmpty.debugElement.query(By.css('.adf-empty-content'))).toBeNull(); - expect(fixtureEmpty.debugElement.query(By.css('#custom-id'))).not.toBeNull(); - expect(fixtureEmpty.debugElement.query(By.css('.adf-empty-content'))).toBeNull(); - - }); }); }); diff --git a/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts index 7a473a9546..ac261c1d55 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts @@ -16,7 +16,6 @@ */ import { fakeAsync, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessListCloudService } from './process-list-cloud.service'; import { ProcessQueryCloudRequestModel } from '../models/process-cloud-query-request.model'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; @@ -35,13 +34,12 @@ describe('ProcessListCloudService', () => { const returnCallBody = (_queryUrl, options) => Promise.resolve(options.bodyParam); - setupTestBed({ - imports: [ - ProcessServiceCloudTestingModule - ] - }); - beforeEach(fakeAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ProcessServiceCloudTestingModule + ] + }); adfHttpClient = TestBed.inject(AdfHttpClient); service = TestBed.inject(ProcessListCloudService); requestSpy = spyOn(adfHttpClient, 'request'); diff --git a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts index 54a43eb50c..5ba1a64522 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts @@ -17,7 +17,7 @@ import { SimpleChange, DebugElement } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { FormModel, setupTestBed } from '@alfresco/adf-core'; +import { FormModel } from '@alfresco/adf-core'; import { of, throwError } from 'rxjs'; import { StartProcessCloudService } from '../services/start-process-cloud.service'; import { FormCloudService } from '../../../form/services/form-cloud.service'; @@ -81,25 +81,24 @@ describe('StartProcessCloudComponent', () => { inputElement.nativeElement.dispatchEvent(new Event('input')); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - FormsModule, - MatCommonModule, - ReactiveFormsModule, - MatCardModule, - MatIconModule, - MatAutocompleteModule, - MatOptionModule, - MatButtonModule, - MatFormFieldModule, - MatInputModule, - MatRippleModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + FormsModule, + MatCommonModule, + ReactiveFormsModule, + MatCardModule, + MatIconModule, + MatAutocompleteModule, + MatOptionModule, + MatButtonModule, + MatFormFieldModule, + MatInputModule, + MatRippleModule + ] + }); processService = TestBed.inject(StartProcessCloudService); formCloudService = TestBed.inject(FormCloudService); fixture = TestBed.createComponent(StartProcessCloudComponent); diff --git a/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts index 5b9bce7b22..ae0181c0f3 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts @@ -17,7 +17,6 @@ import { TestBed } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; -import { setupTestBed } from '@alfresco/adf-core'; import { StartProcessCloudService } from './start-process-cloud.service'; import { fakeProcessPayload } from '../mock/start-process.component.mock'; import { ProcessDefinitionCloud } from '../../../models/process-definition-cloud.model'; @@ -29,11 +28,10 @@ describe('StartProcessCloudService', () => { let service: StartProcessCloudService; let adfHttpClient: AdfHttpClient; - setupTestBed({ - imports: [HttpClientModule] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientModule] + }); service = TestBed.inject(StartProcessCloudService); adfHttpClient = TestBed.inject(AdfHttpClient); }); diff --git a/lib/process-services-cloud/src/lib/services/notification-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/services/notification-cloud.service.spec.ts index 3261b5090f..1544175e38 100644 --- a/lib/process-services-cloud/src/lib/services/notification-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/services/notification-cloud.service.spec.ts @@ -16,7 +16,6 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../testing/process-service-cloud.testing.module'; import { TranslateModule } from '@ngx-translate/core'; import { NotificationCloudService } from './notification-cloud.service'; @@ -43,14 +42,13 @@ describe('NotificationCloudService', () => { } `; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); service = TestBed.inject(NotificationCloudService); apollo = TestBed.inject(Apollo); diff --git a/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.spec.ts index 49901ae265..0fa3b3fbaa 100644 --- a/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/services/user-preference-cloud.service.spec.ts @@ -17,7 +17,6 @@ import { TestBed } from '@angular/core/testing'; import { UserPreferenceCloudService } from './user-preference-cloud.service'; -import { setupTestBed } from '@alfresco/adf-core'; import { mockPreferences, getMockPreference, createMockPreference, updateMockPreference } from '../mock/user-preference.mock'; import { ProcessServiceCloudTestingModule } from '../testing/process-service-cloud.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -33,17 +32,16 @@ describe('PreferenceService', () => { state: 404, stateText: 'Not Found' }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { - service = TestBed.inject(UserPreferenceCloudService); - adfHttpClient = TestBed.inject(AdfHttpClient); - requestSpy = spyOn(adfHttpClient, 'request').and.returnValue(Promise.resolve(mockPreferences)); + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); + service = TestBed.inject(UserPreferenceCloudService); + adfHttpClient = TestBed.inject(AdfHttpClient); + requestSpy = spyOn(adfHttpClient, 'request').and.returnValue(Promise.resolve(mockPreferences)); }); it('should return the preferences', (done) => { diff --git a/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.spec.ts b/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.spec.ts index 3d0dd028fb..11e2869ac3 100644 --- a/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.spec.ts +++ b/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.spec.ts @@ -17,7 +17,6 @@ import { Component, ContentChildren, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { TaskCloudService } from '../services/task-cloud.service'; import { of, throwError } from 'rxjs'; import { ClaimTaskCloudDirective } from './claim-task-cloud.directive'; @@ -48,17 +47,16 @@ describe('ClaimTaskCloudDirective', () => { let fixture: ComponentFixture; let taskCloudService: TaskCloudService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [ - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [ + TestComponent + ] + }); taskCloudService = TestBed.inject(TaskCloudService); fixture = TestBed.createComponent(TestComponent); fixture.detectChanges(); @@ -158,20 +156,19 @@ describe('Claim Task Directive validation errors', () => { let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [ - ClaimTestMissingTaskIdDirectiveComponent, - ClaimTestInvalidAppNameUndefinedDirectiveComponent, - ClaimTestInvalidAppNameNullDirectiveComponent, - ClaimTestMissingInputDirectiveComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [ + ClaimTestMissingTaskIdDirectiveComponent, + ClaimTestInvalidAppNameUndefinedDirectiveComponent, + ClaimTestInvalidAppNameNullDirectiveComponent, + ClaimTestMissingInputDirectiveComponent + ] + }); fixture = TestBed.createComponent(ClaimTestMissingInputDirectiveComponent); }); diff --git a/lib/process-services-cloud/src/lib/task/directives/complete-task.directive.spec.ts b/lib/process-services-cloud/src/lib/task/directives/complete-task.directive.spec.ts index 10eb6bb469..e75793bc9f 100644 --- a/lib/process-services-cloud/src/lib/task/directives/complete-task.directive.spec.ts +++ b/lib/process-services-cloud/src/lib/task/directives/complete-task.directive.spec.ts @@ -18,7 +18,6 @@ import { Component, ViewChild, ContentChildren } from '@angular/core'; import { CompleteTaskDirective } from './complete-task.directive'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { of, throwError } from 'rxjs'; import { taskCompleteCloudMock } from '../task-header/mocks/fake-complete-task.mock'; import { TaskCloudService } from '../services/task-cloud.service'; @@ -52,17 +51,16 @@ describe('CompleteTaskDirective', () => { let fixture: ComponentFixture; let taskCloudService: TaskCloudService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [ - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [ + TestComponent + ] + }); taskCloudService = TestBed.inject(TaskCloudService); fixture = TestBed.createComponent(TestComponent); fixture.detectChanges(); @@ -178,20 +176,19 @@ describe('Complete Task Directive validation errors', () => { let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [ - TestMissingTaskIdDirectiveComponent, - TestInvalidAppNameUndefinedDirectiveComponent, - TestInvalidAppNameNullDirectiveComponent, - TestMissingInputDirectiveComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [ + TestMissingTaskIdDirectiveComponent, + TestInvalidAppNameUndefinedDirectiveComponent, + TestInvalidAppNameNullDirectiveComponent, + TestMissingInputDirectiveComponent + ] + }); fixture = TestBed.createComponent(TestMissingInputDirectiveComponent); }); diff --git a/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.spec.ts b/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.spec.ts index 450038cbc0..7bd1f69262 100644 --- a/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.spec.ts +++ b/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.spec.ts @@ -17,7 +17,6 @@ import { Component, ContentChildren, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { TaskCloudService } from '../services/task-cloud.service'; import { of, throwError } from 'rxjs'; import { UnClaimTaskCloudDirective } from './unclaim-task-cloud.directive'; @@ -48,17 +47,16 @@ describe('UnClaimTaskCloudDirective', () => { let fixture: ComponentFixture; let taskCloudService: TaskCloudService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [ - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [ + TestComponent + ] + }); taskCloudService = TestBed.inject(TaskCloudService); fixture = TestBed.createComponent(TestComponent); fixture.detectChanges(); @@ -158,20 +156,19 @@ describe('UnClaim Task Directive validation errors', () => { let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [ - ClaimTestMissingTaskIdDirectiveComponent, - ClaimTestInvalidAppNameUndefinedDirectiveComponent, - ClaimTestInvalidAppNameNullDirectiveComponent, - ClaimTestMissingInputDirectiveComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [ + ClaimTestMissingTaskIdDirectiveComponent, + ClaimTestInvalidAppNameUndefinedDirectiveComponent, + ClaimTestInvalidAppNameNullDirectiveComponent, + ClaimTestMissingInputDirectiveComponent + ] + }); fixture = TestBed.createComponent(ClaimTestMissingInputDirectiveComponent); }); diff --git a/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts index c767e1a42d..40297abf94 100644 --- a/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed, TranslationService } from '@alfresco/adf-core'; +import { TranslationService } from '@alfresco/adf-core'; import { TaskCloudService } from './task-cloud.service'; import { taskCompleteCloudMock } from '../task-header/mocks/fake-complete-task.mock'; import { assignedTaskDetailsCloudMock, createdTaskDetailsCloudMock, emptyOwnerTaskDetailsCloudMock } from '../task-header/mocks/task-details-cloud.mock'; @@ -45,14 +45,13 @@ describe('Task Cloud Service', () => { const returnFakeCandidateGroupResults = () => Promise.resolve(['mockgroup1', 'mockgroup2', 'mockgroup3']); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); adfHttpClient = TestBed.inject(AdfHttpClient); identityUserService = TestBed.inject(IdentityUserService); translateService = TestBed.inject(TranslationService); diff --git a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts index 76a33cdce7..0923d63919 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed, AlfrescoApiService } from '@alfresco/adf-core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { StartTaskCloudComponent } from './start-task-cloud.component'; import { of, throwError } from 'rxjs'; import { taskDetailsMock } from '../mock/task-details.mock'; @@ -50,15 +50,14 @@ describe('StartTaskCloudComponent', () => { const mockUser: IdentityUserModel = {username: 'currentUser', firstName: 'Test', lastName: 'User', email: 'currentUser@test.com'}; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - schemas: [ CUSTOM_ELEMENTS_SCHEMA ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + schemas: [ CUSTOM_ELEMENTS_SCHEMA ] + }); fixture = TestBed.createComponent(StartTaskCloudComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services-cloud/src/lib/task/start-task/services/start-task-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/start-task/services/start-task-cloud.service.spec.ts index 92e92b8fdc..6db616895c 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/services/start-task-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/start-task/services/start-task-cloud.service.spec.ts @@ -16,12 +16,10 @@ */ import { TestBed } from '@angular/core/testing'; - import { of, throwError } from 'rxjs'; import { taskDetailsMock } from '../mock/task-details.mock'; import { TaskDetailsCloudModel } from '../models/task-details-cloud.model'; import { HttpErrorResponse } from '@angular/common/http'; -import { setupTestBed } from '@alfresco/adf-core'; import { TaskCloudService } from '../../services/task-cloud.service'; import { TranslateModule } from '@ngx-translate/core'; import { ProcessServiceCloudTestingModule } from './../../../testing/process-service-cloud.testing.module'; @@ -31,14 +29,13 @@ describe('StartTaskCloudService', () => { let service: TaskCloudService; const fakeAppName: string = 'fake-app'; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); service = TestBed.inject(TaskCloudService); }); diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts index 2ad772f2ac..028cd4b664 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts @@ -18,7 +18,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SimpleChange } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { setupTestBed } from '@alfresco/adf-core'; import { MatDialog } from '@angular/material/dialog'; import { of, Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; @@ -50,20 +49,19 @@ describe('EditServiceTaskFilterCloudComponent', () => { let taskService: TaskCloudService; const afterClosedSubject = new Subject(); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - TaskFiltersCloudModule, - MatIconTestingModule - ], - providers: [ - MatDialog, - { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + TaskFiltersCloudModule, + MatIconTestingModule + ], + providers: [ + MatDialog, + { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } + ] + }); fixture = TestBed.createComponent(EditServiceTaskFilterCloudComponent); component = fixture.componentInstance; service = TestBed.inject(ServiceTaskFilterCloudService); diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts index 821714f1ce..f9b5ffdd2f 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts @@ -17,8 +17,7 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; - -import { AlfrescoApiService, setupTestBed } from '@alfresco/adf-core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { MatDialog } from '@angular/material/dialog'; import { of, Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; @@ -69,21 +68,20 @@ describe('EditTaskFilterCloudComponent', () => { let taskService: TaskCloudService; const afterClosedSubject = new Subject(); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - TaskFiltersCloudModule, - PeopleCloudModule, - MatIconTestingModule - ], - providers: [ - MatDialog, - { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + TaskFiltersCloudModule, + PeopleCloudModule, + MatIconTestingModule + ], + providers: [ + MatDialog, + { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } + ] + }); fixture = TestBed.createComponent(EditTaskFilterCloudComponent); component = fixture.componentInstance; service = TestBed.inject(TaskFilterCloudService); diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.spec.ts index 7e896598a9..aa32873703 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/service-task-filters-cloud.component.spec.ts @@ -17,7 +17,6 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { of, throwError } from 'rxjs'; import { TASK_FILTERS_SERVICE_TOKEN } from '../../../services/cloud-token.service'; import { LocalPreferenceCloudService } from '../../../services/local-preference-cloud.service'; @@ -36,18 +35,17 @@ describe('ServiceTaskFiltersCloudComponent', () => { let component: ServiceTaskFiltersCloudComponent; let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - TaskFiltersCloudModule - ], - providers: [ - { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + TaskFiltersCloudModule + ], + providers: [ + { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } + ] + }); fixture = TestBed.createComponent(ServiceTaskFiltersCloudComponent); component = fixture.componentInstance; diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.spec.ts index 2bf7695252..f4c453dfdf 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed, TranslationService, TranslationMock } from '@alfresco/adf-core'; +import { TranslationService, TranslationMock } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { TaskAssignmentFilterCloudComponent } from './task-assignment-filter.component'; import { GroupCloudModule } from '../../../../group/group-cloud.module'; @@ -48,16 +48,18 @@ describe('TaskAssignmentFilterComponent', () => { expect(assignmentTypeChangeSpy).toHaveBeenCalledWith(type); } - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - GroupCloudModule, - TaskFiltersCloudModule, - NoopAnimationsModule - ], - providers: [ - { provide: TranslationService, useClass: TranslationMock } - ] + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + GroupCloudModule, + TaskFiltersCloudModule, + NoopAnimationsModule + ], + providers: [ + { provide: TranslationService, useClass: TranslationMock } + ] + }); }); describe('inputs', () => { diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts index f8aceeda61..0905f9f1fe 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TaskFilterDialogCloudComponent } from './task-filter-dialog-cloud.component'; import { TaskFiltersCloudModule } from '../../task-filters-cloud.module'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -36,19 +35,18 @@ describe('TaskFilterDialogCloudComponent', () => { data: {name: 'Mock-Title'} }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - TaskFiltersCloudModule - ], - providers: [ - { provide: MatDialogRef, useValue: mockDialogRef }, - { provide: MAT_DIALOG_DATA, useValue: mockDialogData } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + TaskFiltersCloudModule + ], + providers: [ + { provide: MatDialogRef, useValue: mockDialogRef }, + { provide: MAT_DIALOG_DATA, useValue: mockDialogData } + ] + }); fixture = TestBed.createComponent(TaskFilterDialogCloudComponent); component = fixture.componentInstance; }); diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts index 847b9f6445..0f1dbed595 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filters-cloud.component.spec.ts @@ -17,7 +17,7 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { of, throwError } from 'rxjs'; import { TASK_FILTERS_SERVICE_TOKEN } from '../../../services/cloud-token.service'; import { LocalPreferenceCloudService } from '../../../services/local-preference-cloud.service'; @@ -37,17 +37,16 @@ describe('TaskFiltersCloudComponent', () => { let getTaskFilterCounterSpy: jasmine.Spy; let getTaskListFiltersSpy: jasmine.Spy; - setupTestBed({ - imports: [ - ProcessServiceCloudTestingModule, - TaskFiltersCloudModule - ], - providers: [ - { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + ProcessServiceCloudTestingModule, + TaskFiltersCloudModule + ], + providers: [ + { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } + ] + }); taskFilterService = TestBed.inject(TaskFilterCloudService); getTaskFilterCounterSpy = spyOn(taskFilterService, 'getTaskFilterCounter').and.returnValue(of(11)); spyOn(taskFilterService, 'getTaskNotificationSubscription').and.returnValue(of(taskNotifications)); diff --git a/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts index 26315d88ed..89439b3470 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/services/task-filter-cloud.service.spec.ts @@ -16,7 +16,6 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { TASK_FILTERS_SERVICE_TOKEN } from '../../../services/cloud-token.service'; import { LocalPreferenceCloudService } from '../../../services/local-preference-cloud.service'; @@ -50,18 +49,17 @@ describe('TaskFilterCloudService', () => { const identityUserMock = { username: 'fakeusername', firstName: 'fake-identity-first-name', lastName: 'fake-identity-last-name', email: 'fakeIdentity@email.com' }; - setupTestBed({ - imports: [ - HttpClientTestingModule, - ProcessServiceCloudTestingModule, - ApolloModule - ], - providers: [ - { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: UserPreferenceCloudService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientTestingModule, + ProcessServiceCloudTestingModule, + ApolloModule + ], + providers: [ + { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: UserPreferenceCloudService } + ] + }); service = TestBed.inject(TaskFilterCloudService); notificationCloudService = TestBed.inject(NotificationCloudService); @@ -232,14 +230,13 @@ describe('Inject [LocalPreferenceCloudService] into the TaskFilterCloudService', const identityUserMock = { username: 'fakeusername', firstName: 'fake-identity-first-name', lastName: 'fake-identity-last-name', email: 'fakeIdentity@email.com' }; - setupTestBed({ - imports: [HttpClientTestingModule, ApolloModule], - providers: [ - { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule, ApolloModule], + providers: [ + { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService } + ] + }); service = TestBed.inject(TaskFilterCloudService); preferenceCloudService = service.preferenceService; identityUserService = TestBed.inject(IdentityUserService); diff --git a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.spec.ts index d4b46bd884..a1b6586790 100644 --- a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.spec.ts @@ -19,7 +19,7 @@ import { DebugElement, SimpleChange } from '@angular/core'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormModel, FormOutcomeEvent, FormOutcomeModel, setupTestBed } from '@alfresco/adf-core'; +import { FormModel, FormOutcomeEvent, FormOutcomeModel } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; import { TaskFormCloudComponent } from './task-form-cloud.component'; import { @@ -61,14 +61,13 @@ describe('TaskFormCloudComponent', () => { let component: TaskFormCloudComponent; let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); taskDetails.status = TASK_ASSIGNED_STATE; taskDetails.permissions = [TASK_VIEW_PERMISSION]; taskDetails.standalone = false; diff --git a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts index 42e13e0c20..7d312457d4 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts @@ -18,8 +18,8 @@ import { TaskHeaderCloudComponent } from './task-header-cloud.component'; import { of, throwError } from 'rxjs'; import { By } from '@angular/platform-browser'; -import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing'; -import { setupTestBed, AppConfigService, AlfrescoApiService } from '@alfresco/adf-core'; +import { ComponentFixture, TestBed, fakeAsync, flush, discardPeriodicTasks } from '@angular/core/testing'; +import { AppConfigService, AlfrescoApiService } from '@alfresco/adf-core'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; import { TaskCloudService } from '../../services/task-cloud.service'; import { TaskHeaderCloudModule } from '../task-header-cloud.module'; @@ -56,16 +56,15 @@ describe('TaskHeaderCloudComponent', () => { reply: jasmine.createSpy('reply') }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule, - TaskHeaderCloudModule, - MatSelectModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule, + TaskHeaderCloudModule, + MatSelectModule + ] + }); appConfigService = TestBed.inject(AppConfigService); appConfigService.config = { 'adf-cloud-task-header': { @@ -112,7 +111,6 @@ describe('TaskHeaderCloudComponent', () => { await fixture.whenStable(); expect(getTaskByIdSpy).toHaveBeenCalled(); expect(component.taskDetails).toBe(assignedTaskDetailsCloudMock); - }); it('should display assignee', async () => { @@ -214,6 +212,8 @@ describe('TaskHeaderCloudComponent', () => { expect(description.nativeElement.value.trim()).toEqual('This is the description'); expect(taskCloudService.updateTask).toHaveBeenCalled(); }); + flush(); + discardPeriodicTasks(); })); it('should show spinner before loading task details', () => { @@ -229,9 +229,9 @@ describe('TaskHeaderCloudComponent', () => { const priorityEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-edit-icon-priority"]`)); const descriptionEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-edit-icon-description"]`)); const dueDateEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="datepickertoggle-dueDate"]`)); - expect(priorityEditIcon).toBeNull('Edit icon should NOT be shown'); - expect(descriptionEditIcon).toBeNull('Edit icon should NOT be shown'); - expect(dueDateEditIcon).toBeNull('Edit icon should NOT be shown'); + expect(priorityEditIcon).toBeNull(); + expect(descriptionEditIcon).toBeNull(); + expect(dueDateEditIcon).toBeNull(); }); }); @@ -242,7 +242,7 @@ describe('TaskHeaderCloudComponent', () => { component.ngOnChanges(); }); - it('should fectch parent task details if the task has parent id', async () => { + it('should fetch parent task details if the task has parent id', async () => { fixture.detectChanges(); await fixture.whenStable(); expect(getTaskByIdSpy).toHaveBeenCalledTimes(2); @@ -330,8 +330,8 @@ describe('TaskHeaderCloudComponent', () => { fixture.detectChanges(); const descriptionEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="header-description"] [class*="adf-textitem-edit-icon"]`)); const dueDateEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="datepickertoggle-dueDate"]`)); - expect(descriptionEditIcon).not.toBeNull('Description edit icon should be shown'); - expect(dueDateEditIcon).not.toBeNull('Due date edit icon should be shown'); + expect(descriptionEditIcon).not.toBeNull(); + expect(dueDateEditIcon).not.toBeNull(); }); it('should not render defined clickable edit icon for assignee property if the task in assigned state and assingned user is different from current logged-in user', () => { @@ -339,7 +339,7 @@ describe('TaskHeaderCloudComponent', () => { fixture.detectChanges(); const value = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-clickable-icon-assignee"]`)); - expect(value).toBeNull('Edit icon should NOT be shown'); + expect(value).toBeNull(); }); }); @@ -370,7 +370,7 @@ describe('TaskHeaderCloudComponent', () => { it('should not render defined clickable edit icon for assignee property if the task in created state and not assigned', () => { fixture.detectChanges(); const value = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-clickable-icon-assignee"]`)); - expect(value).toBeNull('Edit icon should NOT be shown'); + expect(value).toBeNull(); }); it('should not render edit icon if the task in created state and not assigned', () => { @@ -378,9 +378,9 @@ describe('TaskHeaderCloudComponent', () => { const priorityEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-edit-icon-priority"]`)); const descriptionEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-edit-icon-description"]`)); const dueDateEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="datepickertoggle-dueDate"]`)); - expect(priorityEditIcon).toBeNull('Edit icon should NOT be shown'); - expect(descriptionEditIcon).toBeNull('Edit icon should NOT be shown'); - expect(dueDateEditIcon).toBeNull('Edit icon should NOT be shown'); + expect(priorityEditIcon).toBeNull(); + expect(descriptionEditIcon).toBeNull(); + expect(dueDateEditIcon).toBeNull(); }); }); @@ -410,9 +410,9 @@ describe('TaskHeaderCloudComponent', () => { const priorityEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-edit-icon-priority"]`)); const descriptionEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-edit-icon-description"]`)); const dueDateEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="datepickertoggle-dueDate"]`)); - expect(priorityEditIcon).toBeNull('Edit icon should NOT be shown'); - expect(descriptionEditIcon).toBeNull('Edit icon shouaaa`zld NOT be shown'); - expect(dueDateEditIcon).toBeNull('Edit icon should NOT be shown'); + expect(priorityEditIcon).toBeNull(); + expect(descriptionEditIcon).toBeNull(); + expect(dueDateEditIcon).toBeNull(); }); }); @@ -434,7 +434,7 @@ describe('TaskHeaderCloudComponent', () => { it('should not render defined clickable edit icon for assignee property if the task in suspended state', () => { fixture.detectChanges(); const value = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-clickable-icon-assignee"]`)); - expect(value).toBeNull('Edit icon should NOT be shown'); + expect(value).toBeNull(); }); it('should not render edit icon if the task in suspended state', () => { @@ -442,9 +442,9 @@ describe('TaskHeaderCloudComponent', () => { const priorityEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-edit-icon-priority"]`)); const descriptionEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="card-textitem-edit-icon-description"]`)); const dueDateEditIcon = fixture.debugElement.query(By.css(`[data-automation-id="datepickertoggle-dueDate"]`)); - expect(priorityEditIcon).toBeNull('Edit icon should NOT be shown'); - expect(descriptionEditIcon).toBeNull('Edit icon should NOT be shown'); - expect(dueDateEditIcon).toBeNull('Edit icon should NOT be shown'); + expect(priorityEditIcon).toBeNull(); + expect(descriptionEditIcon).toBeNull(); + expect(dueDateEditIcon).toBeNull(); }); }); diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.spec.ts index 2fd5b498c0..ce5ea3eb19 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/components/service-task-list-cloud.component.spec.ts @@ -18,7 +18,7 @@ import { Component, SimpleChange, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AppConfigService, setupTestBed, DataRowEvent, ObjectDataRow, User } from '@alfresco/adf-core'; +import { AppConfigService, DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; import { ServiceTaskListCloudComponent } from './service-task-list-cloud.component'; import { fakeServiceTask, fakeCustomSchema } from '../mock/fake-task-response.mock'; import { of } from 'rxjs'; @@ -40,10 +40,6 @@ import { ServiceTaskListCloudService } from '../services/service-task-list-cloud class CustomTaskListComponent { @ViewChild(ServiceTaskListCloudComponent) taskList: ServiceTaskListCloudComponent; - - getFullName(person: User): string { - return `${person.firstName} ${person.lastName}`; - } } @Component({ template: ` @@ -76,17 +72,16 @@ describe('ServiceTaskListCloudComponent', () => { let appConfig: AppConfigService; let serviceTaskListCloudService: ServiceTaskListCloudService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - declarations: [ - EmptyTemplateComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + declarations: [ + EmptyTemplateComponent + ] + }); appConfig = TestBed.inject(AppConfigService); serviceTaskListCloudService = TestBed.inject(ServiceTaskListCloudService); fixture = TestBed.createComponent(ServiceTaskListCloudComponent); @@ -224,7 +219,8 @@ describe('ServiceTaskListCloudComponent', () => { }); it('should call endpoint when a column visibility gets changed', () => { - spyOn(serviceTaskListCloudService, 'getServiceTaskByRequest'); + const emptyList = { list: { entries: [] } }; + spyOn(serviceTaskListCloudService, 'getServiceTaskByRequest').and.returnValue(of(emptyList)); component.ngAfterContentInit(); spyOn(component, 'createDatatableSchema'); component.appName = 'fake-app-name'; @@ -351,14 +347,17 @@ describe('ServiceTaskListCloudComponent', () => { component.updatePagination(pagination); }); }); +}); - describe('Injecting custom colums for tasklist - CustomTaskListComponent', () => { - let fixtureCustom: ComponentFixture; - let componentCustom: CustomTaskListComponent; - let customCopyComponent: CustomCopyContentTaskListComponent; - let copyFixture: ComponentFixture; +describe('ServiceTaskListCloudComponent: Injecting custom columns for task list - CustomTaskListComponent', () => { + let fixtureCustom: ComponentFixture; + let componentCustom: CustomTaskListComponent; + let customCopyComponent: CustomCopyContentTaskListComponent; + let copyFixture: ComponentFixture; + let serviceTaskListCloudService: ServiceTaskListCloudService; - setupTestBed({ + beforeEach(() => { + TestBed.configureTestingModule({ imports: [ TranslateModule.forRoot(), ProcessServiceCloudTestingModule @@ -369,127 +368,130 @@ describe('ServiceTaskListCloudComponent', () => { ] }); - beforeEach(() => { - spyOn(serviceTaskListCloudService, 'getServiceTaskByRequest').and.returnValue(of(fakeServiceTask)); - fixtureCustom = TestBed.createComponent(CustomTaskListComponent); - copyFixture = TestBed.createComponent(CustomCopyContentTaskListComponent); - fixtureCustom.detectChanges(); - componentCustom = fixtureCustom.componentInstance; - customCopyComponent = copyFixture.componentInstance; - customCopyComponent.taskList.isColumnSchemaCreated$ = of(true); - }); + serviceTaskListCloudService = TestBed.inject(ServiceTaskListCloudService); + spyOn(serviceTaskListCloudService, 'getServiceTaskByRequest').and.returnValue(of(fakeServiceTask)); - afterEach(() => { - fixtureCustom.destroy(); - copyFixture.destroy(); - }); - - it('should fetch custom schemaColumn from html', () => { - fixture.detectChanges(); - expect(componentCustom.taskList.columnList).toBeDefined(); - expect(componentCustom.taskList.columns[0]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.NAME'); - expect(componentCustom.taskList.columns[1]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.CREATED'); - expect(componentCustom.taskList.columns.length).toEqual(2); - }); - - it('it should show copy tooltip when key is present in data-column', () => { - customCopyComponent.taskList.reload(); - copyFixture.detectChanges(); - - copyFixture.debugElement - .query(By.css('span[title="04fdf69f-4ddd-48ab-9563-da776c9b163c"]')) - .triggerEventHandler('mouseenter'); - - copyFixture.detectChanges(); - expect(copyFixture.debugElement.query(By.css('.adf-copy-tooltip'))).not.toBeNull(); - }); - - it('it should not show copy tooltip when key is not present in data-column', () => { - customCopyComponent.taskList.reload(); - copyFixture.detectChanges(); - - copyFixture.debugElement - .query(By.css('span[title="serviceTaskName"]')) - .triggerEventHandler('mouseenter'); - - copyFixture.detectChanges(); - expect(copyFixture.debugElement.query(By.css('.adf-copy-tooltip'))).toBeNull(); - }); + fixtureCustom = TestBed.createComponent(CustomTaskListComponent); + copyFixture = TestBed.createComponent(CustomCopyContentTaskListComponent); + fixtureCustom.detectChanges(); + componentCustom = fixtureCustom.componentInstance; + customCopyComponent = copyFixture.componentInstance; + customCopyComponent.taskList.isColumnSchemaCreated$ = of(true); }); - describe('Copy cell content directive from app.config specifications', () => { - let taskSpy: jasmine.Spy; + afterEach(() => { + fixtureCustom.destroy(); + copyFixture.destroy(); + }); - setupTestBed({ + it('should fetch custom schemaColumn from html', () => { + fixtureCustom.detectChanges(); + expect(componentCustom.taskList.columnList).toBeDefined(); + expect(componentCustom.taskList.columns[0]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.NAME'); + expect(componentCustom.taskList.columns[1]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.CREATED'); + expect(componentCustom.taskList.columns.length).toEqual(2); + }); + + it('it should show copy tooltip when key is present in data-column', () => { + customCopyComponent.taskList.reload(); + copyFixture.detectChanges(); + + copyFixture.debugElement + .query(By.css('span[title="04fdf69f-4ddd-48ab-9563-da776c9b163c"]')) + .triggerEventHandler('mouseenter'); + + copyFixture.detectChanges(); + expect(copyFixture.debugElement.query(By.css('.adf-copy-tooltip'))).not.toBeNull(); + }); + + it('it should not show copy tooltip when key is not present in data-column', () => { + customCopyComponent.taskList.reload(); + copyFixture.detectChanges(); + + copyFixture.debugElement + .query(By.css('span[title="serviceTaskName"]')) + .triggerEventHandler('mouseenter'); + + copyFixture.detectChanges(); + expect(copyFixture.debugElement.query(By.css('.adf-copy-tooltip'))).toBeNull(); + }); +}); + +describe('ServiceTaskListCloudComponent: Copy cell content directive from app.config specifications', () => { + let taskSpy: jasmine.Spy; + let appConfig: AppConfigService; + let serviceTaskListCloudService: ServiceTaskListCloudService; + let fixture: ComponentFixture; + let component: ServiceTaskListCloudComponent; + + beforeEach(() => { + TestBed.configureTestingModule({ imports: [ TranslateModule.forRoot(), ProcessServiceCloudTestingModule ] }); - - beforeEach(() => { - appConfig = TestBed.inject(AppConfigService); - serviceTaskListCloudService = TestBed.inject(ServiceTaskListCloudService); - appConfig.config = Object.assign(appConfig.config, { - 'adf-cloud-service-task-list': { - presets: { - fakeCustomSchema: [ - { - key: 'id', - type: 'text', - title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.FAKE', - sortable: true, - copyContent: true - }, - { - key: 'activityName', - type: 'text', - title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.TASK_FAKE', - sortable: true - } - ] - } + appConfig = TestBed.inject(AppConfigService); + serviceTaskListCloudService = TestBed.inject(ServiceTaskListCloudService); + appConfig.config = Object.assign(appConfig.config, { + 'adf-cloud-service-task-list': { + presets: { + fakeCustomSchema: [ + { + key: 'id', + type: 'text', + title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.FAKE', + sortable: true, + copyContent: true + }, + { + key: 'activityName', + type: 'text', + title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.TASK_FAKE', + sortable: true + } + ] } - }); - fixture = TestBed.createComponent(ServiceTaskListCloudComponent); - component = fixture.componentInstance; - taskSpy = spyOn(serviceTaskListCloudService, 'getServiceTaskByRequest').and.returnValue(of(fakeServiceTask)); - - }); - afterEach(() => { - fixture.destroy(); + } }); + fixture = TestBed.createComponent(ServiceTaskListCloudComponent); + component = fixture.componentInstance; + taskSpy = spyOn(serviceTaskListCloudService, 'getServiceTaskByRequest').and.returnValue(of(fakeServiceTask)); - it('shoud show tooltip if config copyContent flag is true', () => { - taskSpy.and.returnValue(of(fakeServiceTask)); - component.presetColumn = 'fakeCustomSchema'; + }); + afterEach(() => { + fixture.destroy(); + }); - component.reload(); - fixture.detectChanges(); + it('shoud show tooltip if config copyContent flag is true', () => { + taskSpy.and.returnValue(of(fakeServiceTask)); + component.presetColumn = 'fakeCustomSchema'; - const columnWithCopyContentFlagTrue = fixture.debugElement - .query(By.css('span[title="04fdf69f-4ddd-48ab-9563-da776c9b163c"]')); + component.reload(); + fixture.detectChanges(); - columnWithCopyContentFlagTrue.triggerEventHandler('mouseenter'); + const columnWithCopyContentFlagTrue = fixture.debugElement + .query(By.css('span[title="04fdf69f-4ddd-48ab-9563-da776c9b163c"]')); - fixture.detectChanges(); - expect(fixture.debugElement.nativeElement.querySelector('.adf-copy-tooltip')).not.toBeNull(); - }); + columnWithCopyContentFlagTrue.triggerEventHandler('mouseenter'); - it('shoud not show tooltip if config copyContent flag is NOT true', () => { - taskSpy.and.returnValue(of(fakeServiceTask)); - component.presetColumn = 'fakeCustomSchema'; + fixture.detectChanges(); + expect(fixture.debugElement.nativeElement.querySelector('.adf-copy-tooltip')).not.toBeNull(); + }); - component.reload(); - fixture.detectChanges(); + it('shoud not show tooltip if config copyContent flag is NOT true', () => { + taskSpy.and.returnValue(of(fakeServiceTask)); + component.presetColumn = 'fakeCustomSchema'; - const columnWithCopyContentFlagNotTrue = fixture.debugElement - .query(By.css('span[title="serviceTaskName"]')); + component.reload(); + fixture.detectChanges(); - columnWithCopyContentFlagNotTrue.triggerEventHandler('mouseenter'); + const columnWithCopyContentFlagNotTrue = fixture.debugElement + .query(By.css('span[title="serviceTaskName"]')); - fixture.detectChanges(); - expect(fixture.debugElement.nativeElement.querySelector('.adf-copy-tooltip')).toBeNull(); - }); + columnWithCopyContentFlagNotTrue.triggerEventHandler('mouseenter'); + + fixture.detectChanges(); + expect(fixture.debugElement.nativeElement.querySelector('.adf-copy-tooltip')).toBeNull(); }); }); diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts index e645f32583..49d495ff1e 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts @@ -19,7 +19,6 @@ import { Component, SimpleChange, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { AppConfigService, - setupTestBed, DataRowEvent, ObjectDataRow, User, @@ -102,24 +101,23 @@ describe('TaskListCloudComponent', () => { updatePreference: of({}) }); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ], - providers: [ - { - provide: TASK_LIST_CLOUD_TOKEN, - useClass: TaskListCloudService - }, - { - provide: TASK_LIST_PREFERENCES_SERVICE_TOKEN, - useValue: preferencesService - } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ], + providers: [ + { + provide: TASK_LIST_CLOUD_TOKEN, + useClass: TaskListCloudService + }, + { + provide: TASK_LIST_PREFERENCES_SERVICE_TOKEN, + useValue: preferencesService + } + ] + }); appConfig = TestBed.inject(AppConfigService); fixture = TestBed.createComponent(TaskListCloudComponent); component = fixture.componentInstance; @@ -497,14 +495,17 @@ describe('TaskListCloudComponent', () => { component.updatePagination(pagination); }); }); +}); - describe('Injecting custom colums for tasklist - CustomTaskListComponent', () => { - let fixtureCustom: ComponentFixture; - let componentCustom: CustomTaskListComponent; - let customCopyComponent: CustomCopyContentTaskListComponent; - let copyFixture: ComponentFixture; +describe('TaskListCloudComponent: Injecting custom colums for tasklist - CustomTaskListComponent', () => { + let fixtureCustom: ComponentFixture; + let componentCustom: CustomTaskListComponent; + let customCopyComponent: CustomCopyContentTaskListComponent; + let copyFixture: ComponentFixture; + let taskListCloudService: TaskListCloudServiceInterface; - setupTestBed({ + beforeEach(() => { + TestBed.configureTestingModule({ imports: [ TranslateModule.forRoot(), ProcessServiceCloudTestingModule @@ -514,59 +515,60 @@ describe('TaskListCloudComponent', () => { CustomCopyContentTaskListComponent ] }); - - beforeEach(() => { - spyOn(taskListCloudService, 'getTaskByRequest').and.returnValue(of(fakeGlobalTasks)); - fixtureCustom = TestBed.createComponent(CustomTaskListComponent); - copyFixture = TestBed.createComponent(CustomCopyContentTaskListComponent); - fixtureCustom.detectChanges(); - componentCustom = fixtureCustom.componentInstance; - customCopyComponent = copyFixture.componentInstance; - customCopyComponent.taskList.isColumnSchemaCreated$ = of(true); - }); - - afterEach(() => { - fixtureCustom.destroy(); - copyFixture.destroy(); - }); - - it('should fetch custom schemaColumn from html', () => { - copyFixture.detectChanges(); - expect(componentCustom.taskList.columnList).toBeDefined(); - expect(componentCustom.taskList.columns[0]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.NAME'); - expect(componentCustom.taskList.columns[1]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.CREATED'); - expect(componentCustom.taskList.columns.length).toEqual(3); - }); - - it('it should show copy tooltip when key is present in data-column', () => { - customCopyComponent.taskList.reload(); - copyFixture.detectChanges(); - - copyFixture.debugElement - .query(By.css('span[title="11fe013d-c263-11e8-b75b-0a5864600540"]')) - .triggerEventHandler('mouseenter'); - - copyFixture.detectChanges(); - expect(copyFixture.debugElement.query(By.css('.adf-copy-tooltip'))).not.toBeNull(); - }); - - it('it should not show copy tooltip when key is not present in data-column', () => { - customCopyComponent.taskList.reload(); - copyFixture.detectChanges(); - - copyFixture.debugElement - .query(By.css('span[title="standalone-subtask"]')) - .triggerEventHandler('mouseenter'); - - copyFixture.detectChanges(); - expect(copyFixture.debugElement.query(By.css('.adf-copy-tooltip'))).toBeNull(); - }); + taskListCloudService = TestBed.inject(TASK_LIST_CLOUD_TOKEN); + spyOn(taskListCloudService, 'getTaskByRequest').and.returnValue(of(fakeGlobalTasks)); + fixtureCustom = TestBed.createComponent(CustomTaskListComponent); + copyFixture = TestBed.createComponent(CustomCopyContentTaskListComponent); + fixtureCustom.detectChanges(); + componentCustom = fixtureCustom.componentInstance; + customCopyComponent = copyFixture.componentInstance; + customCopyComponent.taskList.isColumnSchemaCreated$ = of(true); }); - describe('Creating an empty custom template - EmptyTemplateComponent', () => { - let fixtureEmpty: ComponentFixture; + afterEach(() => { + fixtureCustom.destroy(); + copyFixture.destroy(); + }); - setupTestBed({ + it('should fetch custom schemaColumn from html', () => { + copyFixture.detectChanges(); + expect(componentCustom.taskList.columnList).toBeDefined(); + expect(componentCustom.taskList.columns[0]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.NAME'); + expect(componentCustom.taskList.columns[1]['title']).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.CREATED'); + expect(componentCustom.taskList.columns.length).toEqual(3); + }); + + it('it should show copy tooltip when key is present in data-column', () => { + customCopyComponent.taskList.reload(); + copyFixture.detectChanges(); + + copyFixture.debugElement + .query(By.css('span[title="11fe013d-c263-11e8-b75b-0a5864600540"]')) + .triggerEventHandler('mouseenter'); + + copyFixture.detectChanges(); + expect(copyFixture.debugElement.query(By.css('.adf-copy-tooltip'))).not.toBeNull(); + }); + + it('it should not show copy tooltip when key is not present in data-column', () => { + customCopyComponent.taskList.reload(); + copyFixture.detectChanges(); + + copyFixture.debugElement + .query(By.css('span[title="standalone-subtask"]')) + .triggerEventHandler('mouseenter'); + + copyFixture.detectChanges(); + expect(copyFixture.debugElement.query(By.css('.adf-copy-tooltip'))).toBeNull(); + }); +}); + +describe('TaskListCloudComponent: Creating an empty custom template - EmptyTemplateComponent', () => { + let fixtureEmpty: ComponentFixture; + let taskListCloudService: TaskListCloudServiceInterface; + + beforeEach(() => { + TestBed.configureTestingModule({ imports: [ HttpClientModule, NoopAnimationsModule, @@ -579,147 +581,149 @@ describe('TaskListCloudComponent', () => { { provide: TranslationService, useClass: TranslationMock } ] }); + taskListCloudService = TestBed.inject(TASK_LIST_CLOUD_TOKEN); + const emptyList = { list: { entries: [] } }; + spyOn(taskListCloudService, 'getTaskByRequest').and.returnValue(of(emptyList)); - beforeEach(() => { - const emptyList = { list: { entries: [] } }; - spyOn(taskListCloudService, 'getTaskByRequest').and.returnValue(of(emptyList)); - - fixtureEmpty = TestBed.createComponent(EmptyTemplateComponent); - fixtureEmpty.detectChanges(); - }); - - afterEach(() => { - fixtureEmpty.destroy(); - }); - - it('should render the custom template', async () => { - fixtureEmpty.detectChanges(); - await fixtureEmpty.whenStable(); - fixtureEmpty.detectChanges(); - expect(fixtureEmpty.debugElement.query(By.css('#custom-id'))).not.toBeNull(); - expect(fixtureEmpty.debugElement.query(By.css('.adf-empty-content'))).toBeNull(); - }); + fixtureEmpty = TestBed.createComponent(EmptyTemplateComponent); + fixtureEmpty.detectChanges(); }); - describe('Copy cell content directive from app.config specifications', () => { - let taskSpy: jasmine.Spy; + afterEach(() => { + fixtureEmpty.destroy(); + }); - setupTestBed({ + it('should render the custom template', async () => { + fixtureEmpty.detectChanges(); + await fixtureEmpty.whenStable(); + fixtureEmpty.detectChanges(); + expect(fixtureEmpty.debugElement.query(By.css('#custom-id'))).not.toBeNull(); + expect(fixtureEmpty.debugElement.query(By.css('.adf-empty-content'))).toBeNull(); + }); +}); + +describe('TaskListCloudComponent: Copy cell content directive from app.config specifications', () => { + let taskSpy: jasmine.Spy; + let appConfig: AppConfigService; + let taskListCloudService: TaskListCloudServiceInterface; + let component: TaskListCloudComponent; + let fixture: ComponentFixture; + + beforeEach(() => { + TestBed.configureTestingModule({ imports: [ TranslateModule.forRoot(), ProcessServiceCloudTestingModule ] }); - - beforeEach(() => { - appConfig = TestBed.inject(AppConfigService); - taskListCloudService = TestBed.inject(TASK_LIST_CLOUD_TOKEN); - appConfig.config = Object.assign(appConfig.config, { - 'adf-cloud-task-list': { - presets: { - fakeCustomSchema: [ - { - key: 'id', - type: 'text', - title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.FAKE', - sortable: true, - copyContent: true - }, - { - key: 'name', - type: 'text', - title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.TASK_FAKE', - sortable: true - }, - { - key: 'priority', - type: 'text', - title: 'ADF_TASK_LIST.PROPERTIES.PRIORITY', - sortable: true - } - ] - } + appConfig = TestBed.inject(AppConfigService); + taskListCloudService = TestBed.inject(TASK_LIST_CLOUD_TOKEN); + appConfig.config = Object.assign(appConfig.config, { + 'adf-cloud-task-list': { + presets: { + fakeCustomSchema: [ + { + key: 'id', + type: 'text', + title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.FAKE', + sortable: true, + copyContent: true + }, + { + key: 'name', + type: 'text', + title: 'ADF_CLOUD_TASK_LIST.PROPERTIES.TASK_FAKE', + sortable: true + }, + { + key: 'priority', + type: 'text', + title: 'ADF_TASK_LIST.PROPERTIES.PRIORITY', + sortable: true + } + ] } - }); - fixture = TestBed.createComponent(TaskListCloudComponent); - component = fixture.componentInstance; - taskSpy = spyOn(taskListCloudService, 'getTaskByRequest').and.returnValue(of(fakeGlobalTasks)); - component.isColumnSchemaCreated$ = of(true); + } }); + fixture = TestBed.createComponent(TaskListCloudComponent); + component = fixture.componentInstance; + taskSpy = spyOn(taskListCloudService, 'getTaskByRequest').and.returnValue(of(fakeGlobalTasks)); + component.isColumnSchemaCreated$ = of(true); + }); - afterEach(() => { - fixture.destroy(); - }); + afterEach(() => { + fixture.destroy(); + }); - it('should show tooltip if config copyContent flag is true', () => { - taskSpy.and.returnValue(of(fakeGlobalTasks)); - component.presetColumn = 'fakeCustomSchema'; + it('should show tooltip if config copyContent flag is true', () => { + taskSpy.and.returnValue(of(fakeGlobalTasks)); + component.presetColumn = 'fakeCustomSchema'; - component.reload(); - fixture.detectChanges(); + component.reload(); + fixture.detectChanges(); - const columnWithCopyContentFlagTrue = fixture.debugElement - .query(By.css('span[title="11fe013d-c263-11e8-b75b-0a5864600540"]')); + const columnWithCopyContentFlagTrue = fixture.debugElement + .query(By.css('span[title="11fe013d-c263-11e8-b75b-0a5864600540"]')); - columnWithCopyContentFlagTrue.triggerEventHandler('mouseenter'); + columnWithCopyContentFlagTrue.triggerEventHandler('mouseenter'); - fixture.detectChanges(); - expect(fixture.debugElement.nativeElement.querySelector('.adf-copy-tooltip')).not.toBeNull(); - }); + fixture.detectChanges(); + expect(fixture.debugElement.nativeElement.querySelector('.adf-copy-tooltip')).not.toBeNull(); + }); - it('should replace priority values', () => { - taskSpy.and.returnValue(of(fakeGlobalTasks)); - component.presetColumn = 'fakeCustomSchema'; + it('should replace priority values', () => { + taskSpy.and.returnValue(of(fakeGlobalTasks)); + component.presetColumn = 'fakeCustomSchema'; - component.reload(); - fixture.detectChanges(); + component.reload(); + fixture.detectChanges(); - const cell = fixture.debugElement - .query(By.css('[data-automation-id="text_ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NONE"]')); - expect(cell.nativeElement.textContent).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NONE'); - }); + const cell = fixture.debugElement + .query(By.css('[data-automation-id="text_ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NONE"]')); + expect(cell.nativeElement.textContent).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NONE'); + }); - it('replacePriorityValues should return undefined when no rows defined', () => { - const emptyList = { list: { entries: [] } }; - taskSpy.and.returnValue(of(emptyList)); - fixture.detectChanges(); + it('replacePriorityValues should return undefined when no rows defined', () => { + const emptyList = { list: { entries: [] } }; + taskSpy.and.returnValue(of(emptyList)); + fixture.detectChanges(); - const appName = new SimpleChange(null, 'FAKE-APP-NAME', true); - component.ngOnChanges({ appName }); - fixture.detectChanges(); + const appName = new SimpleChange(null, 'FAKE-APP-NAME', true); + component.ngOnChanges({ appName }); + fixture.detectChanges(); - const emptyContent = fixture.debugElement.query(By.css('.adf-empty-content')); - expect(emptyContent.nativeElement).toBeDefined(); - expect(component.replacePriorityValues({ - obj: {}, - isSelected: false, - hasValue: () => false, - getValue: () => undefined - }, { - type: 'text', - key: 'priority' - })).toEqual(undefined); - }); + const emptyContent = fixture.debugElement.query(By.css('.adf-empty-content')); + expect(emptyContent.nativeElement).toBeDefined(); + expect(component.replacePriorityValues({ + obj: {}, + isSelected: false, + hasValue: () => false, + getValue: () => undefined + }, { + type: 'text', + key: 'priority' + })).toEqual(undefined); + }); - it('replacePriorityValues should return replaced value when rows are defined', () => { - taskSpy.and.returnValue(of(fakeGlobalTasks)); - fixture.detectChanges(); + it('replacePriorityValues should return replaced value when rows are defined', () => { + taskSpy.and.returnValue(of(fakeGlobalTasks)); + fixture.detectChanges(); - const appName = new SimpleChange(null, 'FAKE-APP-NAME', true); - component.ngOnChanges({ appName }); - fixture.detectChanges(); + const appName = new SimpleChange(null, 'FAKE-APP-NAME', true); + component.ngOnChanges({ appName }); + fixture.detectChanges(); - expect(component.replacePriorityValues({ - obj: { - priority: 1 - }, - isSelected: false, - hasValue: () => false, - getValue: () => undefined - }, { - type: 'text', - key: 'priority' - })).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.LOW'); - }); + expect(component.replacePriorityValues({ + obj: { + priority: 1 + }, + isSelected: false, + hasValue: () => false, + getValue: () => undefined + }, { + type: 'text', + key: 'priority' + })).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.LOW'); }); }); + diff --git a/lib/process-services-cloud/src/lib/task/task-list/services/service-task-list-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/services/service-task-list-cloud.service.spec.ts index 98d75dc666..0ae7729b3f 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/services/service-task-list-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/services/service-task-list-cloud.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed, LogService } from '@alfresco/adf-core'; +import { LogService } from '@alfresco/adf-core'; import { ServiceTaskListCloudService } from './service-task-list-cloud.service'; import { ServiceTaskQueryCloudRequestModel } from '../models/service-task-cloud.model'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; @@ -34,13 +34,12 @@ describe('Activiti ServiceTaskList Cloud Service', () => { const returnCallUrl = (queryUrl) => Promise.resolve(queryUrl); - setupTestBed({ - imports: [ - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + ProcessServiceCloudTestingModule + ] + }); adfHttpClient = TestBed.inject(AdfHttpClient); service = TestBed.inject(ServiceTaskListCloudService); logService = TestBed.inject(LogService); diff --git a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts index cad22d5b9e..502baf5cae 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts @@ -16,7 +16,6 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { TaskListCloudService } from './task-list-cloud.service'; import { TaskQueryCloudRequestModel } from '../../../models/filter-cloud-model'; import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module'; @@ -33,14 +32,13 @@ describe('TaskListCloudService', () => { const returnCallUrl = (queryUrl) => Promise.resolve(queryUrl); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessServiceCloudTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessServiceCloudTestingModule + ] + }); adfHttpClient = TestBed.inject(AdfHttpClient); service = TestBed.inject(TaskListCloudService); requestSpy = spyOn(adfHttpClient, 'request'); diff --git a/lib/process-services-cloud/src/test.ts b/lib/process-services-cloud/src/test.ts index 5082681ab7..3a4c337c75 100644 --- a/lib/process-services-cloud/src/test.ts +++ b/lib/process-services-cloud/src/test.ts @@ -31,7 +31,7 @@ declare const require: any; getTestBed().initTestEnvironment( BrowserDynamicTestingModule, platformBrowserDynamicTesting(), { - teardown: { destroyAfterEach: false } + teardown: { destroyAfterEach: true } } ); // Then we find all the tests. diff --git a/lib/process-services/karma.conf.js b/lib/process-services/karma.conf.js index 603188ec7e..638b99982d 100644 --- a/lib/process-services/karma.conf.js +++ b/lib/process-services/karma.conf.js @@ -17,12 +17,6 @@ module.exports = function (config) { }, { pattern: 'node_modules/chart.js/dist/Chart.js', included: true, watched: false }, { pattern: 'node_modules/raphael/raphael.min.js', included: true, watched: false }, - { - pattern: 'node_modules/ng2-charts/bundles/ng2-charts.umd.js', - included: false, - served: true, - watched: false - }, { pattern: 'node_modules/moment/min/moment.min.js', included: true, watched: false }, { pattern: 'lib/core/src/lib/i18n/**/en.json', included: false, served: true, watched: false }, { pattern: 'lib/content-services/src/lib/i18n/**/en.json', included: false, served: true, watched: false }, diff --git a/lib/process-services/src/lib/app-list/apps-list.component.spec.ts b/lib/process-services/src/lib/app-list/apps-list.component.spec.ts index 8d958c67a5..d91baf2324 100644 --- a/lib/process-services/src/lib/app-list/apps-list.component.spec.ts +++ b/lib/process-services/src/lib/app-list/apps-list.component.spec.ts @@ -18,7 +18,6 @@ import { DebugElement, Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { setupTestBed } from '@alfresco/adf-core'; import { AppsProcessService } from './services/apps-process.service'; import { of, throwError } from 'rxjs'; @@ -47,15 +46,14 @@ describe('AppsListComponent', () => { class CustomEmptyAppListTemplateComponent { } - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [CustomEmptyAppListTemplateComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [CustomEmptyAppListTemplateComponent] + }); fixture = TestBed.createComponent(AppsListComponent); component = fixture.componentInstance; debugElement = fixture.debugElement; diff --git a/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts b/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts index 593718089f..d588f86edb 100644 --- a/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts +++ b/lib/process-services/src/lib/app-list/select-apps-dialog.component.spec.ts @@ -19,7 +19,6 @@ import { Component } from '@angular/core'; import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { OverlayContainer } from '@angular/cdk/overlay'; -import { setupTestBed } from '@alfresco/adf-core'; import { AppsProcessService } from './services/apps-process.service'; import { deployedApps } from '../mock/apps-list.mock'; import { of } from 'rxjs'; @@ -58,34 +57,33 @@ describe('Select app dialog', () => { let overlayContainerElement: HTMLElement; let service: AppsProcessService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [DialogSelectAppTestComponent], - providers: [ - { - provide: OverlayContainer, - useFactory: () => { - overlayContainerElement = document.createElement('div'); - return { - getContainerElement: () => overlayContainerElement - }; - } - }, - { - provide: MatDialogRef, - useValue: dialogRef - }, - { - provide: MAT_DIALOG_DATA, - useValue: {} - } - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [DialogSelectAppTestComponent], + providers: [ + { + provide: OverlayContainer, + useFactory: () => { + overlayContainerElement = document.createElement('div'); + return { + getContainerElement: () => overlayContainerElement + }; + } + }, + { + provide: MatDialogRef, + useValue: dialogRef + }, + { + provide: MAT_DIALOG_DATA, + useValue: {} + } + ] + }); fixture = TestBed.createComponent(DialogSelectAppTestComponent); component = fixture.componentInstance; diff --git a/lib/process-services/src/lib/app-list/services/apps-process.service.spec.ts b/lib/process-services/src/lib/app-list/services/apps-process.service.spec.ts index 55944c2a6d..6b3c37269a 100644 --- a/lib/process-services/src/lib/app-list/services/apps-process.service.spec.ts +++ b/lib/process-services/src/lib/app-list/services/apps-process.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { fakeApps } from '../mocks/apps-service.mock'; import { AppsProcessService } from './apps-process.service'; -import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; declare let jasmine: any; @@ -27,18 +27,14 @@ describe('AppsProcessService', () => { let service: AppsProcessService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); service = TestBed.inject(AppsProcessService); - }); - - beforeEach(() => { jasmine.Ajax.install(); }); diff --git a/lib/process-services/src/lib/attachment/create-process-attachment.component.spec.ts b/lib/process-services/src/lib/attachment/create-process-attachment.component.spec.ts index 9ee2ba8bc9..16fc77811a 100644 --- a/lib/process-services/src/lib/attachment/create-process-attachment.component.spec.ts +++ b/lib/process-services/src/lib/attachment/create-process-attachment.component.spec.ts @@ -17,7 +17,6 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { CreateProcessAttachmentComponent } from './create-process-attachment.component'; import { ProcessTestingModule } from '../testing/process.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -48,14 +47,13 @@ describe('CreateProcessAttachmentComponent', () => { thumbnailStatus: 'queued' }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(CreateProcessAttachmentComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/attachment/create-task-attachment.component.spec.ts b/lib/process-services/src/lib/attachment/create-task-attachment.component.spec.ts index 3254f1fecb..53eb6a62c7 100644 --- a/lib/process-services/src/lib/attachment/create-task-attachment.component.spec.ts +++ b/lib/process-services/src/lib/attachment/create-task-attachment.component.spec.ts @@ -18,8 +18,6 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; - -import { setupTestBed } from '@alfresco/adf-core'; import { AttachmentComponent } from './create-task-attachment.component'; import { ProcessTestingModule } from '../testing/process.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -32,15 +30,13 @@ describe('AttachmentComponent', () => { let fixture: ComponentFixture; let createTaskRelatedContentSpy: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { - + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(AttachmentComponent); component = fixture.componentInstance; service = fixture.debugElement.injector.get(ProcessContentService); diff --git a/lib/process-services/src/lib/attachment/process-attachment-list.component.spec.ts b/lib/process-services/src/lib/attachment/process-attachment-list.component.spec.ts index 604b86ba62..0c59777a27 100644 --- a/lib/process-services/src/lib/attachment/process-attachment-list.component.spec.ts +++ b/lib/process-services/src/lib/attachment/process-attachment-list.component.spec.ts @@ -18,7 +18,6 @@ import { SimpleChange, Component, 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 { of, throwError } from 'rxjs'; import { ProcessAttachmentListComponent } from './process-attachment-list.component'; import { ProcessTestingModule } from '../testing/process.testing.module'; @@ -33,15 +32,13 @@ describe('ProcessAttachmentListComponent', () => { let fixture: ComponentFixture; let getProcessRelatedContentSpy: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { - + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(ProcessAttachmentListComponent); component = fixture.componentInstance; service = fixture.debugElement.injector.get(ProcessContentService); @@ -250,16 +247,15 @@ class CustomEmptyTemplateComponent { describe('Custom CustomEmptyTemplateComponent', () => { let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [CustomEmptyTemplateComponent], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [CustomEmptyTemplateComponent], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(CustomEmptyTemplateComponent); fixture.detectChanges(); }); diff --git a/lib/process-services/src/lib/attachment/task-attachment-list.component.spec.ts b/lib/process-services/src/lib/attachment/task-attachment-list.component.spec.ts index c891a2977a..cefe9b35ab 100644 --- a/lib/process-services/src/lib/attachment/task-attachment-list.component.spec.ts +++ b/lib/process-services/src/lib/attachment/task-attachment-list.component.spec.ts @@ -20,7 +20,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of, throwError } from 'rxjs'; import { TaskAttachmentListComponent } from './task-attachment-list.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../testing/process.testing.module'; import { TranslateModule } from '@ngx-translate/core'; import { mockEmittedTaskAttachments, mockTaskAttachments } from '../mock/task/task-attachments.mock'; @@ -37,16 +36,14 @@ describe('TaskAttachmentList', () => { let getContentPreviewSpy: jasmine.Spy; let disposableSuccess: any; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - schemas: [NO_ERRORS_SCHEMA] - }); - beforeEach(() => { - + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + schemas: [NO_ERRORS_SCHEMA] + }); fixture = TestBed.createComponent(TaskAttachmentListComponent); component = fixture.componentInstance; @@ -292,16 +289,15 @@ class CustomEmptyTemplateComponent { describe('Custom CustomEmptyTemplateComponent', () => { let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [CustomEmptyTemplateComponent], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [CustomEmptyTemplateComponent], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(CustomEmptyTemplateComponent); fixture.detectChanges(); }); diff --git a/lib/process-services/src/lib/common/services/people-process.service.spec.ts b/lib/process-services/src/lib/common/services/people-process.service.spec.ts index 7d33b87113..43dd9942d4 100644 --- a/lib/process-services/src/lib/common/services/people-process.service.spec.ts +++ b/lib/process-services/src/lib/common/services/people-process.service.spec.ts @@ -18,7 +18,7 @@ import { fakeAsync, TestBed } from '@angular/core/testing'; import { UserProcessModel } from '../models/user-process.model'; import { PeopleProcessService } from './people-process.service'; -import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; declare let jasmine: any; @@ -45,14 +45,13 @@ describe('PeopleProcessService', () => { let service: PeopleProcessService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); service = TestBed.inject(PeopleProcessService); }); diff --git a/lib/process-services/src/lib/form/form-list/form-list.component.spec.ts b/lib/process-services/src/lib/form/form-list/form-list.component.spec.ts index 04788982af..d165677ba7 100644 --- a/lib/process-services/src/lib/form/form-list/form-list.component.spec.ts +++ b/lib/process-services/src/lib/form/form-list/form-list.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; -import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; import { FormListComponent } from './form-list.component'; import { ModelService } from '../services/model.service'; @@ -28,13 +28,12 @@ describe('TaskAttachmentList', () => { let modelService: ModelService; let element: HTMLElement; - setupTestBed({ - imports: [ - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + CoreTestingModule + ] + }); fixture = TestBed.createComponent(FormListComponent); component = fixture.componentInstance; element = fixture.debugElement.nativeElement; diff --git a/lib/process-services/src/lib/form/form.component.spec.ts b/lib/process-services/src/lib/form/form.component.spec.ts index ed13cb6110..74eaeb6315 100644 --- a/lib/process-services/src/lib/form/form.component.spec.ts +++ b/lib/process-services/src/lib/form/form.component.spec.ts @@ -30,7 +30,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { Observable, of, throwError } from 'rxjs'; import { FormFieldModel, FormFieldTypes, FormModel, FormOutcomeEvent, FormOutcomeModel, - FormService, WidgetVisibilityService, ContainerModel, fakeForm, setupTestBed + FormService, WidgetVisibilityService, ContainerModel, fakeForm } from '@alfresco/adf-core'; import{ NodeMetadata, NodesApiService } from '@alfresco/adf-content-services'; import { FormComponent } from './form.component'; @@ -72,14 +72,6 @@ describe('FormComponent', () => { class CustomUploadModule { } - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule, - CustomUploadModule - ] - }); - const buildWidget = (type: string, injector: Injector): any => { const resolver = formRenderingService.getComponentTypeResolver(type); const widgetType = resolver(null); @@ -92,6 +84,13 @@ describe('FormComponent', () => { }; beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule, + CustomUploadModule + ] + }); visibilityService = TestBed.inject(WidgetVisibilityService); spyOn(visibilityService, 'refreshVisibility').and.stub(); @@ -1011,15 +1010,14 @@ describe('FormWithCustomOutComesComponent', () => { let customComponent: FormWithCustomOutComesComponent; let debugElement: DebugElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [FormWithCustomOutComesComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [FormWithCustomOutComesComponent] + }); fixture = TestBed.createComponent(FormWithCustomOutComesComponent); customComponent = fixture.componentInstance; debugElement = fixture.debugElement; diff --git a/lib/process-services/src/lib/form/form.component.visibility.spec.ts b/lib/process-services/src/lib/form/form.component.visibility.spec.ts index 93e13f6c89..7b2981e5e9 100644 --- a/lib/process-services/src/lib/form/form.component.visibility.spec.ts +++ b/lib/process-services/src/lib/form/form.component.visibility.spec.ts @@ -23,7 +23,7 @@ import { By } from '@angular/platform-browser'; import { formDefinitionDropdownField, formDefinitionTwoTextFields, - formDefinitionRequiredField, setupTestBed, + formDefinitionRequiredField, formDefVisibilitiFieldDependsOnNextOne, formDefVisibilitiFieldDependsOnPreviousOne, formReadonlyTwoTextFields } from '@alfresco/adf-core'; @@ -45,15 +45,14 @@ describe('FormComponent UI and visibility', () => { dropdown.click(); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(FormComponent); component = fixture.componentInstance; taskService = TestBed.inject(TaskService); diff --git a/lib/process-services/src/lib/form/services/ecm-model.service.spec.ts b/lib/process-services/src/lib/form/services/ecm-model.service.spec.ts index 0ce2a67c1e..7829b1c382 100644 --- a/lib/process-services/src/lib/form/services/ecm-model.service.spec.ts +++ b/lib/process-services/src/lib/form/services/ecm-model.service.spec.ts @@ -16,7 +16,7 @@ */ import { Observable } from 'rxjs'; -import { FormModel, setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { FormModel, CoreTestingModule } from '@alfresco/adf-core'; import { EcmModelService } from './ecm-model.service'; import { TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; @@ -24,17 +24,15 @@ import { TranslateModule } from '@ngx-translate/core'; declare let jasmine: any; describe('EcmModelService', () => { - let service: EcmModelService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); service = TestBed.inject(EcmModelService); jasmine.Ajax.install(); }); diff --git a/lib/process-services/src/lib/form/services/process-content.service.spec.ts b/lib/process-services/src/lib/form/services/process-content.service.spec.ts index 808074a758..ab31bf4e4d 100644 --- a/lib/process-services/src/lib/form/services/process-content.service.spec.ts +++ b/lib/process-services/src/lib/form/services/process-content.service.spec.ts @@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; import { ProcessContentService } from './process-content.service'; import { TranslateModule } from '@ngx-translate/core'; -import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; declare let jasmine: any; @@ -63,17 +63,15 @@ const createFakeBlob = () => { }; describe('ProcessContentService', () => { - let service: ProcessContentService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); service = TestBed.inject(ProcessContentService); }); diff --git a/lib/process-services/src/lib/form/start-form.component.spec.ts b/lib/process-services/src/lib/form/start-form.component.spec.ts index cb735496cf..de00ae8d9b 100644 --- a/lib/process-services/src/lib/form/start-form.component.spec.ts +++ b/lib/process-services/src/lib/form/start-form.component.spec.ts @@ -25,7 +25,7 @@ import { taskFormSingleUploadMock, taskFormMultipleUploadMock, preselectedSingleNode, preselectedMultipleeNode } from './start-form.component.mock'; import { StartFormComponent } from './start-form.component'; -import { WidgetVisibilityService, setupTestBed, FormModel, FormOutcomeModel } from '@alfresco/adf-core'; +import { WidgetVisibilityService, FormModel, FormOutcomeModel } from '@alfresco/adf-core'; import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { ProcessTestingModule } from '../testing/process.testing.module'; import { ProcessService } from '../process-list/services/process.service'; @@ -42,15 +42,14 @@ describe('StartFormComponent', () => { const exampleId1 = 'my:process1'; const exampleId2 = 'my:process2'; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(StartFormComponent); component = fixture.componentInstance; processService = TestBed.inject(ProcessService); diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts index e19a80f86e..988be084c0 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.component.spec.ts @@ -21,7 +21,7 @@ import { ContentModule, ContentNodeSelectorPanelComponent, DocumentListService, import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { AttachFileWidgetDialogComponent } from './attach-file-widget-dialog.component'; -import { setupTestBed, AuthenticationService, AlfrescoApiService } from '@alfresco/adf-core'; +import { AuthenticationService, AlfrescoApiService } from '@alfresco/adf-core'; import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface'; import { of, throwError } from 'rxjs'; import { By } from '@angular/platform-browser'; @@ -50,20 +50,19 @@ describe('AttachFileWidgetDialogComponent', () => { let isLogged = false; const fakeSite = new SiteEntry({ entry: { id: 'fake-site', guid: 'fake-site', title: 'fake-site', visibility: 'visible' } }); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ContentModule.forRoot(), - ProcessTestingModule - ], - providers: [ - { provide: MAT_DIALOG_DATA, useValue: data }, - { provide: MatDialogRef, useValue: { close: () => of() } } - ], - schemas: [NO_ERRORS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ContentModule.forRoot(), + ProcessTestingModule + ], + providers: [ + { provide: MAT_DIALOG_DATA, useValue: data }, + { provide: MatDialogRef, useValue: { close: () => of() } } + ], + schemas: [NO_ERRORS_SCHEMA] + }); fixture = TestBed.createComponent(AttachFileWidgetDialogComponent); widget = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.spec.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.spec.ts index f6b0ad8164..fc8e39146c 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.spec.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget-dialog.service.spec.ts @@ -19,7 +19,6 @@ import { TestBed } from '@angular/core/testing'; import { MatDialog } from '@angular/material/dialog'; import { AttachFileWidgetDialogService } from './attach-file-widget-dialog.service'; import { Subject, of } from 'rxjs'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -29,14 +28,13 @@ describe('AttachFileWidgetDialogService', () => { let materialDialog: MatDialog; let spyOnDialogOpen: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); service = TestBed.inject(AttachFileWidgetDialogService); materialDialog = TestBed.inject(MatDialog); spyOnDialogOpen = spyOn(materialDialog, 'open').and.returnValue({ diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.spec.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.spec.ts index e04aabc72d..8821da8347 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.spec.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.spec.ts @@ -24,7 +24,6 @@ import { FormFieldTypes, FormService, FormFieldMetadata, - setupTestBed, DownloadService } from '@alfresco/adf-core'; import { ContentNodeDialogService, ContentModule } from '@alfresco/adf-content-services'; @@ -152,15 +151,14 @@ describe('AttachFileWidgetComponent', () => { let formService: FormService; let attachFileWidgetDialogService: AttachFileWidgetDialogService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule, - ContentModule.forRoot() - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule, + ContentModule.forRoot() + ] + }); fixture = TestBed.createComponent(AttachFileWidgetComponent); widget = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.spec.ts b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.spec.ts index e09c0ee527..9871a06efc 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.spec.ts +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.spec.ts @@ -18,11 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { AttachFolderWidgetComponent } from './attach-folder-widget.component'; -import { - FormFieldModel, - FormModel, - setupTestBed -} from '@alfresco/adf-core'; +import { FormFieldModel, FormModel } from '@alfresco/adf-core'; import { ContentNodeDialogService, NodesApiService } from '@alfresco/adf-content-services'; import { of } from 'rxjs'; import { Node } from '@alfresco/js-api'; @@ -53,14 +49,13 @@ describe('AttachFolderWidgetComponent', () => { let contentNodeDialogService: ContentNodeDialogService; let nodeService: NodesApiService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(AttachFolderWidgetComponent); widget = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/form/widgets/document/content.widget.spec.ts b/lib/process-services/src/lib/form/widgets/document/content.widget.spec.ts index 9532beeb9b..f239b3a610 100644 --- a/lib/process-services/src/lib/form/widgets/document/content.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/document/content.widget.spec.ts @@ -18,12 +18,7 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { - ContentLinkModel, - CoreTestingModule, - setupTestBed, - DownloadService -} from '@alfresco/adf-core'; +import { ContentLinkModel, CoreTestingModule, DownloadService } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { ContentWidgetComponent } from './content.widget'; import { TranslateModule } from '@ngx-translate/core'; @@ -63,14 +58,13 @@ describe('ContentWidgetComponent', () => { return new Blob([pdfData], {type: 'application/pdf'}); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); downloadService = TestBed.inject(DownloadService); processContentService = TestBed.inject(ProcessContentService); }); diff --git a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.spec.ts b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.spec.ts index 149bdf3a1f..1bd0748556 100644 --- a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.spec.ts @@ -24,8 +24,7 @@ import { FormFieldModel, FormModel, FormFieldTypes, - CoreTestingModule, - setupTestBed + CoreTestingModule } from '@alfresco/adf-core'; import { DropdownWidgetComponent } from './dropdown.widget'; import { TranslateModule } from '@ngx-translate/core'; @@ -51,14 +50,13 @@ describe('DropdownWidgetComponent', () => { {id: 'opt_2', name: 'option_2'}, {id: 'opt_3', name: 'option_3'}]; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); fixture = TestBed.createComponent(DropdownWidgetComponent); widget = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.spec.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.spec.ts index da4c55196b..09f11281c7 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/dynamic-table.widget.spec.ts @@ -22,7 +22,6 @@ import { FormModel, LogService, FormService, - setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; import { DynamicTableColumn } from './editors/models/dynamic-table-column.model'; @@ -81,14 +80,13 @@ describe('DynamicTableWidgetComponent', () => { let logService: LogService; let formService: FormService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); const field = new FormFieldModel(new FormModel()); logService = TestBed.inject(LogService); formService = TestBed.inject(FormService); diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/date/date.editor.spec.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/date/date.editor.spec.ts index 1394f2aa50..381c7f4e51 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/date/date.editor.spec.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/date/date.editor.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormFieldModel, FormModel, setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { FormFieldModel, FormModel, CoreTestingModule } from '@alfresco/adf-core'; import { DynamicTableColumn } from '../models/dynamic-table-column.model'; import { DynamicTableRow } from '../models/dynamic-table-row.model'; import { DynamicTableModel } from '../models/dynamic-table.widget.model'; @@ -32,14 +32,13 @@ describe('DateEditorComponent', () => { let column: DynamicTableColumn; let table: DynamicTableModel; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); fixture = TestBed.createComponent(DateEditorComponent); component = fixture.componentInstance; diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts index 2c0be34dfb..52844faada 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/datetime/datetime.editor.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import moment from 'moment'; -import { FormFieldModel, FormModel, setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { FormFieldModel, FormModel, CoreTestingModule } from '@alfresco/adf-core'; import { DynamicTableColumn } from '../models/dynamic-table-column.model'; import { DynamicTableRow } from '../models/dynamic-table-row.model'; import { DynamicTableModel } from '../models/dynamic-table.widget.model'; @@ -31,14 +31,13 @@ describe('DateTimeEditorComponent', () => { let column: DynamicTableColumn; let table: DynamicTableModel; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); fixture = TestBed.createComponent(DateTimeEditorComponent); component = fixture.componentInstance; diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts index 63a61dea54..bca57e3524 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts @@ -20,7 +20,6 @@ import { By } from '@angular/platform-browser'; import { Observable, throwError } from 'rxjs'; import { AlfrescoApiService, - setupTestBed, CoreTestingModule, FormFieldModel, FormModel, @@ -47,14 +46,13 @@ describe('DropdownEditorComponent', () => { let column: DynamicTableColumn; let row: DynamicTableRow; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); alfrescoApiService = TestBed.inject(AlfrescoApiService); formService = new FormService(); diff --git a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/row-editor/row.editor.spec.ts b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/row-editor/row.editor.spec.ts index 7880c61295..50a2c011a6 100644 --- a/lib/process-services/src/lib/form/widgets/dynamic-table/editors/row-editor/row.editor.spec.ts +++ b/lib/process-services/src/lib/form/widgets/dynamic-table/editors/row-editor/row.editor.spec.ts @@ -19,8 +19,7 @@ import { FormFieldModel, FormModel, FormService, - CoreTestingModule, - setupTestBed + CoreTestingModule } from '@alfresco/adf-core'; import { DynamicTableColumn } from '../models/dynamic-table-column.model'; import { DynamicTableRow } from '../models/dynamic-table-row.model'; @@ -28,19 +27,18 @@ import { DynamicTableModel } from '../models/dynamic-table.widget.model'; import { RowEditorComponent } from './row.editor'; import { TranslateModule } from '@ngx-translate/core'; import { DynamicRowValidationSummary } from '../models/dynamic-row-validation-summary.model'; +import { TestBed } from '@angular/core/testing'; describe('RowEditorComponent', () => { - let component: RowEditorComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); component = new RowEditorComponent(); const field = new FormFieldModel(new FormModel()); component.table = new DynamicTableModel(field, new FormService()); diff --git a/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.spec.ts b/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.spec.ts index 495cb3a2b1..5fd951b068 100644 --- a/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/functional-group/functional-group.widget.spec.ts @@ -21,7 +21,6 @@ import { FormModel, GroupModel, CoreTestingModule, - setupTestBed, FormFieldTypes } from '@alfresco/adf-core'; import { FunctionalGroupWidgetComponent } from './functional-group.widget'; @@ -40,14 +39,13 @@ describe('FunctionalGroupWidgetComponent', () => { {id: '2', name: 'group 2'} ]; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); peopleProcessService = TestBed.inject(PeopleProcessService); getWorkflowGroupsSpy = spyOn(peopleProcessService, 'getWorkflowGroups').and.returnValue(of([])); diff --git a/lib/process-services/src/lib/form/widgets/people/people.widget.spec.ts b/lib/process-services/src/lib/form/widgets/people/people.widget.spec.ts index b354f6d73e..370a116353 100644 --- a/lib/process-services/src/lib/form/widgets/people/people.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/people/people.widget.spec.ts @@ -21,7 +21,6 @@ import { FormFieldTypes, FormFieldModel, FormModel, - setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; import { Observable, of } from 'rxjs'; @@ -38,14 +37,13 @@ describe('PeopleWidgetComponent', () => { let translationService: TranslateService; let peopleProcessService: PeopleProcessService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); fixture = TestBed.createComponent(PeopleWidgetComponent); peopleProcessService = TestBed.inject(PeopleProcessService); diff --git a/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts b/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts index 7472eb9dbe..2aaeb4ae98 100644 --- a/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts @@ -24,7 +24,6 @@ import { FormFieldOption, FormFieldModel, FormModel, - setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; import { RadioButtonsWidgetComponent } from './radio-buttons.widget'; @@ -42,17 +41,16 @@ describe('RadioButtonsWidgetComponent', () => { let taskFormService: TaskFormService; let processDefinitionService: ProcessDefinitionService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - MatRadioModule, - FormsModule, - MatIconModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + MatRadioModule, + FormsModule, + MatIconModule + ] + }); taskFormService = TestBed.inject(TaskFormService); processDefinitionService = TestBed.inject(ProcessDefinitionService); diff --git a/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.spec.ts b/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.spec.ts index 8a5f5a7004..db083f2b9f 100644 --- a/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/typeahead/typeahead.widget.spec.ts @@ -25,7 +25,6 @@ import { FormFieldTypes, FormFieldModel, FormModel, - setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; import { TypeaheadWidgetComponent } from './typeahead.widget'; @@ -41,14 +40,13 @@ describe('TypeaheadWidgetComponent', () => { let taskFormService: TaskFormService; let processDefinitionService: ProcessDefinitionService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); translationService = TestBed.inject(TranslateService); taskFormService = TestBed.inject(TaskFormService); processDefinitionService = TestBed.inject(ProcessDefinitionService); diff --git a/lib/process-services/src/lib/form/widgets/upload/upload.widget.spec.ts b/lib/process-services/src/lib/form/widgets/upload/upload.widget.spec.ts index 39e8e1d841..1525eeef48 100644 --- a/lib/process-services/src/lib/form/widgets/upload/upload.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/upload/upload.widget.spec.ts @@ -24,7 +24,6 @@ import { FormFieldTypes, FormModel, FormFieldModel, - setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; import { UploadWidgetComponent } from './upload.widget'; @@ -81,11 +80,13 @@ describe('UploadWidgetComponent', () => { const filePngFake = new File(['fakePng'], 'file-fake.png', {type: 'image/png'}); const filJpgFake = new File(['fakeJpg'], 'file-fake.jpg', {type: 'image/jpg'}); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); }); describe('when template is ready', () => { diff --git a/lib/process-services/src/lib/people/components/people-list/people-list.component.spec.ts b/lib/process-services/src/lib/people/components/people-list/people-list.component.spec.ts index f7b7345a6c..b07b7ee4fc 100644 --- a/lib/process-services/src/lib/people/components/people-list/people-list.component.spec.ts +++ b/lib/process-services/src/lib/people/components/people-list/people-list.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed, DataRowActionEvent, DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; +import { DataRowActionEvent, DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { UserEventModel } from '../../../task-list/models/user-event.model'; import { PeopleListComponent } from './people-list.component'; @@ -35,14 +35,13 @@ describe('PeopleListComponent', () => { let peopleListComponent: PeopleListComponent; let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(PeopleListComponent); peopleListComponent = fixture.componentInstance; fixture.detectChanges(); diff --git a/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.spec.ts b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.spec.ts index e8d8fd3f0b..3804589183 100644 --- a/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.spec.ts +++ b/lib/process-services/src/lib/people/components/people-search-field/people-search-field.component.spec.ts @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DebugElement } from '@angular/core'; -import { setupTestBed } from '@alfresco/adf-core'; import { PeopleSearchFieldComponent } from './people-search-field.component'; import { By } from '@angular/platform-browser'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; @@ -30,14 +29,13 @@ describe('PeopleSearchFieldComponent', () => { let debug: DebugElement; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(PeopleSearchFieldComponent); component = fixture.componentInstance; debug = fixture.debugElement; diff --git a/lib/process-services/src/lib/people/components/people-search/people-search.component.spec.ts b/lib/process-services/src/lib/people/components/people-search/people-search.component.spec.ts index 0547ff7a51..03635d4ed1 100644 --- a/lib/process-services/src/lib/people/components/people-search/people-search.component.spec.ts +++ b/lib/process-services/src/lib/people/components/people-search/people-search.component.spec.ts @@ -16,7 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { TranslateModule } from '@ngx-translate/core'; import { PeopleSearchComponent } from './people-search.component'; @@ -45,14 +44,13 @@ describe('PeopleSearchComponent', () => { const userArray = [fakeUser, fakeSecondUser]; let searchInput: any; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(PeopleSearchComponent); peopleSearchComponent = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/people/components/people-selector/people-selector.component.spec.ts b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.spec.ts index 42fa2acdb5..b284662d8a 100644 --- a/lib/process-services/src/lib/people/components/people-selector/people-selector.component.spec.ts +++ b/lib/process-services/src/lib/people/components/people-selector/people-selector.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { LogService, setupTestBed } from '@alfresco/adf-core'; +import { LogService } from '@alfresco/adf-core'; import { PeopleSelectorComponent } from './people-selector.component'; import { of, throwError } from 'rxjs'; import { By } from '@angular/platform-browser'; @@ -29,14 +29,13 @@ describe('PeopleSelectorComponent', () => { let component: PeopleSelectorComponent; let fixture: ComponentFixture; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(PeopleSelectorComponent); component = fixture.componentInstance; fixture.detectChanges(); diff --git a/lib/process-services/src/lib/people/components/people/people.component.spec.ts b/lib/process-services/src/lib/people/components/people/people.component.spec.ts index 1c27b818b2..5376c51a7e 100644 --- a/lib/process-services/src/lib/people/components/people/people.component.spec.ts +++ b/lib/process-services/src/lib/people/components/people/people.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; -import { LogService, setupTestBed } from '@alfresco/adf-core'; +import { LogService } from '@alfresco/adf-core'; import { PeopleComponent } from './people.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -49,14 +49,13 @@ describe('PeopleComponent', () => { let logService: LogService; let peopleProcessService: PeopleProcessService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); logService = TestBed.inject(LogService); peopleProcessService = TestBed.inject(PeopleProcessService); fixture = TestBed.createComponent(PeopleComponent); diff --git a/lib/process-services/src/lib/pipes/process-name.pipe.spec.ts b/lib/process-services/src/lib/pipes/process-name.pipe.spec.ts index a1f623cc68..1bc23ffbba 100644 --- a/lib/process-services/src/lib/pipes/process-name.pipe.spec.ts +++ b/lib/process-services/src/lib/pipes/process-name.pipe.spec.ts @@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing'; import { ProcessNamePipe } from './process-name.pipe'; import { TranslateModule } from '@ngx-translate/core'; import moment from 'moment'; -import { setupTestBed, LocalizedDatePipe, CoreTestingModule } from '@alfresco/adf-core'; +import { LocalizedDatePipe, CoreTestingModule } from '@alfresco/adf-core'; import { ProcessInstance } from '../process-list'; describe('ProcessNamePipe', () => { @@ -35,14 +35,13 @@ describe('ProcessNamePipe', () => { const nameWithAllIdentifiers = `${defaultName} ${processDefinitionIdentifier} - ${datetimeIdentifier}`; const fakeProcessInstanceDetails = new ProcessInstance({ processDefinitionName: 'fake-process-def-name'}); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); const localizedDatePipe = TestBed.inject(LocalizedDatePipe); processNamePipe = new ProcessNamePipe(localizedDatePipe); }); diff --git a/lib/process-services/src/lib/process-comments/process-comments.component.spec.ts b/lib/process-services/src/lib/process-comments/process-comments.component.spec.ts index b8e89c7bba..a22c2cd3d1 100644 --- a/lib/process-services/src/lib/process-comments/process-comments.component.spec.ts +++ b/lib/process-services/src/lib/process-comments/process-comments.component.spec.ts @@ -18,10 +18,7 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; - -import { setupTestBed } from '@alfresco/adf-core'; import { CommentProcessService } from './services/comment-process.service'; - import { ProcessCommentsComponent } from './process-comments.component'; import { ProcessTestingModule } from '../testing/process.testing.module'; import { mockProcessInstanceComments } from '../mock/process/process-comments.mock'; @@ -34,15 +31,13 @@ describe('ProcessCommentsComponent', () => { let getCommentsSpy: jasmine.Spy; let commentProcessService: CommentProcessService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { - + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(ProcessCommentsComponent); component = fixture.componentInstance; commentProcessService = TestBed.inject(CommentProcessService); diff --git a/lib/process-services/src/lib/process-list/components/process-audit.directive.spec.ts b/lib/process-services/src/lib/process-list/components/process-audit.directive.spec.ts index f6af1fc065..2c3bce3f22 100644 --- a/lib/process-services/src/lib/process-list/components/process-audit.directive.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-audit.directive.spec.ts @@ -19,7 +19,7 @@ import { Component } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; import { ProcessService } from './../services/process.service'; -import { setupTestBed, DownloadService } from '@alfresco/adf-core'; +import { DownloadService } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../testing/process.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -71,17 +71,16 @@ describe('ProcessAuditDirective', () => { const blob = createFakePdfBlob(); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [ - BasicButtonComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [ + BasicButtonComponent + ] + }); fixture = TestBed.createComponent(BasicButtonComponent); component = fixture.componentInstance; service = TestBed.inject(ProcessService); diff --git a/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts index a6082d09b8..d0157dd3a9 100644 --- a/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts @@ -16,7 +16,6 @@ */ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; -import { setupTestBed } from '@alfresco/adf-core'; import { from, of } from 'rxjs'; import { FilterProcessRepresentationModel } from '../models/filter-process.model'; import { AppsProcessService } from '../../app-list/services/apps-process.service'; @@ -38,16 +37,15 @@ describe('ProcessFiltersComponent', () => { let appsProcessService: AppsProcessService; let router: Router; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule, - RouterTestingModule - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule, + RouterTestingModule + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] + }); fixture = TestBed.createComponent(ProcessFiltersComponent); filterList = fixture.componentInstance; processFilterService = TestBed.inject(ProcessFilterService); diff --git a/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts index 6fadd5f6e9..e152d58be0 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-details.component.spec.ts @@ -19,11 +19,8 @@ import { DebugElement, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; - -import { setupTestBed } from '@alfresco/adf-core'; import { CommentProcessService } from '../../process-comments/services/comment-process.service'; import { TaskListModule } from '../../task-list/task-list.module'; - import { exampleProcess, exampleProcessNoName, mockRunningProcess, processEnded } from './../../mock'; import { mockProcessInstanceComments } from './../../mock/process/process-comments.mock'; import { ProcessService } from './../services/process.service'; @@ -39,18 +36,16 @@ describe('ProcessInstanceDetailsComponent', () => { let fixture: ComponentFixture; let getProcessSpy: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule, - FormModule, - TaskListModule - ], - schemas: [NO_ERRORS_SCHEMA] - }); - beforeEach(() => { - + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule, + FormModule, + TaskListModule + ], + schemas: [NO_ERRORS_SCHEMA] + }); fixture = TestBed.createComponent(ProcessInstanceDetailsComponent); component = fixture.componentInstance; service = fixture.debugElement.injector.get(ProcessService); diff --git a/lib/process-services/src/lib/process-list/components/process-instance-header.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-header.component.spec.ts index 9c56b6aea7..bc84474747 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-header.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-header.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { ProcessInstance } from '../models/process-instance.model'; import { exampleProcess } from '../../mock'; import { ProcessInstanceHeaderComponent } from './process-instance-header.component'; @@ -29,14 +29,13 @@ describe('ProcessInstanceHeaderComponent', () => { let fixture: ComponentFixture; let appConfigService: AppConfigService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(ProcessInstanceHeaderComponent); component = fixture.componentInstance; diff --git a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.spec.ts index a6e81a84ff..7cb1626bda 100644 --- a/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-instance-tasks.component.spec.ts @@ -19,14 +19,11 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; - import { TaskDetailsModel } from '../../task-list'; - import { taskDetailsMock } from '../../mock'; import { ProcessInstance } from './../models/process-instance.model'; import { ProcessService } from './../services/process.service'; import { ProcessInstanceTasksComponent } from './process-instance-tasks.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../testing/process.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -39,15 +36,13 @@ describe('ProcessInstanceTasksComponent', () => { const exampleProcessInstance = new ProcessInstance({ id: '123' }); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { - + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(ProcessInstanceTasksComponent); component = fixture.componentInstance; service = TestBed.inject(ProcessService); diff --git a/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts index 919b28aded..37bb7aeac7 100644 --- a/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts @@ -21,7 +21,7 @@ import { of, throwError, Subject } from 'rxjs'; import { By } from '@angular/platform-browser'; import { ProcessInstanceListComponent } from './process-list.component'; import { - AppConfigService, setupTestBed, DataRow, DataColumn, + AppConfigService, DataRow, DataColumn, DataRowEvent, ObjectDataRow, ObjectDataTableAdapter, DataCellEvent, ObjectDataColumn } from '@alfresco/adf-core'; import { @@ -50,14 +50,13 @@ describe('ProcessInstanceListComponent', () => { return value; }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(ProcessInstanceListComponent); component = fixture.componentInstance; appConfig = TestBed.inject(AppConfigService); @@ -482,15 +481,14 @@ describe('CustomProcessListComponent', () => { let fixture: ComponentFixture; let component: CustomProcessListComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [CustomProcessListComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [CustomProcessListComponent] + }); fixture = TestBed.createComponent(CustomProcessListComponent); fixture.detectChanges(); component = fixture.componentInstance; @@ -520,15 +518,14 @@ describe('Process List: Custom EmptyTemplateComponent', () => { let fixture: ComponentFixture; let processService: ProcessService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [EmptyTemplateComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [EmptyTemplateComponent] + }); fixture = TestBed.createComponent(EmptyTemplateComponent); processService = TestBed.inject(ProcessService); spyOn(processService, 'getProcessInstances').and.returnValue(of(fakeProcessInstancesEmpty)); @@ -622,15 +619,14 @@ describe('ProcessListContextMenuComponent', () => { let processService: ProcessService; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [ProcessListContextMenuComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [ProcessListContextMenuComponent] + }); fixture = TestBed.createComponent(ProcessListContextMenuComponent); customComponent = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts b/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts index 36233f3f0d..6a9f133956 100644 --- a/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/start-process.component.spec.ts @@ -17,7 +17,7 @@ import { DebugElement, SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { AppsProcessService } from '../../app-list/services/apps-process.service'; import { of, throwError } from 'rxjs'; import { MatSelectChange } from '@angular/material/select'; @@ -54,11 +54,13 @@ describe('StartProcessComponent', () => { let applyAlfrescoNodeSpy: jasmine.Spy; let getDeployedApplicationsSpy: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); }); const selectOptionByName = (name: string) => { diff --git a/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts b/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts index a77e8e63d1..37a9694980 100644 --- a/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts +++ b/lib/process-services/src/lib/process-list/services/process-filter.service.spec.ts @@ -19,21 +19,19 @@ import { TestBed } from '@angular/core/testing'; import { mockError, fakeProcessFiltersResponse } from '../../mock'; import { FilterProcessRepresentationModel } from '../models/filter-process.model'; import { ProcessFilterService } from './process-filter.service'; -import { setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CoreTestingModule } from '@alfresco/adf-core'; declare let jasmine: any; describe('Process filter', () => { - let service: ProcessFilterService; - setupTestBed({ - imports: [ - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + CoreTestingModule + ] + }); service = TestBed.inject(ProcessFilterService); }); diff --git a/lib/process-services/src/lib/process-list/services/process.service.spec.ts b/lib/process-services/src/lib/process-list/services/process.service.spec.ts index 20690097ee..36c8595e79 100644 --- a/lib/process-services/src/lib/process-list/services/process.service.spec.ts +++ b/lib/process-services/src/lib/process-list/services/process.service.spec.ts @@ -20,23 +20,21 @@ import { exampleProcess, mockError, fakeProcessDef, fakeTasksList } from '../../ import { ProcessFilterParamRepresentationModel } from '../models/filter-process.model'; import { ProcessInstanceVariable } from '../models/process-instance-variable.model'; import { ProcessService } from './process.service'; -import { setupTestBed, CoreModule } from '@alfresco/adf-core'; +import { CoreModule } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../testing/process.testing.module'; declare let moment: any; describe('ProcessService', () => { - let service: ProcessService; - setupTestBed({ - imports: [ - CoreModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot(), + ProcessTestingModule + ] + }); service = TestBed.inject(ProcessService); }); diff --git a/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts b/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts index cadd674bf8..172528faee 100644 --- a/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts +++ b/lib/process-services/src/lib/process-user-info/process-user-info.component.spec.ts @@ -15,11 +15,7 @@ * limitations under the License. */ -import { - CoreTestingModule, - setupTestBed, - UserInfoMode -} from '@alfresco/adf-core'; +import { CoreTestingModule, UserInfoMode } from '@alfresco/adf-core'; import { fakeEcmUser, fakeEcmUserNoImage } from '@alfresco/adf-content-services'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatMenuModule } from '@angular/material/menu'; @@ -50,15 +46,14 @@ describe('ProcessUserInfoComponent', () => { fixture.detectChanges(); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule, - MatMenuModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule, + MatMenuModule + ] + }); fixture = TestBed.createComponent(ProcessUserInfoComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/task-comments/services/task-comments.service.spec.ts b/lib/process-services/src/lib/task-comments/services/task-comments.service.spec.ts index 70e2546b79..351748f49c 100644 --- a/lib/process-services/src/lib/task-comments/services/task-comments.service.spec.ts +++ b/lib/process-services/src/lib/task-comments/services/task-comments.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { CommentModel, setupTestBed, CoreTestingModule } from '@alfresco/adf-core'; +import { CommentModel, CoreTestingModule } from '@alfresco/adf-core'; import { fakeTasksComment, fakeUser1 } from '../mocks/task-comments.mock'; import { TranslateModule } from '@ngx-translate/core'; import { TaskCommentsService } from './task-comments.service'; @@ -24,17 +24,15 @@ import { TaskCommentsService } from './task-comments.service'; declare let jasmine: any; describe('TaskCommentsService', () => { - let service: TaskCommentsService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - CoreTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + CoreTestingModule + ] + }); service = TestBed.inject(TaskCommentsService); }); diff --git a/lib/process-services/src/lib/task-list/components/attach-form.component.spec.ts b/lib/process-services/src/lib/task-list/components/attach-form.component.spec.ts index 875af4dcea..e53e7ed241 100644 --- a/lib/process-services/src/lib/task-list/components/attach-form.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/attach-form.component.spec.ts @@ -17,7 +17,6 @@ import { AttachFormComponent } from './attach-form.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../testing/process.testing.module'; import { TaskListService } from './../services/tasklist.service'; import { of } from 'rxjs'; @@ -30,14 +29,13 @@ describe('AttachFormComponent', () => { let element: HTMLElement; let taskService: TaskListService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(AttachFormComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/task-list/components/checklist.component.spec.ts b/lib/process-services/src/lib/task-list/components/checklist.component.spec.ts index 96f29fb47f..e76d8fcc45 100644 --- a/lib/process-services/src/lib/task-list/components/checklist.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/checklist.component.spec.ts @@ -19,7 +19,6 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TaskDetailsModel } from '../models/task-details.model'; import { ChecklistComponent } from './checklist.component'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../testing/process.testing.module'; import { TaskListService } from './../services/tasklist.service'; import { of } from 'rxjs'; @@ -33,14 +32,13 @@ describe('ChecklistComponent', () => { let showChecklistDialog; let service: TaskListService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); service = TestBed.inject(TaskListService); spyOn(service, 'getTaskChecklist').and.returnValue(of([new TaskDetailsModel({ id: 'fake-check-changed-id', diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.spec.ts b/lib/process-services/src/lib/task-list/components/start-task.component.spec.ts index 70e79dcb16..6522155115 100644 --- a/lib/process-services/src/lib/task-list/components/start-task.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/start-task.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed, LogService } from '@alfresco/adf-core'; +import { LogService } from '@alfresco/adf-core'; import { of, throwError } from 'rxjs'; import { TaskListService } from '../services/tasklist.service'; import { StartTaskComponent } from './start-task.component'; @@ -49,14 +49,13 @@ describe('StartTaskComponent', () => { const testUser = { id: 1001, firstName: 'fakeName', email: 'fake@app.activiti.com' }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(StartTaskComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/task-list/components/task-audit.directive.spec.ts b/lib/process-services/src/lib/task-list/components/task-audit.directive.spec.ts index 2aaf7707d4..4cc2d1c114 100644 --- a/lib/process-services/src/lib/task-list/components/task-audit.directive.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-audit.directive.spec.ts @@ -19,7 +19,6 @@ import { Component } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; import { TaskListService } from './../services/tasklist.service'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../testing/process.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -70,15 +69,14 @@ describe('TaskAuditDirective', () => { return new Blob([pdfData], {type: 'application/pdf'}); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [BasicButtonComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [BasicButtonComponent] + }); fixture = TestBed.createComponent(BasicButtonComponent); component = fixture.componentInstance; service = TestBed.inject(TaskListService); diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts index 427fd025d3..fda4a5b997 100644 --- a/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts @@ -23,7 +23,6 @@ import { FormModel, FormOutcomeEvent, FormOutcomeModel, - setupTestBed, LogService, CommentModel } from '@alfresco/adf-core'; @@ -73,15 +72,14 @@ describe('TaskDetailsComponent', () => { let taskCommentsService: TaskCommentsService; let peopleProcessService: PeopleProcessService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - schemas: [NO_ERRORS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + schemas: [NO_ERRORS_SCHEMA] + }); logService = TestBed.inject(LogService); peopleProcessService = TestBed.inject(PeopleProcessService); @@ -148,19 +146,19 @@ describe('TaskDetailsComponent', () => { expect(fixture.nativeElement.innerText).toBe('ADF_TASK_LIST.DETAILS.MESSAGES.NONE'); }); - it('should display a form when the task has an associated form', fakeAsync(() => { + it('should display a form when the task has an associated form', () => { component.taskId = '123'; fixture.detectChanges(); expect(fixture.debugElement.query(By.css('adf-form'))).not.toBeNull(); - })); + }); - it('should display a form in readonly when the task has an associated form and readOnlyForm is true', fakeAsync(() => { + it('should display a form in readonly when the task has an associated form and readOnlyForm is true', () => { component.readOnlyForm = true; component.taskId = '123'; fixture.detectChanges(); expect(fixture.debugElement.query(By.css('adf-form'))).not.toBeNull(); expect(fixture.debugElement.query(By.css('.adf-readonly-form'))).not.toBeNull(); - })); + }); it('should not display a form when the task does not have an associated form', async () => { component.taskId = '123'; diff --git a/lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts index 22438bbac0..f5887ce48a 100644 --- a/lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-filters.component.spec.ts @@ -18,7 +18,7 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AppsProcessService } from '../../app-list/services/apps-process.service'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { from, of } from 'rxjs'; import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model'; import { TaskListService } from '../services/tasklist.service'; @@ -40,15 +40,14 @@ describe('TaskFiltersComponent', () => { let fixture: ComponentFixture; let router: Router; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule, - RouterTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule, + RouterTestingModule + ] + }); const appConfig: AppConfigService = TestBed.inject(AppConfigService); appConfig.config.bpmHost = 'http://localhost:9876/bpm'; diff --git a/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.spec.ts b/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.spec.ts index 5e0d2d8a7e..5781c7585e 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/claim-task.directive.spec.ts @@ -17,7 +17,6 @@ import { Component, Output, EventEmitter } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { TaskListService } from '../../services/tasklist.service'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; @@ -42,16 +41,15 @@ describe('ClaimTaskDirective', () => { let fixture: ComponentFixture; let taskListService: TaskListService; - setupTestBed({ - imports: [ - ProcessTestingModule - ], - declarations: [ - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + ProcessTestingModule + ], + declarations: [ + TestComponent + ] + }); taskListService = TestBed.inject(TaskListService); fixture = TestBed.createComponent(TestComponent); fixture.detectChanges(); @@ -95,17 +93,16 @@ describe('Claim Task Directive validation errors', () => { let fixture: ComponentFixture; - setupTestBed({ - imports: [ - ProcessTestingModule - ], - declarations: [ - ClaimTestMissingTaskIdDirectiveComponent, - ClaimTestMissingInputDirectiveComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + ProcessTestingModule + ], + declarations: [ + ClaimTestMissingTaskIdDirectiveComponent, + ClaimTestMissingInputDirectiveComponent + ] + }); fixture = TestBed.createComponent(ClaimTestMissingInputDirectiveComponent); }); diff --git a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts index f6447d16fb..9bb5f151cf 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/task-form.component.spec.ts @@ -18,12 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TaskFormComponent } from './task-form.component'; -import { - FormModel, - FormOutcomeEvent, - FormOutcomeModel, - setupTestBed -} from '@alfresco/adf-core'; +import { FormModel, FormOutcomeEvent, FormOutcomeModel } from '@alfresco/adf-core'; import { TaskListService } from '../../services/tasklist.service'; import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; import { of, throwError } from 'rxjs'; @@ -66,15 +61,14 @@ describe('TaskFormComponent', () => { let peopleProcessService: PeopleProcessService; let getBpmLoggedUserSpy: jasmine.Spy; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - schemas: [NO_ERRORS_SCHEMA] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + schemas: [NO_ERRORS_SCHEMA] + }); fixture = TestBed.createComponent(TaskFormComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.spec.ts b/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.spec.ts index 0958b0e067..9f0de50157 100644 --- a/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-form/unclaim-task.directive.spec.ts @@ -17,7 +17,6 @@ import { Component, Output, EventEmitter } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { TaskListService } from '../../services/tasklist.service'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; @@ -42,16 +41,15 @@ describe('UnclaimTaskDirective', () => { let fixture: ComponentFixture; let taskListService: TaskListService; - setupTestBed({ - imports: [ - ProcessTestingModule - ], - declarations: [ - TestComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + ProcessTestingModule + ], + declarations: [ + TestComponent + ] + }); taskListService = TestBed.inject(TaskListService); fixture = TestBed.createComponent(TestComponent); fixture.detectChanges(); @@ -99,17 +97,16 @@ describe('Claim Task Directive validation errors', () => { let fixture: ComponentFixture; - setupTestBed({ - imports: [ - ProcessTestingModule - ], - declarations: [ - ClaimTestMissingTaskIdDirectiveComponent, - ClaimTestMissingInputDirectiveComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + ProcessTestingModule + ], + declarations: [ + ClaimTestMissingTaskIdDirectiveComponent, + ClaimTestMissingInputDirectiveComponent + ] + }); fixture = TestBed.createComponent(ClaimTestMissingInputDirectiveComponent); }); diff --git a/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts index 64578e1861..0671479b86 100644 --- a/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { completedTaskDetailsMock, @@ -58,14 +58,13 @@ describe('TaskHeaderComponent', () => { groups: [] }); - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(TaskHeaderComponent); component = fixture.componentInstance; service = TestBed.inject(TaskListService); diff --git a/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts index 75c1a76bdb..2ed8f6998f 100644 --- a/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts @@ -18,7 +18,7 @@ import { Component, SimpleChange, ViewChild, OnInit, Output, EventEmitter, SimpleChanges } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AppConfigService, setupTestBed, DataRowEvent, ObjectDataRow, DataCellEvent, ObjectDataColumn } from '@alfresco/adf-core'; +import { AppConfigService, DataRowEvent, ObjectDataRow, DataCellEvent, ObjectDataColumn } from '@alfresco/adf-core'; import { TaskListService } from '../services/tasklist.service'; import { TaskListComponent } from './task-list.component'; import { ProcessTestingModule } from '../../testing/process.testing.module'; @@ -100,14 +100,13 @@ describe('TaskListComponent', () => { expect(selectRow2).toBeNull(); }; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); appConfig = TestBed.inject(AppConfigService); appConfig.config.bpmHost = 'http://localhost:9876/bpm'; @@ -686,15 +685,14 @@ describe('CustomTaskListComponent', () => { let fixture: ComponentFixture; let component: CustomTaskListComponent; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [CustomTaskListComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [CustomTaskListComponent] + }); fixture = TestBed.createComponent(CustomTaskListComponent); fixture.detectChanges(); component = fixture.componentInstance; @@ -730,15 +728,14 @@ describe('Task List: Custom EmptyTemplateComponent', () => { let translateService: TranslateService; let taskListService: TaskListService; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [EmptyTemplateComponent] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [EmptyTemplateComponent] + }); translateService = TestBed.inject(TranslateService); taskListService = TestBed.inject(TaskListService); spyOn(translateService, 'get').and.callFake((key: string) => of(key)); @@ -830,17 +827,16 @@ describe('TaskListContextMenuComponent', () => { let taskListService: TaskListService; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ], - declarations: [ - TaskListContextMenuComponent - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ], + declarations: [ + TaskListContextMenuComponent + ] + }); fixture = TestBed.createComponent(TaskListContextMenuComponent); customComponent = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/task-list/components/task-standalone.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-standalone.component.spec.ts index acbe5b2751..94097bcf8f 100644 --- a/lib/process-services/src/lib/task-list/components/task-standalone.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-standalone.component.spec.ts @@ -17,7 +17,6 @@ import { TaskStandaloneComponent } from './task-standalone.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../testing/process.testing.module'; import { TranslateModule } from '@ngx-translate/core'; @@ -26,14 +25,13 @@ describe('TaskStandaloneComponent', () => { let fixture: ComponentFixture; let element: HTMLElement; - setupTestBed({ - imports: [ - TranslateModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + TranslateModule.forRoot(), + ProcessTestingModule + ] + }); fixture = TestBed.createComponent(TaskStandaloneComponent); component = fixture.componentInstance; element = fixture.nativeElement; diff --git a/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts b/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts index f0f4e7ffa9..d69f2a3ebf 100644 --- a/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts +++ b/lib/process-services/src/lib/task-list/services/task-filter.service.spec.ts @@ -20,7 +20,7 @@ import { fakeAppPromise } from '../../mock'; import { fakeFiltersResponse, fakeAppFilter } from '../../mock/task/task-filters.mock'; import { FilterRepresentationModel } from '../models/filter.model'; import { TaskFilterService } from './task-filter.service'; -import { setupTestBed, CoreModule } from '@alfresco/adf-core'; +import { CoreModule } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../testing/process.testing.module'; declare let jasmine: any; @@ -29,14 +29,13 @@ describe('Activiti Task filter Service', () => { let service: TaskFilterService; - setupTestBed({ - imports: [ - CoreModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot(), + ProcessTestingModule + ] + }); service = TestBed.inject(TaskFilterService); jasmine.Ajax.install(); }); diff --git a/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts b/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts index 8ab2e80276..cb8b884b7d 100644 --- a/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts +++ b/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed, CoreModule } from '@alfresco/adf-core'; +import { CoreModule } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { fakeCompletedTaskList, @@ -40,17 +40,15 @@ import { UserProcessModel } from '../../common/models/user-process.model'; declare let jasmine: any; describe('Activiti TaskList Service', () => { - let service: TaskListService; - setupTestBed({ - imports: [ - CoreModule.forRoot(), - ProcessTestingModule - ] - }); - beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + CoreModule.forRoot(), + ProcessTestingModule + ] + }); service = TestBed.inject(TaskListService); jasmine.Ajax.install(); });