diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts index abb3b9ad0c..0e811898e0 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts +++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.spec.ts @@ -19,7 +19,6 @@ import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/materia import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AspectListDialogComponent } from './aspect-list-dialog.component'; import { of, Subject } from 'rxjs'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { AspectListDialogComponentData } from './aspect-list-dialog-data.interface'; import { AspectListService } from './services/aspect-list.service'; import { delay } from 'rxjs/operators'; @@ -27,6 +26,7 @@ import { AspectEntry, Node } from '@alfresco/js-api'; import { NodesApiService } from '../common/services/nodes-api.service'; import { By } from '@angular/platform-browser'; import { AspectListComponent } from './aspect-list.component'; +import { provideApiTesting } from '../testing/providers'; const aspectListMock: AspectEntry[] = [ { @@ -104,7 +104,7 @@ describe('AspectListDialogComponent', () => { keyCode: 27 } as KeyboardEventInit); - beforeEach(async () => { + beforeEach(() => { data = { title: 'Title', description: 'Description that can be longer or shorter', @@ -112,9 +112,10 @@ describe('AspectListDialogComponent', () => { select: new Subject(), excludedAspects: [] }; - await TestBed.configureTestingModule({ - imports: [ContentTestingModule, MatDialogModule], + TestBed.configureTestingModule({ + imports: [MatDialogModule], providers: [ + provideApiTesting(), { provide: MAT_DIALOG_DATA, useValue: data }, { provide: MatDialogRef, @@ -125,7 +126,7 @@ describe('AspectListDialogComponent', () => { } } ] - }).compileComponents(); + }); fixture = TestBed.createComponent(AspectListDialogComponent); }); 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 fff47994fb..47169ee65e 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 @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NodesApiService } from '../common/services/nodes-api.service'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { AspectListComponent } from './aspect-list.component'; import { AspectListService, CustomAspectsWhere, StandardAspectsWhere } from './services/aspect-list.service'; import { EMPTY, of } from 'rxjs'; @@ -29,6 +28,7 @@ import { MatTableHarness } from '@angular/material/table/testing'; import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; import { CustomAspectPaging } from './interfaces/custom-aspect-paging.interface'; +import { provideApiTesting } from '../testing/providers'; const aspectListMock: AspectEntry[] = [ { @@ -125,8 +125,8 @@ describe('AspectListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, AspectListComponent], - providers: [AspectListService] + imports: [AspectListComponent], + providers: [provideApiTesting()] }); fixture = TestBed.createComponent(AspectListComponent); 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 bcae7180d8..93085a0b9d 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 { ContentTestingModule } from '../../testing/content.testing.module'; import { DialogAspectListService } from './dialog-aspect-list.service'; import { AspectListDialogComponent } from '../aspect-list-dialog.component'; import { AspectListDialogComponentData } from '../aspect-list-dialog-data.interface'; @@ -24,6 +23,7 @@ import { TagService } from '../../tag/services/tag.service'; import { TestBed } from '@angular/core/testing'; import { MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog'; import { Observable, Subject } from 'rxjs'; +import { provideApiTesting } from '../../testing/providers'; describe('DialogAspectListService', () => { let dialogAspectListService: DialogAspectListService; @@ -31,7 +31,7 @@ describe('DialogAspectListService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + providers: [provideApiTesting()] }); 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 1eebadc719..feba3a1752 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 @@ -19,7 +19,6 @@ import { Node } from '@alfresco/js-api'; import { TestBed } from '@angular/core/testing'; import { NodesApiService } from '../../common/services/nodes-api.service'; import { EMPTY, of } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { NodeAspectService } from './node-aspect.service'; import { DialogAspectListService } from './dialog-aspect-list.service'; import { CardViewContentUpdateService } from '../../common/services/card-view-content-update.service'; @@ -32,9 +31,7 @@ describe('NodeAspectService', () => { let cardViewContentUpdateService: CardViewContentUpdateService; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ContentTestingModule] - }); + TestBed.configureTestingModule({}); dialogAspectListService = TestBed.inject(DialogAspectListService); nodeAspectService = TestBed.inject(NodeAspectService); nodeApiService = TestBed.inject(NodesApiService); 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 e98ccf45bb..da473f778c 100644 --- a/lib/content-services/src/lib/breadcrumb/breadcrumb.component.spec.ts +++ b/lib/content-services/src/lib/breadcrumb/breadcrumb.component.spec.ts @@ -15,14 +15,13 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Node } from '@alfresco/js-api'; import { fakeNodeWithCreatePermission } from '../mock'; import { DocumentListComponent, DocumentListService } from '../document-list'; import { BreadcrumbComponent } from './breadcrumb.component'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { of } from 'rxjs'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('Breadcrumb', () => { let component: BreadcrumbComponent; @@ -37,8 +36,7 @@ describe('Breadcrumb', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - schemas: [CUSTOM_ELEMENTS_SCHEMA], + imports: [NoopAuthModule], providers: [{ provide: DocumentListService, useValue: documentListService }] }); fixture = TestBed.createComponent(BreadcrumbComponent); 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 886b707c65..94822a3808 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 @@ -15,26 +15,26 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { fakeNodeWithCreatePermission } from '../mock'; import { DocumentListComponent, DocumentListService } from '../document-list'; import { DropdownBreadcrumbComponent } from './dropdown-breadcrumb.component'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { of } from 'rxjs'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('DropdownBreadcrumb', () => { let component: DropdownBreadcrumbComponent; let fixture: ComponentFixture; let documentList: DocumentListComponent; - let documentListService: DocumentListService = jasmine.createSpyObj({ loadFolderByNodeId: of(''), isCustomSourceService: false }); + let documentListService: DocumentListService; beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - schemas: [CUSTOM_ELEMENTS_SCHEMA], - providers: [{ provide: DocumentListService, useValue: documentListService }] + imports: [NoopAuthModule], + providers: [ + { provide: DocumentListService, useValue: jasmine.createSpyObj({ loadFolderByNodeId: of(''), isCustomSourceService: false }) } + ] }); fixture = TestBed.createComponent(DropdownBreadcrumbComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts b/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts index dc25ebe3f4..441db25f8e 100644 --- a/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts +++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.spec.ts @@ -22,7 +22,6 @@ import { MatError } from '@angular/material/form-field'; import { MatList } from '@angular/material/list'; import { By } from '@angular/platform-browser'; import { of, Subject } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { CategoriesManagementMode } from './categories-management-mode'; import { CategoryService } from '../services/category.service'; import { CategoriesManagementComponent } from './categories-management.component'; @@ -47,7 +46,7 @@ describe('CategoriesManagementComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, CategoriesManagementComponent], + imports: [CategoriesManagementComponent], providers: [ { provide: CategoryService, 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 90fbad4ec4..c5877dbf9c 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 @@ -30,7 +30,7 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { CategoryService } from '../../../category'; import { TagService } from '../../../tag'; import { PropertyDescriptorsService } from '../../public-api'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('ContentMetadataCardComponent', () => { let component: ContentMetadataCardComponent; @@ -47,7 +47,7 @@ describe('ContentMetadataCardComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, MatDialogModule, MatSnackBarModule, ContentMetadataCardComponent] + imports: [NoopAuthModule, MatDialogModule, MatSnackBarModule, ContentMetadataCardComponent] }); fixture = TestBed.createComponent(ContentMetadataCardComponent); contentMetadataService = TestBed.inject(ContentMetadataService); 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 eba177f63f..04dc4e72b7 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 @@ -24,7 +24,8 @@ import { CardViewComponent, NotificationService, UpdateNotification, - UnitTestingUtils + UnitTestingUtils, + NoopAuthModule } from '@alfresco/adf-core'; import { NodesApiService } from '../../../common/services/nodes-api.service'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; @@ -35,7 +36,6 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { EMPTY, firstValueFrom, of, throwError } from 'rxjs'; import { CategoriesManagementComponent, CategoriesManagementMode } from '../../../category'; import { TagsCreatorComponent, TagsCreatorMode } from '../../../tag'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { PropertyGroup } from '../../interfaces/property-group.interface'; import { PropertyDescriptorsService } from '../../services/property-descriptors.service'; import { TagService } from '../../../tag/services/tag.service'; @@ -184,7 +184,7 @@ describe('ContentMetadataComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, MatDialogModule, MatSnackBarModule, ContentMetadataComponent], + imports: [NoopAuthModule, MatDialogModule, MatSnackBarModule, ContentMetadataComponent], providers: [ { provide: TagService, 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 e66d359d51..e1b2c47558 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,11 +15,10 @@ * limitations under the License. */ -import { AppConfigService } from '@alfresco/adf-core'; +import { AppConfigService, CardViewItem, NoopAuthModule } from '@alfresco/adf-core'; import { ClassesApi, Node } from '@alfresco/js-api'; import { TestBed } from '@angular/core/testing'; import { firstValueFrom, of } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { OrganisedPropertyGroup } from '../interfaces/content-metadata.interfaces'; import { PropertyGroup } from '../interfaces/property-group.interface'; import { ContentMetadataService } from './content-metadata.service'; @@ -197,7 +196,7 @@ describe('ContentMetaDataService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule] }); service = TestBed.inject(ContentMetadataService); contentPropertyService = TestBed.inject(ContentTypePropertiesService); @@ -216,12 +215,10 @@ describe('ContentMetaDataService', () => { }); it('should return the content type property', () => { - spyOn(contentPropertyService, 'getContentTypeCardItem').and.returnValue(of({ label: 'hello i am a weird content type' } as any)); + spyOn(contentPropertyService, 'getContentTypeCardItem').and.returnValue(of([{ label: 'hello i am a weird content type' } as CardViewItem])); - service.getContentTypeProperty(fakeNode).subscribe((res: any) => { - expect(res).toBeDefined(); - expect(res).not.toBeNull(); - expect(res.label).toBe('hello i am a weird content type'); + service.getContentTypeProperty(fakeNode).subscribe((res) => { + expect(res[0].label).toBe('hello i am a weird content type'); }); }); 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 226fa04342..a44d8aec52 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,8 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { ContentTypePropertiesService } from './content-type-property.service'; -import { CardViewItem, CardViewSelectItemModel, CardViewTextItemModel } from '@alfresco/adf-core'; -import { ContentTestingModule } from '../../testing/content.testing.module'; +import { CardViewItem, CardViewSelectItemModel, CardViewTextItemModel, NoopAuthModule } from '@alfresco/adf-core'; import { ContentTypeService } from '../../content-type'; import { of } from 'rxjs'; import { Node, TypeEntry } from '@alfresco/js-api'; @@ -126,7 +125,7 @@ describe('ContentTypePropertyService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule] }); service = TestBed.inject(ContentTypePropertiesService); versionCompatibilityService = TestBed.inject(VersionCompatibilityService); 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 cc3e30e252..05a8b0e6f5 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 @@ -19,18 +19,15 @@ import { TestBed } from '@angular/core/testing'; import { PropertyDescriptorsService } from './property-descriptors.service'; import { ClassesApi } from '@alfresco/js-api'; import { PropertyGroup } from '../interfaces/content-metadata.interfaces'; -import { ContentTestingModule } from '../../testing/content.testing.module'; describe('PropertyDescriptorLoaderService', () => { let service: PropertyDescriptorsService; let classesApi: ClassesApi; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ContentTestingModule] - }); + TestBed.configureTestingModule({}); service = TestBed.inject(PropertyDescriptorsService); - classesApi = service['classesApi']; + classesApi = service.classesApi; }); it('should load the groups passed by paramter', (done) => { 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 cdceaaf44c..0aab40007a 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 @@ -31,7 +31,6 @@ import { LogService, CardViewLongItemModel } from '@alfresco/adf-core'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { Constraint, Definition, Property as PropertyBase } from '@alfresco/js-api'; describe('PropertyGroupTranslatorService', () => { @@ -44,7 +43,7 @@ describe('PropertyGroupTranslatorService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [] }); 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 a999eca2a5..ddd8c13297 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 @@ -21,8 +21,8 @@ import { DocumentListService, NodeAction } from '../document-list'; import { ContentNodeDialogService } from './content-node-dialog.service'; import { MatDialog } from '@angular/material/dialog'; import { Subject, of } from 'rxjs'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { SitesService } from '../common'; +import { NoopAuthModule } from '@alfresco/adf-core'; const fakeNodeEntry = { entry: { @@ -67,7 +67,7 @@ describe('ContentNodeDialogService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule] }); service = TestBed.inject(ContentNodeDialogService); documentListService = TestBed.inject(DocumentListService); @@ -89,12 +89,12 @@ describe('ContentNodeDialogService', () => { isFile: false } as Node; - service.openLockNodeDialog(testNode).subscribe( - () => {}, - (error) => { + service.openLockNodeDialog(testNode).subscribe({ + next: () => {}, + error: (error) => { expect(error).toBe('OPERATION.FAIL.NODE.NO_PERMISSION'); } - ); + }); }); it('should be able to open the dialog when node has permission', () => { @@ -103,13 +103,13 @@ describe('ContentNodeDialogService', () => { }); it('should NOT be able to open the dialog when node has NOT permission', () => { - service.openCopyMoveDialog(NodeAction.CHOOSE, fakeNode, 'noperm').subscribe( - () => {}, - (error) => { + service.openCopyMoveDialog(NodeAction.CHOOSE, fakeNode, 'noperm').subscribe({ + next: () => {}, + error: (error) => { expect(spyOnDialogOpen).not.toHaveBeenCalled(); expect(JSON.parse(error.message).error.statusCode).toBe(403); } - ); + }); }); it('should be able to open the dialog using a folder id', fakeAsync(() => { diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component-search.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component-search.spec.ts index f069941ab9..c2ea758720 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component-search.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component-search.spec.ts @@ -15,13 +15,12 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core'; +import { DebugElement } from '@angular/core'; import { ComponentFixture, fakeAsync, flush, TestBed, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Node, NodeEntry, NodePaging, RequestScope, ResultSetPaging, SiteEntry, SitePaging, SitePagingList } from '@alfresco/js-api'; import { of } from 'rxjs'; import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { DocumentListService } from '../../document-list/services/document-list.service'; import { DocumentListComponent } from '../../document-list/components/document-list.component'; import { CustomResourcesService } from '../../document-list/services/custom-resources.service'; @@ -31,6 +30,8 @@ import { mockSearchRequest } from '../../mock/search-query.mock'; import { SitesService } from '../../common/services/sites.service'; import { NodesApiService } from '../../common/services/nodes-api.service'; import { UnitTestingUtils } from '../../../../../core/src/lib/testing/unit-testing-utils'; +import { provideRouter } from '@angular/router'; +import { NoopAuthModule } from '@alfresco/adf-core'; const fakeResultSetPaging: ResultSetPaging = { list: { @@ -77,15 +78,12 @@ describe('ContentNodeSelectorPanelComponent', () => { service.executed.next(searchResults); }; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ContentTestingModule], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - }); - describe('General component features', () => { beforeEach(async () => { + TestBed.configureTestingModule({ + imports: [NoopAuthModule], + providers: [provideRouter([])] + }); fixture = TestBed.createComponent(ContentNodeSelectorPanelComponent); component = fixture.componentInstance; component.debounceSearch = 0; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.spec.ts index e1cb4eb2b6..e43ceb0da0 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel/content-node-selector-panel.component.spec.ts @@ -15,22 +15,22 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Node, NodeEntry, NodePaging, ResultSetPaging, Site, SiteEntry, SitePaging, SitePagingList, UserInfo } from '@alfresco/js-api'; -import { DataRow, ThumbnailService, DataColumn } from '@alfresco/adf-core'; +import { DataRow, ThumbnailService, DataColumn, NoopAuthModule } from '@alfresco/adf-core'; import { ContentService, UploadService, NodesApiService, SitesService, FileModel, FileUploadStatus, FileUploadCompleteEvent } from '../../common'; import { of, throwError } from 'rxjs'; import { DropdownBreadcrumbComponent } from '../../breadcrumb'; import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { DocumentListService } from '../../document-list/services/document-list.service'; import { DropdownSitesComponent } from '../site-dropdown/sites-dropdown.component'; import { NodeEntryEvent, ShareDataRow, ShareDataTableAdapter } from '../../document-list'; import { SearchQueryBuilderService } from '../../search'; import { ContentNodeSelectorPanelService } from './content-node-selector-panel.service'; import { mockContentModelTextProperty } from '../../mock/content-model.mock'; +import { provideRouter } from '@angular/router'; +import { provideApiTesting } from '../../testing/providers'; const fakeResultSetPaging: ResultSetPaging = { list: { @@ -69,15 +69,12 @@ describe('ContentNodeSelectorPanelComponent', () => { service.executed.next(searchResults); }; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ContentTestingModule], - schemas: [CUSTOM_ELEMENTS_SCHEMA] - }); - }); - describe('General component features', () => { beforeEach(() => { + TestBed.configureTestingModule({ + imports: [NoopAuthModule, ContentNodeSelectorPanelComponent], + providers: [provideRouter([]), provideApiTesting()] + }); fixture = TestBed.createComponent(ContentNodeSelectorPanelComponent); component = fixture.componentInstance; component.debounceSearch = 0; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts index 6d4c59dfdd..e751a52e4e 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts @@ -16,7 +16,7 @@ */ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; +import { EventEmitter } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ContentNodeSelectorComponent } from './content-node-selector.component'; import { Node, NodeEntry, SitePaging, SitePagingList } from '@alfresco/js-api'; @@ -25,7 +25,6 @@ import { FileModel } from '../common/models/file.model'; import { FileUploadEvent } from '../common/events/file.event'; import { UploadService } from '../common/services/upload.service'; import { of } from 'rxjs'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { DocumentListService } from '../document-list/services/document-list.service'; import { DocumentListComponent } from '../document-list/components/document-list.component'; import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel/content-node-selector-panel.component'; @@ -36,6 +35,7 @@ import { ContentService } from '../common/services/content.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatTabGroupHarness } from '@angular/material/tabs/testing'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('ContentNodeSelectorComponent', () => { let component: ContentNodeSelectorComponent; @@ -59,7 +59,7 @@ describe('ContentNodeSelectorComponent', () => { }; TestBed.configureTestingModule({ - imports: [ContentTestingModule, ContentNodeSelectorComponent], + imports: [NoopAuthModule, ContentNodeSelectorComponent], providers: [ { provide: MAT_DIALOG_DATA, useValue: data }, { @@ -72,8 +72,7 @@ describe('ContentNodeSelectorComponent', () => { afterOpened: () => of(null) } } - ], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + ] }); const documentListService = TestBed.inject(DocumentListService); diff --git a/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.spec.ts b/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.spec.ts index d488e1c4fd..8151e8e720 100644 --- a/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/site-dropdown/sites-dropdown.component.spec.ts @@ -17,7 +17,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DropdownSitesComponent, Relations } from './sites-dropdown.component'; -import { AuthenticationService } from '@alfresco/adf-core'; +import { AuthenticationService, NoopAuthModule } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { getFakeSitePaging, @@ -26,7 +26,6 @@ import { getFakeSitePagingLastPage, getFakeSitePagingWithMembers } from '../../mock'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { SitesService } from '../../common/services/sites.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; @@ -62,7 +61,7 @@ describe('DropdownSitesComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule] }); }); 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 bbe0be371c..76c47bc1f5 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,17 +18,18 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA, MatDialog, MatDialogModule } from '@angular/material/dialog'; import { of } from 'rxjs'; -import { NotificationService } from '@alfresco/adf-core'; +import { NoopAuthModule, NotificationService } from '@alfresco/adf-core'; import { NodesApiService, RenditionService } from '../common'; import { SharedLinksApiService } from './services/shared-links-api.service'; import { ShareDialogComponent } from './content-node-share.dialog'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { format, endOfDay } from 'date-fns'; import { By } from '@angular/platform-browser'; import { NodeEntry } from '@alfresco/js-api'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatSlideToggleHarness } from '@angular/material/slide-toggle/testing'; +import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core'; +import { provideApiTesting } from '../testing/providers'; describe('ShareDialogComponent', () => { let loader: HarnessLoader; @@ -55,8 +56,9 @@ describe('ShareDialogComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, MatDialogModule, ShareDialogComponent], + imports: [NoopAuthModule, MatDatetimepickerModule, MatNativeDatetimeModule, MatDialogModule, ShareDialogComponent], providers: [ + provideApiTesting(), { provide: NotificationService, useValue: notificationServiceMock }, { provide: MatDialogRef, 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 ee1ddc536e..368cfd4385 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 @@ -19,9 +19,9 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Component } from '@angular/core'; import { DOCUMENT } from '@angular/common'; -import { ContentTestingModule } from '../testing/content.testing.module'; -import { CoreModule } from '@alfresco/adf-core'; -import { NodeSharedDirective } from '@alfresco/adf-content-services'; +import { NodeSharedDirective } from './content-node-share.directive'; +import { NoopAuthModule } from '@alfresco/adf-core'; +import { MatNativeDatetimeModule } from '@mat-datetimepicker/core'; @Component({ selector: 'adf-node-share-test-component', @@ -46,13 +46,13 @@ class NodeShareTestComponent { describe('NodeSharedDirective', () => { let fixture: ComponentFixture; let component: NodeShareTestComponent; - let document: any; + let document: Document; let shareButtonElement; let selection; beforeEach(() => { TestBed.configureTestingModule({ - imports: [CoreModule.forRoot(), ContentTestingModule, NodeShareTestComponent] + imports: [NoopAuthModule, NodeShareTestComponent, MatNativeDatetimeModule] }); fixture = TestBed.createComponent(NodeShareTestComponent); document = TestBed.inject(DOCUMENT); diff --git a/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts b/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts index 64fa32e858..e2021bf3b3 100644 --- a/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts +++ b/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts @@ -18,7 +18,6 @@ import { TypeEntry } from '@alfresco/js-api'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of, Subject } from 'rxjs'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { ContentTypeDialogComponent } from './content-type-dialog.component'; import { ContentTypeDialogComponentData } from './content-type-metadata.interface'; import { HarnessLoader } from '@angular/cdk/testing'; @@ -87,7 +86,7 @@ describe('Content Type Dialog Component', () => { let data: ContentTypeDialogComponentData; let loader: HarnessLoader; - beforeEach(async () => { + beforeEach(() => { data = { title: 'Title', description: 'Description that can be longer or shorter', @@ -97,7 +96,7 @@ describe('Content Type Dialog Component', () => { }; TestBed.configureTestingModule({ - imports: [ContentTestingModule, MatDialogModule], + imports: [MatDialogModule], providers: [ { provide: MAT_DIALOG_DATA, useValue: data }, { @@ -109,7 +108,7 @@ describe('Content Type Dialog Component', () => { } } ] - }).compileComponents(); + }); }); beforeEach(() => { diff --git a/lib/content-services/src/lib/dialogs/folder/folder.dialog.spec.ts b/lib/content-services/src/lib/dialogs/folder/folder.dialog.spec.ts index a1ed1e9971..5a4ae1dc43 100644 --- a/lib/content-services/src/lib/dialogs/folder/folder.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/folder/folder.dialog.spec.ts @@ -18,10 +18,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material/dialog'; import { NodesApiService } from '../../common/services/nodes-api.service'; - import { FolderDialogComponent } from './folder.dialog'; import { BehaviorSubject, throwError } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { By } from '@angular/platform-browser'; describe('FolderDialogComponent', () => { @@ -41,7 +39,7 @@ describe('FolderDialogComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], + imports: [], providers: [{ provide: MatDialogRef, useValue: dialogRef }] }); dialogRef.close.calls.reset(); 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 fa9a477d31..b311f0eba1 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 @@ -17,9 +17,7 @@ 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 { ContentTestingModule } from '../../testing/content.testing.module'; import { of, throwError } from 'rxjs'; import { delay } from 'rxjs/operators'; import { FindQuery, SiteEntry, SitePaging } from '@alfresco/js-api'; @@ -28,6 +26,7 @@ import { NotificationService, UnitTestingUtils } from '@alfresco/adf-core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatRadioGroupHarness } from '@angular/material/radio/testing'; +import { provideApiTesting } from '../../testing/providers'; describe('LibraryDialogComponent', () => { let fixture: ComponentFixture; @@ -58,14 +57,13 @@ describe('LibraryDialogComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, LibraryDialogComponent], - providers: [{ provide: MatDialogRef, useValue: dialogRef }], - schemas: [NO_ERRORS_SCHEMA] + imports: [LibraryDialogComponent], + providers: [provideApiTesting(), { provide: MatDialogRef, useValue: dialogRef }] }); fixture = TestBed.createComponent(LibraryDialogComponent); component = fixture.componentInstance; sitesService = TestBed.inject(SitesService); - findSitesSpy = spyOn(component['queriesApi'], 'findSites'); + findSitesSpy = spyOn(component.queriesApi, 'findSites'); notificationService = TestBed.inject(NotificationService); loader = TestbedHarnessEnvironment.loader(fixture); unitTestingUtils = new UnitTestingUtils(fixture.debugElement, loader); diff --git a/lib/content-services/src/lib/dialogs/node-lock/node-lock.dialog.spec.ts b/lib/content-services/src/lib/dialogs/node-lock/node-lock.dialog.spec.ts index adbb9e3d5f..47e8d9895a 100644 --- a/lib/content-services/src/lib/dialogs/node-lock/node-lock.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/node-lock/node-lock.dialog.spec.ts @@ -18,9 +18,9 @@ import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material/dialog'; import { NodeLockDialogComponent } from './node-lock.dialog'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { addMinutes } from 'date-fns'; import { Node, NodeEntry } from '@alfresco/js-api'; +import { MatNativeDatetimeModule } from '@mat-datetimepicker/core'; describe('NodeLockDialogComponent', () => { let fixture: ComponentFixture; @@ -67,7 +67,7 @@ describe('NodeLockDialogComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, NodeLockDialogComponent], + imports: [NodeLockDialogComponent, MatNativeDatetimeModule], providers: [{ provide: MatDialogRef, useValue: dialogRef }] }); fixture = TestBed.createComponent(NodeLockDialogComponent); diff --git a/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts b/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts index f27503bff9..5837073c43 100644 --- a/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts +++ b/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts @@ -19,9 +19,7 @@ import { Component, ViewChild } from '@angular/core'; import { LibraryFavoriteDirective } from './library-favorite.directive'; import { TestBed, ComponentFixture } from '@angular/core/testing'; import { LibraryEntity } from '../interfaces/library-entity.interface'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; import { NotificationService } from '@alfresco/adf-core'; -import { ContentTestingModule } from '../testing/content.testing.module'; @Component({ imports: [LibraryFavoriteDirective], @@ -43,7 +41,7 @@ describe('LibraryFavoriteDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, TestComponent, LibraryFavoriteDirective, ContentTestingModule] + imports: [TestComponent, LibraryFavoriteDirective] }); notificationService = TestBed.inject(NotificationService); fixture = TestBed.createComponent(TestComponent); 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 7a014ad95a..cc661c2877 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,10 +19,8 @@ import { SimpleChange } from '@angular/core'; import { fakeAsync, TestBed, tick } from '@angular/core/testing'; import { NodeFavoriteDirective } from './node-favorite.directive'; import { AppConfigService, AppConfigServiceMock, NotificationService } from '@alfresco/adf-core'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; import { AlfrescoApiService } from '../services'; -import { AlfrescoApiServiceMock } from '../mock'; -import { ContentTestingModule } from '../testing/content.testing.module'; +import { provideApiTesting } from '../testing/providers'; describe('NodeFavoriteDirective', () => { let directive: NodeFavoriteDirective; @@ -31,11 +29,8 @@ describe('NodeFavoriteDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, ContentTestingModule], - providers: [ - { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, - { provide: AppConfigService, useClass: AppConfigServiceMock } - ] + imports: [], + providers: [provideApiTesting(), { provide: AppConfigService, useClass: AppConfigServiceMock }] }); alfrescoApiService = TestBed.inject(AlfrescoApiService); notificationService = TestBed.inject(NotificationService); 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 d667d25b89..381486bf7f 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 @@ -21,7 +21,8 @@ import { Component, DebugElement } from '@angular/core'; import { NodeLockDirective } from './node-lock.directive'; import type { Node } from '@alfresco/js-api'; import { ContentNodeDialogService } from '../content-node-selector/content-node-dialog.service'; -import { ContentTestingModule } from '../testing/content.testing.module'; +import { provideRouter } from '@angular/router'; +import { NoopAuthModule } from '@alfresco/adf-core'; @Component({ template: '
', @@ -40,7 +41,8 @@ describe('NodeLock Directive', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, TestComponent] + imports: [NoopAuthModule, TestComponent], + providers: [provideRouter([])] }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; 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 fb1610ec53..f066af5b5c 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 @@ -15,12 +15,11 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TestBed } from '@angular/core/testing'; import { ContentActionModel } from './../../models/content-action.model'; import { DocumentListComponent } from './../document-list.component'; import { ContentActionListComponent } from './content-action-list.component'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('ContentColumnList', () => { let documentList: DocumentListComponent; @@ -28,8 +27,7 @@ describe('ContentColumnList', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + imports: [NoopAuthModule] }); 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 b22dc2b6db..c64efa80d6 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 @@ -15,7 +15,7 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, EventEmitter } from '@angular/core'; +import { SimpleChange, EventEmitter } from '@angular/core'; import { TestBed } from '@angular/core/testing'; import { FileNode } from '../../../mock'; import { ContentActionModel } from './../../models/content-action.model'; @@ -25,8 +25,8 @@ import { NodeActionsService } from './../../services/node-actions.service'; import { DocumentListComponent } from './../document-list.component'; import { ContentActionListComponent } from './content-action-list.component'; import { ContentActionComponent } from './content-action.component'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { ContentService } from '../../../common/services/content.service'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('ContentAction', () => { let documentList: DocumentListComponent; @@ -39,8 +39,7 @@ describe('ContentAction', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + imports: [NoopAuthModule] }); contentService = TestBed.inject(ContentService); nodeActionsService = new 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 220d6c3564..471f17b178 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 @@ -23,6 +23,7 @@ import { DataColumnComponent, DataColumnListComponent, DataTableComponent, + NoopAuthModule, ObjectDataTableAdapter, ShowHeaderMode, ThumbnailService, @@ -31,7 +32,7 @@ import { import { FavoritePaging, FavoritePagingList, Node, NodeEntry, NodePaging } from '@alfresco/js-api'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { Component, CUSTOM_ELEMENTS_SCHEMA, Injector, QueryList, runInInjectionContext, SimpleChange, SimpleChanges, ViewChild } from '@angular/core'; +import { Component, Injector, QueryList, runInInjectionContext, SimpleChange, SimpleChanges, ViewChild } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; import { By } from '@angular/platform-browser'; @@ -50,7 +51,6 @@ import { mockNodePagingWithPreselectedNodes, mockPreselectedNodes } from '../../mock'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { domSanitizerMock } from '../../testing/dom-sanitizer-mock'; import { ImageResolver } from '../data/image-resolver.model'; import { RowFilter } from '../data/row-filter.model'; @@ -62,7 +62,6 @@ import { MatDialog } from '@angular/material/dialog'; import { FileAutoDownloadComponent } from './file-auto-download/file-auto-download.component'; import { DocumentListComponent } from './document-list.component'; import { CustomResourcesService, DocumentListService } from '../public-api'; -import { CommonModule } from '@angular/common'; import { MatIconRegistry } from '@angular/material/icon'; const mockDialog = { @@ -99,8 +98,7 @@ describe('DocumentList', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, DocumentListComponent], - schemas: [CUSTOM_ELEMENTS_SCHEMA], + imports: [NoopAuthModule, DocumentListComponent], providers: [{ provide: MatDialog, useValue: mockDialog }] }); eventMock = { @@ -2002,7 +2000,7 @@ describe('DocumentList', () => { }); @Component({ - imports: [CommonModule, DocumentListComponent, CustomLoadingContentTemplateDirective], + imports: [DocumentListComponent, CustomLoadingContentTemplateDirective], template: ` @@ -2029,7 +2027,7 @@ describe('DocumentListComponent rendering', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, CustomTemplateComponent] + imports: [NoopAuthModule, CustomTemplateComponent] }); fixture = TestBed.createComponent(CustomTemplateComponent); component = fixture.componentInstance; 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 3510fc24cb..60d9816a13 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 @@ -19,10 +19,10 @@ import { Subject } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { DataTableComponent, DataSorting, PaginationModel } from '@alfresco/adf-core'; import { SearchService } from '../../../search/services/search.service'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { SimpleChange } from '@angular/core'; import { SearchHeaderQueryBuilderService } from './../../../search/services/search-header-query-builder.service'; import { FilterHeaderComponent } from './filter-header.component'; +import { provideRouter } from '@angular/router'; describe('FilterHeaderComponent', () => { let fixture: ComponentFixture; @@ -37,8 +37,8 @@ describe('FilterHeaderComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, FilterHeaderComponent], - providers: [{ provide: SearchService, useValue: searchMock }, DataTableComponent] + imports: [FilterHeaderComponent], + providers: [provideRouter([]), { provide: SearchService, useValue: searchMock }, DataTableComponent] }); fixture = TestBed.createComponent(FilterHeaderComponent); component = fixture.componentInstance; 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 aefeb5b5ae..d415bc749e 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 @@ -16,9 +16,7 @@ */ import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { LibraryNameColumnComponent } from './library-name-column.component'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; describe('LibraryNameColumnComponent', () => { let fixture: ComponentFixture; @@ -27,8 +25,7 @@ describe('LibraryNameColumnComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, LibraryNameColumnComponent], - schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA] + imports: [LibraryNameColumnComponent] }); node = { id: 'nodeId', 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 4fab1b8229..11fb4fdb4f 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 @@ -17,8 +17,6 @@ import { LibraryRoleColumnComponent } from './library-role-column.component'; import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; describe('LibraryRoleColumnComponent', () => { let fixture: ComponentFixture; @@ -26,8 +24,7 @@ describe('LibraryRoleColumnComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, LibraryRoleColumnComponent], - schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA] + imports: [LibraryRoleColumnComponent] }); fixture = TestBed.createComponent(LibraryRoleColumnComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/document-list/components/library-status-column/library-status-column.component.spec.ts b/lib/content-services/src/lib/document-list/components/library-status-column/library-status-column.component.spec.ts index 2fa1d58717..5ca07746a7 100644 --- a/lib/content-services/src/lib/document-list/components/library-status-column/library-status-column.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/library-status-column/library-status-column.component.spec.ts @@ -17,8 +17,6 @@ import { LibraryStatusColumnComponent } from './library-status-column.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { Site } from '@alfresco/js-api'; describe('LibraryStatusColumnComponent', () => { @@ -27,8 +25,7 @@ describe('LibraryStatusColumnComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, LibraryStatusColumnComponent], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + imports: [LibraryStatusColumnComponent] }); fixture = TestBed.createComponent(LibraryStatusColumnComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/document-list/components/name-column/name-column.component.spec.ts b/lib/content-services/src/lib/document-list/components/name-column/name-column.component.spec.ts index 0236d15fed..9177295d51 100644 --- a/lib/content-services/src/lib/document-list/components/name-column/name-column.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/name-column/name-column.component.spec.ts @@ -17,7 +17,6 @@ import { NameColumnComponent } from './name-column.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { skip } from 'rxjs/operators'; describe('NameColumnComponent', () => { @@ -27,7 +26,7 @@ describe('NameColumnComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, NameColumnComponent] + imports: [NameColumnComponent] }); fixture = TestBed.createComponent(NameColumnComponent); 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 8eea208ac2..86919182a7 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,11 +15,10 @@ * limitations under the License. */ -import { DataColumn, DataRow, DataSorting, ThumbnailService } from '@alfresco/adf-core'; +import { DataColumn, DataRow, DataSorting, NoopAuthModule, 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'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { TestBed } from '@angular/core/testing'; import { ContentService } from '../../common/services/content.service'; @@ -29,7 +28,7 @@ describe('ShareDataTableAdapter', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule] }); const imageUrl: string = 'http://'; diff --git a/lib/content-services/src/lib/document-list/services/custom-resources.service.spec.ts b/lib/content-services/src/lib/document-list/services/custom-resources.service.spec.ts index f4e75311f9..bc943e4e23 100644 --- a/lib/content-services/src/lib/document-list/services/custom-resources.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/custom-resources.service.spec.ts @@ -18,7 +18,6 @@ import { CustomResourcesService } from './custom-resources.service'; import { PaginationModel } from '@alfresco/adf-core'; import { TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { Favorite, FavoritePaging, @@ -40,10 +39,6 @@ describe('CustomResourcesService', () => { let customResourcesService: CustomResourcesService; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ContentTestingModule] - }); - customResourcesService = TestBed.inject(CustomResourcesService); }); 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 0a3ff408be..cd51d69e26 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 @@ -21,8 +21,8 @@ import { DocumentActionsService } from './document-actions.service'; import { DocumentListService } from './document-list.service'; import { of } from 'rxjs'; import { TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { PermissionModel } from '../models/permissions.model'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('DocumentActionsService', () => { let service: DocumentActionsService; @@ -30,7 +30,7 @@ describe('DocumentActionsService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule] }); 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 da0b41644a..f089abaa86 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 @@ -17,11 +17,11 @@ import { DocumentListService } from './document-list.service'; import { fakeAsync, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { of } from 'rxjs'; import { NodeEntry, NodePaging } from '@alfresco/js-api'; import { CustomResourcesService } from './custom-resources.service'; import { NodesApiService } from '../../common'; +import { provideApiTesting } from '../../testing/providers'; declare let jasmine: any; @@ -74,7 +74,7 @@ describe('DocumentListService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + providers: [provideApiTesting()] }); service = TestBed.inject(DocumentListService); customResourcesService = TestBed.inject(CustomResourcesService); 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 e53bc0b514..b7246efae3 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 @@ -21,8 +21,8 @@ import { FileNode, FolderNode } from '../../mock'; import { ContentActionHandler } from '../models/content-action.model'; import { DocumentListService } from './document-list.service'; import { FolderActionsService } from './folder-actions.service'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { PermissionModel } from '../models/permissions.model'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('FolderActionsService', () => { let service: FolderActionsService; @@ -30,7 +30,7 @@ describe('FolderActionsService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule] }); documentListService = TestBed.inject(DocumentListService); service = TestBed.inject(FolderActionsService); 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 f2f6383e13..31518eba1a 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 @@ -22,8 +22,8 @@ import { NodeActionsService } from './node-actions.service'; import { ContentNodeDialogService } from '../../content-node-selector/content-node-dialog.service'; import { of, throwError } from 'rxjs'; import { MatDialogRef } from '@angular/material/dialog'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { delay } from 'rxjs/operators'; +import { NoopAuthModule } from '@alfresco/adf-core'; const fakeNode: Node = { id: 'fake' @@ -39,7 +39,7 @@ describe('NodeActionsService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], + imports: [NoopAuthModule], providers: [{ provide: MatDialogRef, useValue: dialogRef }] }); service = TestBed.inject(NodeActionsService); 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 bd5110910d..95883b3cdd 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 @@ -22,8 +22,8 @@ import { By } from '@angular/platform-browser'; import { Subject, of } from 'rxjs'; import { FolderEditDirective } from './folder-edit.directive'; import type { Node } from '@alfresco/js-api'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { ContentService } from '../common/services/content.service'; +import { NoopAuthModule } from '@alfresco/adf-core'; @Component({ template: '
', @@ -31,7 +31,7 @@ import { ContentService } from '../common/services/content.service'; imports: [FolderEditDirective] }) class TestComponent { - folder = {}; + folder: any = {}; public successParameter: Node = null; success(node: Node) { @@ -53,7 +53,7 @@ describe('FolderEditDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, TestComponent] + imports: [NoopAuthModule, TestComponent] }); fixture = TestBed.createComponent(TestComponent); element = fixture.debugElement.query(By.directive(FolderEditDirective)); diff --git a/lib/content-services/src/lib/group/services/group.service.spec.ts b/lib/content-services/src/lib/group/services/group.service.spec.ts index 42185afda0..31ac53c753 100644 --- a/lib/content-services/src/lib/group/services/group.service.spec.ts +++ b/lib/content-services/src/lib/group/services/group.service.spec.ts @@ -16,7 +16,6 @@ */ import { TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { ContentIncludeQuery, GroupEntry } from '@alfresco/js-api'; import { GroupService } from './group.service'; @@ -27,9 +26,6 @@ describe('GroupService', () => { let opts: ContentIncludeQuery; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ContentTestingModule] - }); service = TestBed.inject(GroupService); group = { entry: { diff --git a/lib/content-services/src/lib/infinite-scroll-datasource/infinite-scroll-datasource.spec.ts b/lib/content-services/src/lib/infinite-scroll-datasource/infinite-scroll-datasource.spec.ts index 3b91161a54..84288a3750 100644 --- a/lib/content-services/src/lib/infinite-scroll-datasource/infinite-scroll-datasource.spec.ts +++ b/lib/content-services/src/lib/infinite-scroll-datasource/infinite-scroll-datasource.spec.ts @@ -21,7 +21,6 @@ import { Component, OnInit } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { from, Observable } from 'rxjs'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { InfiniteScrollDatasource } from './infinite-scroll-datasource'; class TestData { @@ -101,7 +100,7 @@ describe('InfiniteScrollDatasource', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, ScrollingModule, TestComponent] + imports: [ScrollingModule, TestComponent] }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/legal-hold/services/legal-hold.service.spec.ts b/lib/content-services/src/lib/legal-hold/services/legal-hold.service.spec.ts index 495c8f40ca..562f8efdbd 100644 --- a/lib/content-services/src/lib/legal-hold/services/legal-hold.service.spec.ts +++ b/lib/content-services/src/lib/legal-hold/services/legal-hold.service.spec.ts @@ -17,7 +17,6 @@ import { TestBed } from '@angular/core/testing'; import { LegalHoldService } from './legal-hold.service'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { BulkAssignHoldResponseEntry, Hold, HoldBulkStatusEntry, HoldEntry, HoldPaging, RequestQuery, SEARCH_LANGUAGE } from '@alfresco/js-api'; describe('LegalHoldsService', () => { @@ -53,9 +52,6 @@ describe('LegalHoldsService', () => { }; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ContentTestingModule] - }); service = TestBed.inject(LegalHoldService); legalHolds = { 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 0fb5a7a00e..aca7128b2c 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,11 +18,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { mockFile, mockNode } from '../mock'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { NewVersionUploaderDataAction } from './models'; import { NewVersionUploaderDialogComponent } from './new-version-uploader.dialog'; import { By } from '@angular/platform-browser'; import { VersionListComponent } from '../version-manager/version-list.component'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('NewVersionUploaderDialog', () => { let component: NewVersionUploaderDialogComponent; @@ -44,7 +44,7 @@ describe('NewVersionUploaderDialog', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, NewVersionUploaderDialogComponent], + imports: [NoopAuthModule, NewVersionUploaderDialogComponent], providers: [ { provide: MAT_DIALOG_DATA, useValue: { node: mockNode, showVersionsOnly, file: mockFile } }, { diff --git a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.spec.ts b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.spec.ts index d98c33b483..b8429c03d8 100644 --- a/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.spec.ts +++ b/lib/content-services/src/lib/new-version-uploader/new-version-uploader.service.spec.ts @@ -20,7 +20,6 @@ import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testin import { MatDialog, MatDialogConfig } from '@angular/material/dialog'; import { BehaviorSubject, firstValueFrom, of, Subject } from 'rxjs'; import { mockFile, mockNewVersionUploaderData, mockNode } from '../mock'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { NewVersionUploaderData, NewVersionUploaderDataAction, @@ -56,7 +55,7 @@ describe('NewVersionUploaderService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, TestDialogComponent], + imports: [TestDialogComponent], teardown: { destroyAfterEach: false } }); diff --git a/lib/content-services/src/lib/node-comments/node-comments.component.spec.ts b/lib/content-services/src/lib/node-comments/node-comments.component.spec.ts index df75805951..1ddb8c1f7d 100644 --- a/lib/content-services/src/lib/node-comments/node-comments.component.spec.ts +++ b/lib/content-services/src/lib/node-comments/node-comments.component.spec.ts @@ -20,17 +20,18 @@ import { NodeCommentsComponent } from './node-comments.component'; import { CommentsComponent } from '../../../../core/src/lib/comments/comments.component'; import { CommentModel } from '../../../../core/src/lib/models'; import { UnitTestingUtils } from '../../../../core/src/lib/testing/unit-testing-utils'; -import { ContentTestingModule } from '../testing/content.testing.module'; +import { provideApiTesting } from '../testing/providers'; describe('NodeCommentsComponent', () => { let fixture: ComponentFixture; let component: NodeCommentsComponent; let testingUtils: UnitTestingUtils; - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [NodeCommentsComponent, ContentTestingModule] - }).compileComponents(); + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [NodeCommentsComponent], + providers: [provideApiTesting()] + }); fixture = TestBed.createComponent(NodeCommentsComponent); component = fixture.componentInstance; 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 54e1a63e32..47a8127141 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 @@ -21,7 +21,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Subject } from 'rxjs'; import { AddPermissionPanelComponent } from './add-permission-panel.component'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { AddPermissionDialogComponent } from './add-permission-dialog.component'; import { AddPermissionDialogData } from './add-permission-dialog-data.interface'; import { fakeAuthorityResults } from '../../../mock/add-permission.component.mock'; @@ -63,7 +62,7 @@ describe('AddPermissionDialog', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, AddPermissionDialogComponent], + imports: [AddPermissionDialogComponent], providers: [ { provide: MatDialogRef, useValue: dialogRef }, { provide: MAT_DIALOG_DATA, useValue: data } 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 15cd78815e..6eae571ab5 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 @@ -20,13 +20,13 @@ import { AddPermissionPanelComponent } from './add-permission-panel.component'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; import { fakeAuthorityListResult, fakeNameListResult } from '../../../mock/add-permission.component.mock'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { SearchService } from '../../../search/services/search.service'; import { DebugElement } from '@angular/core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatSelectionListHarness } from '@angular/material/list/testing'; import { MatInputHarness } from '@angular/material/input/testing'; +import { MatIconTestingModule } from '@angular/material/icon/testing'; describe('AddPermissionPanelComponent', () => { let fixture: ComponentFixture; @@ -37,7 +37,7 @@ describe('AddPermissionPanelComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, AddPermissionPanelComponent] + imports: [MatIconTestingModule, AddPermissionPanelComponent] }); fixture = TestBed.createComponent(AddPermissionPanelComponent); loader = TestbedHarnessEnvironment.loader(fixture); 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 9443638790..38e5006721 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 @@ -23,7 +23,7 @@ import { By } from '@angular/platform-browser'; import { of, throwError } from 'rxjs'; import { fakeAuthorityResults } from '../../../mock/add-permission.component.mock'; import { NodePermissionService } from '../../services/node-permission.service'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('AddPermissionComponent', () => { let fixture: ComponentFixture; @@ -32,7 +32,7 @@ describe('AddPermissionComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, AddPermissionComponent] + imports: [NoopAuthModule, AddPermissionComponent] }); nodePermissionService = TestBed.inject(NodePermissionService); const response: any = { node: { id: 'fake-node', allowableOperations: ['updatePermissions'] }, roles: [{ label: 'Test', role: 'test' }] }; 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 7d112d83a6..07ea55ddcc 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,11 +17,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { NodesApiService } from '../../common/services/nodes-api.service'; import { Component } from '@angular/core'; import { InheritPermissionDirective } from './inherited-button.directive'; import { NgIf } from '@angular/common'; +import { NoopAuthModule } from '@alfresco/adf-core'; const fakeNodeWithInherit: any = { id: 'fake-id', permissions: { isInheritanceEnabled: true }, allowableOperations: ['updatePermissions'] }; const fakeNodeNoInherit: any = { id: 'fake-id', permissions: { isInheritanceEnabled: false }, allowableOperations: ['updatePermissions'] }; @@ -55,7 +55,7 @@ describe('InheritPermissionDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SimpleInheritedPermissionTestComponent] + imports: [NoopAuthModule, SimpleInheritedPermissionTestComponent] }); fixture = TestBed.createComponent(SimpleInheritedPermissionTestComponent); component = fixture.componentInstance; 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 e8937bd6e3..14eba69bf2 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 @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { PermissionContainerComponent } from './permission-container.component'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatSelectHarness } from '@angular/material/select/testing'; @@ -30,9 +29,6 @@ describe('PermissionContainerComponent', () => { let element: HTMLElement; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [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 1e064b45b5..1a1682b440 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 @@ -31,7 +31,6 @@ import { fakeSiteNodeResponse, fakeSiteRoles } from '../../../mock/permission-list.component.mock'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { Node } from '@alfresco/js-api'; import { NodesApiService } from '../../../common/services/nodes-api.service'; import { HarnessLoader } from '@angular/cdk/testing'; @@ -41,8 +40,11 @@ import { MatSelectHarness } from '@angular/material/select/testing'; import { By } from '@angular/platform-browser'; import { MatSlideToggle } from '@angular/material/slide-toggle'; import { ContentService } from '../../../common/services/content.service'; -import { AllowableOperationsEnum, NodePermissionsModel, PermissionContainerComponent } from '@alfresco/adf-content-services'; import { DebugElement } from '@angular/core'; +import { AllowableOperationsEnum } from '../../../common'; +import { NodePermissionsModel } from '../../models/member.model'; +import { PermissionContainerComponent } from '../permission-container/permission-container.component'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('PermissionListComponent', () => { let loader: HarnessLoader; @@ -60,7 +62,7 @@ describe('PermissionListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule] }); fixture = TestBed.createComponent(PermissionListComponent); component = fixture.componentInstance; 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 170ac1c9b1..029ecac825 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,12 +15,11 @@ * limitations under the License. */ -import { NotificationService } from '@alfresco/adf-core'; +import { NoopAuthModule, NotificationService } from '@alfresco/adf-core'; import { NodesApiService } from '../../../common/services/nodes-api.service'; import { TestBed } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; import { PermissionListService } from './permission-list.service'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { NodePermissionService } from '../../services/node-permission.service'; import { fakeNodeInheritedOnly, fakeNodeLocalSiteManager, fakeNodeWithOnlyLocally } from '../../../mock/permission-list.component.mock'; import { PermissionDisplayModel } from '../../models/permission.model'; @@ -40,7 +39,7 @@ describe('PermissionListService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule] }); service = TestBed.inject(PermissionListService); nodePermissionService = TestBed.inject(NodePermissionService); 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 193716f032..369e83325b 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 @@ -16,11 +16,11 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { UserIconColumnComponent } from './user-icon-column.component'; import { NodeEntry } from '@alfresco/js-api'; import { UnitTestingUtils } from '@alfresco/adf-core'; import { DebugElement } from '@angular/core'; +import { MatIconTestingModule } from '@angular/material/icon/testing'; describe('UserIconColumnComponent', () => { let fixture: ComponentFixture; @@ -41,7 +41,7 @@ describe('UserIconColumnComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [MatIconTestingModule, UserIconColumnComponent] }); fixture = TestBed.createComponent(UserIconColumnComponent); component = fixture.componentInstance; 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 6b59b42186..c35ad61215 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 @@ -16,7 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { UserNameColumnComponent } from './user-name-column.component'; import { NodeEntry } from '@alfresco/js-api'; @@ -37,7 +36,7 @@ describe('UserNameColumnComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [UserNameColumnComponent] }); fixture = TestBed.createComponent(UserNameColumnComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.spec.ts b/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.spec.ts index dff64163e7..2c57b3e195 100644 --- a/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.spec.ts +++ b/lib/content-services/src/lib/permission-manager/components/user-role-column/user-role-column.component.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserRoleColumnComponent } from './user-role-column.component'; import { RoleModel } from '../../models/role.model'; import { By } from '@angular/platform-browser'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; describe('UserRoleColumnComponent', () => { let component: UserRoleColumnComponent; @@ -27,7 +26,7 @@ describe('UserRoleColumnComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, UserRoleColumnComponent] + imports: [UserRoleColumnComponent] }); fixture = TestBed.createComponent(UserRoleColumnComponent); 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 de76d811b3..e9105308ef 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 @@ -19,9 +19,9 @@ import { TestBed } from '@angular/core/testing'; import { NodePermissionDialogService } from './node-permission-dialog.service'; import { MatDialog } from '@angular/material/dialog'; import { of, Subject, throwError } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { NodePermissionService } from './node-permission.service'; import { Node } from '@alfresco/js-api'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('NodePermissionDialogService', () => { let service: NodePermissionDialogService; @@ -32,7 +32,7 @@ describe('NodePermissionDialogService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule] }); service = TestBed.inject(NodePermissionDialogService); materialDialog = TestBed.inject(MatDialog); 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 1d6ac1714a..90ed4b851f 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 @@ -29,7 +29,6 @@ import { fakeNodeWithoutSite } from '../../mock/permission-list.component.mock'; import { fakeAuthorityResults } from '../../mock/add-permission.component.mock'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { NodesApiService } from '../../common/services/nodes-api.service'; describe('NodePermissionService', () => { @@ -55,9 +54,6 @@ describe('NodePermissionService', () => { ]; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ContentTestingModule] - }); service = TestBed.inject(NodePermissionService); searchApiService = TestBed.inject(SearchService); nodeService = TestBed.inject(NodesApiService); diff --git a/lib/content-services/src/lib/prediction/services/prediction.service.spec.ts b/lib/content-services/src/lib/prediction/services/prediction.service.spec.ts index f67d445b25..f299e1d38d 100644 --- a/lib/content-services/src/lib/prediction/services/prediction.service.spec.ts +++ b/lib/content-services/src/lib/prediction/services/prediction.service.spec.ts @@ -17,7 +17,6 @@ import { PredictionService } from './prediction.service'; import { TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { Prediction, PredictionEntry, PredictionPaging, PredictionPagingList, ReviewStatus } from '@alfresco/js-api'; describe('PredictionService', () => { @@ -33,7 +32,7 @@ describe('PredictionService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [] }); service = TestBed.inject(PredictionService); }); diff --git a/lib/content-services/src/lib/search-ai/services/search-ai.service.spec.ts b/lib/content-services/src/lib/search-ai/services/search-ai.service.spec.ts index 651cc4e26f..3a2e014a9d 100644 --- a/lib/content-services/src/lib/search-ai/services/search-ai.service.spec.ts +++ b/lib/content-services/src/lib/search-ai/services/search-ai.service.spec.ts @@ -17,7 +17,6 @@ import { TestBed } from '@angular/core/testing'; import { AiAnswerEntry, KnowledgeRetrievalConfigEntry, Node, QuestionModel, QuestionRequest } from '@alfresco/js-api'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { SearchAiService } from './search-ai.service'; import { SearchAiInputState } from '../models/search-ai-input-state'; import { TranslateService } from '@ngx-translate/core'; @@ -27,7 +26,7 @@ describe('SearchAiService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [] }); service = TestBed.inject(SearchAiService); }); 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 6219cb8ade..af11dbeb99 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,10 +17,10 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { SearchFacetFiltersService } from '../services/search-facet-filters.service'; import { SearchQueryBuilderService } from '../services/search-query-builder.service'; import { ResetSearchDirective } from './reset-search.directive'; +import { provideRouter } from '@angular/router'; @Component({ template: ``, @@ -36,7 +36,8 @@ describe('Directive: ResetSearchDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, TestComponent] + imports: [TestComponent], + providers: [provideRouter([])] }); fixture = TestBed.createComponent(TestComponent); searchFacetFiltersService = TestBed.inject(SearchFacetFiltersService); 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 0af674f99c..9330c57f48 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 { ContentTestingModule } from '../../../testing/content.testing.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { sizeOptions, stepOne, stepThree } from '../../../mock'; import { HarnessLoader, TestKey } from '@angular/cdk/testing'; @@ -35,7 +34,7 @@ describe('SearchCheckListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchCheckListComponent] }); fixture = TestBed.createComponent(SearchCheckListComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts index 2d27092fa2..bc2af8a734 100644 --- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatChipRemove } from '@angular/material/chips'; import { By } from '@angular/platform-browser'; import { Subject } from 'rxjs'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { SearchChipAutocompleteInputComponent } from './search-chip-autocomplete-input.component'; import { DebugElement, SimpleChanges } from '@angular/core'; import { HarnessLoader } from '@angular/cdk/testing'; @@ -36,7 +35,7 @@ describe('SearchChipAutocompleteInputComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SearchChipAutocompleteInputComponent] + imports: [SearchChipAutocompleteInputComponent] }); fixture = TestBed.createComponent(SearchChipAutocompleteInputComponent); diff --git a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts index 65a363953c..d8a1417d86 100644 --- a/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-chip-list/search-chip-list.component.spec.ts @@ -19,11 +19,11 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { SearchFacetFiltersService } from '../../services/search-facet-filters.service'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatChipHarness, MatChipRemoveHarness } from '@angular/material/chips/testing'; import { SearchChipListComponent } from './search-chip-list.component'; +import { provideRouter } from '@angular/router'; @Component({ selector: 'adf-test-component', @@ -46,7 +46,8 @@ describe('SearchChipListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, TestComponent] + imports: [TestComponent], + providers: [provideRouter([])] }); fixture = TestBed.createComponent(TestComponent); 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 37af023fde..48b9c88fdc 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,11 @@ import { Component, DebugElement, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AuthenticationService, SearchTextInputComponent, UserPreferencesService } from '@alfresco/adf-core'; +import { AuthenticationService, NoopAuthModule, SearchTextInputComponent, UserPreferencesService } from '@alfresco/adf-core'; import { noResult, results } from '../../mock'; import { SearchControlComponent } from './search-control.component'; import { SearchService } from '../services/search.service'; import { of } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { EmptySearchResultComponent } from './empty-search-result.component'; @Component({ @@ -62,7 +61,7 @@ describe('SearchControlComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SimpleSearchTestCustomEmptyComponent] + imports: [NoopAuthModule, SimpleSearchTestCustomEmptyComponent] }); fixture = TestBed.createComponent(SearchControlComponent); debugElement = fixture.debugElement; diff --git a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.spec.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.spec.ts index cc65527dda..2b225a4a33 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range-tabbed.component.spec.ts @@ -16,7 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { Component, EventEmitter, Input, Output } from '@angular/core'; import { SearchDateRange } from './search-date-range/search-date-range'; import { SearchFilterTabbedComponent } from '../search-filter-tabbed/search-filter-tabbed.component'; @@ -64,7 +63,7 @@ describe('SearchDateRangeTabbedComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SearchFilterTabbedComponent, SearchDateRangeComponent, SearchDateRangeTabbedComponent], + imports: [SearchFilterTabbedComponent, SearchDateRangeComponent, SearchDateRangeTabbedComponent], providers: [ { provide: SearchFilterTabbedComponent, useClass: MockSearchFilterTabbedComponent }, { provide: SearchDateRangeComponent, useClass: MockSearchDateRangeComponent } diff --git a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts index 3e278daff3..7df068d9f5 100644 --- a/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-date-range-tabbed/search-date-range/search-date-range.component.spec.ts @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { ContentTestingModule } from '../../../../testing/content.testing.module'; import { SearchDateRangeComponent } from './search-date-range.component'; import { addDays, endOfToday, format, parse, startOfYesterday, subDays } from 'date-fns'; import { Validators } from '@angular/forms'; @@ -38,7 +37,7 @@ describe('SearchDateRangeComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SearchDateRangeComponent] + imports: [SearchDateRangeComponent] }); fixture = TestBed.createComponent(SearchDateRangeComponent); 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 ec46d54b10..a88c7c3a4c 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 @@ -17,7 +17,6 @@ import { DEFAULT_DATETIME_FORMAT, SearchDatetimeRangeComponent } from './search-datetime-range.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { MatDatetimepickerInputEvent } from '@mat-datetimepicker/core'; import { DateFnsUtils } from '@alfresco/adf-core'; import { endOfMinute, isValid, startOfMinute } from 'date-fns'; @@ -33,7 +32,7 @@ describe('SearchDatetimeRangeComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SearchDatetimeRangeComponent] + imports: [SearchDatetimeRangeComponent] }); fixture = TestBed.createComponent(SearchDatetimeRangeComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.spec.ts b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.spec.ts index 720d758dd5..ea9d11d69f 100644 --- a/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-facet-field/search-facet-field.component.spec.ts @@ -19,10 +19,10 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchFacetFieldComponent } from './search-facet-field.component'; import { SearchFacetFiltersService } from '../../services/search-facet-filters.service'; import { SearchQueryBuilderService } from '../../services/search-query-builder.service'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { FacetField } from '../../models/facet-field.interface'; import { FacetFieldBucket } from '../../models/facet-field-bucket.interface'; import { SearchFilterList } from '../../models/search-filter-list.model'; +import { provideRouter } from '@angular/router'; describe('SearchFacetFieldComponent', () => { let component: SearchFacetFieldComponent; @@ -30,15 +30,14 @@ describe('SearchFacetFieldComponent', () => { let searchFacetFiltersService: SearchFacetFiltersService; let queryBuilder: SearchQueryBuilderService; - beforeEach(async () => { + beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchFacetFieldComponent], + providers: [provideRouter([])] }); searchFacetFiltersService = TestBed.inject(SearchFacetFiltersService); queryBuilder = TestBed.inject(SearchQueryBuilderService); - }); - beforeEach(() => { fixture = TestBed.createComponent(SearchFacetFieldComponent); component = fixture.componentInstance; spyOn(searchFacetFiltersService, 'updateSelectedBuckets').and.stub(); diff --git a/lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.spec.ts index 5879fe0440..7a9aebb416 100644 --- a/lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-autocomplete-chips/search-filter-autocomplete-chips.component.spec.ts @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { SearchFilterAutocompleteChipsComponent } from './search-filter-autocomplete-chips.component'; import { EMPTY, of, ReplaySubject } from 'rxjs'; import { AutocompleteField } from '../../models/autocomplete-option.interface'; @@ -34,7 +33,7 @@ describe('SearchFilterAutocompleteChipsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SearchFilterAutocompleteChipsComponent], + imports: [SearchFilterAutocompleteChipsComponent], providers: [ { provide: TagService, diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.spec.ts index 506a44159f..396b4cc365 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.spec.ts @@ -16,17 +16,16 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../../testing/content.testing.module'; import { By } from '@angular/platform-browser'; import { SearchFilterList } from '../../../models/search-filter-list.model'; import { SearchFacetChipTabbedComponent } from './search-facet-chip-tabbed.component'; import { FacetField } from '../../../models/facet-field.interface'; -import { NO_ERRORS_SCHEMA } from '@angular/core'; import { HarnessLoader, TestKey } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatChipHarness } from '@angular/material/chips/testing'; import { MatIconHarness } from '@angular/material/icon/testing'; import { ConfigurableFocusTrapFactory } from '@angular/cdk/a11y'; +import { provideRouter } from '@angular/router'; describe('SearchFacetChipTabbedComponent', () => { let loader: HarnessLoader; @@ -38,9 +37,7 @@ describe('SearchFacetChipTabbedComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - providers: [{ provide: ConfigurableFocusTrapFactory, useValue: focusTrapFactory }], - schemas: [NO_ERRORS_SCHEMA] + providers: [provideRouter([]), { provide: ConfigurableFocusTrapFactory, useValue: focusTrapFactory }] }); fixture = TestBed.createComponent(SearchFacetChipTabbedComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.spec.ts index 22e5cb56da..5c800df6d1 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-facet-chip-tabbed/search-facet-tabbed-content.component.spec.ts @@ -16,16 +16,16 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../../testing/content.testing.module'; import { SearchQueryBuilderService } from '../../../services/search-query-builder.service'; import { SearchFilterList } from '../../../models/search-filter-list.model'; import { FacetField } from '../../../models/facet-field.interface'; import { SearchFacetFiltersService } from '../../../services/search-facet-filters.service'; -import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; +import { SimpleChange } from '@angular/core'; import { SearchFacetTabbedContentComponent } from './search-facet-tabbed-content.component'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatTabGroupHarness, MatTabHarness } from '@angular/material/tabs/testing'; +import { provideRouter } from '@angular/router'; describe('SearchFacetTabbedContentComponent', () => { let component: SearchFacetTabbedContentComponent; @@ -37,8 +37,7 @@ describe('SearchFacetTabbedContentComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - schemas: [NO_ERRORS_SCHEMA] + providers: [provideRouter([])] }); fixture = TestBed.createComponent(SearchFacetTabbedContentComponent); loader = TestbedHarnessEnvironment.loader(fixture); 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 58979767e8..20a8f80f91 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 @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchFacetChipComponent } from './search-facet-chip.component'; -import { ContentTestingModule } from '../../../../testing/content.testing.module'; import { SearchQueryBuilderService } from '../../../services/search-query-builder.service'; import { SearchFilterList } from '../../../models/search-filter-list.model'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; @@ -26,6 +25,7 @@ import { HarnessLoader, TestKey } from '@angular/cdk/testing'; import { MatButtonHarness } from '@angular/material/button/testing'; import { MatIconHarness } from '@angular/material/icon/testing'; import { MatChipHarness } from '@angular/material/chips/testing'; +import { provideRouter } from '@angular/router'; describe('SearchFacetChipComponent', () => { let loader: HarnessLoader; @@ -35,7 +35,8 @@ describe('SearchFacetChipComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchFacetChipComponent], + providers: [provideRouter([])] }); fixture = TestBed.createComponent(SearchFacetChipComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.spec.ts index 53cf71c8fd..4e39d83bbf 100644 --- a/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-chips/search-filter-chips.component.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchFilterChipsComponent } from './search-filter-chips.component'; import { SearchFacetFiltersService } from '../../services/search-facet-filters.service'; import { SearchQueryBuilderService } from '../../services/search-query-builder.service'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { By } from '@angular/platform-browser'; import { SearchFacetFieldComponent } from '../search-facet-field/search-facet-field.component'; import { SearchFilterList } from '../../models/search-filter-list.model'; @@ -30,6 +29,7 @@ import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; import { MatChipHarness } from '@angular/material/chips/testing'; +import { provideRouter } from '@angular/router'; describe('SearchFilterChipsComponent', () => { let fixture: ComponentFixture; @@ -40,7 +40,8 @@ describe('SearchFilterChipsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchFilterChipsComponent], + providers: [provideRouter([])] }); queryBuilder = TestBed.inject(SearchQueryBuilderService); appConfigService = TestBed.inject(AppConfigService); 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 dd3b0a05c6..362ae9259b 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 @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchFilterMenuCardComponent } from './search-filter-menu-card.component'; -import { ContentTestingModule } from '../../../../testing/content.testing.module'; describe('SearchFilterMenuComponent', () => { let component: SearchFilterMenuCardComponent; @@ -25,7 +24,7 @@ describe('SearchFilterMenuComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchFilterMenuCardComponent] }); fixture = TestBed.createComponent(SearchFilterMenuCardComponent); component = fixture.componentInstance; 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 dc8c8cb647..f0fddd2cf5 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 { ContentTestingModule } from '../../../../testing/content.testing.module'; import { MatMenuModule } from '@angular/material/menu'; import { By } from '@angular/platform-browser'; import { SearchQueryBuilderService } from '../../../services/search-query-builder.service'; @@ -27,6 +26,7 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatChipHarness } from '@angular/material/chips/testing'; import { MatIconHarness } from '@angular/material/icon/testing'; import { ConfigurableFocusTrapFactory } from '@angular/cdk/a11y'; +import { provideRouter } from '@angular/router'; describe('SearchWidgetChipComponent', () => { let loader: HarnessLoader; @@ -39,8 +39,8 @@ describe('SearchWidgetChipComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [MatMenuModule, ContentTestingModule], - providers: [{ provide: ConfigurableFocusTrapFactory, useValue: focusTrapFactory }] + imports: [MatMenuModule, SearchWidgetChipComponent], + providers: [provideRouter([]), { provide: ConfigurableFocusTrapFactory, useValue: focusTrapFactory }] }); queryBuilder = TestBed.inject(SearchQueryBuilderService); fixture = TestBed.createComponent(SearchWidgetChipComponent); 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 82e540f36d..51ec29cf57 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 @@ -19,7 +19,6 @@ import { Subject } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchService } from '../../services/search.service'; import { SearchHeaderQueryBuilderService } from '../../services/search-header-query-builder.service'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { By } from '@angular/platform-browser'; import { SearchFilterContainerComponent } from './search-filter-container.component'; import { SearchCategory } from '../../models/search-category.interface'; @@ -29,6 +28,7 @@ import { MatMenuHarness } from '@angular/material/menu/testing'; import { MatButtonHarness } from '@angular/material/button/testing'; import { MatBadgeHarness } from '@angular/material/badge/testing'; import { MatInputHarness } from '@angular/material/input/testing'; +import { provideRouter } from '@angular/router'; const mockCategory: SearchCategory = { id: 'queryName', @@ -58,8 +58,8 @@ describe('SearchFilterContainerComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - providers: [{ provide: SearchService, useValue: searchMock }] + imports: [SearchFilterContainerComponent], + providers: [provideRouter([]), { provide: SearchService, useValue: searchMock }] }); fixture = TestBed.createComponent(SearchFilterContainerComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.spec.ts index 0a00961ce5..647ad73774 100644 --- a/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-tabbed/search-filter-tabbed.component.spec.ts @@ -15,11 +15,12 @@ * limitations under the License. */ -import { ContentTestingModule, SearchFilterTabbedComponent, SearchFilterTabDirective } from '@alfresco/adf-content-services'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { MatTabGroup } from '@angular/material/tabs'; import { Component } from '@angular/core'; +import { SearchFilterTabbedComponent } from './search-filter-tabbed.component'; +import { SearchFilterTabDirective } from './search-filter-tab.directive'; @Component({ selector: 'adf-search-filter-tabbed-test', @@ -39,7 +40,7 @@ describe('SearchFilterTabbedComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [SearchFilterTabbedTestComponent, ContentTestingModule] + imports: [SearchFilterTabbedTestComponent] }); searchFilterTabbedTestFixture = TestBed.createComponent(SearchFilterTabbedTestComponent); }); diff --git a/lib/content-services/src/lib/search/components/search-filter/search-filter-card/search-filter-card.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter/search-filter-card/search-filter-card.component.spec.ts index 200c6b9c15..33ce2b19d0 100644 --- a/lib/content-services/src/lib/search/components/search-filter/search-filter-card/search-filter-card.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter/search-filter-card/search-filter-card.component.spec.ts @@ -16,8 +16,8 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../../testing/content.testing.module'; import { SearchFilterCardComponent } from './search-filter-card.component'; +import { provideRouter } from '@angular/router'; describe('SearchFilterCardComponent', () => { let component: SearchFilterCardComponent; @@ -40,7 +40,8 @@ describe('SearchFilterCardComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchFilterCardComponent], + providers: [provideRouter([])] }); fixture = TestBed.createComponent(SearchFilterCardComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts index 201b8ef4bb..62c64f92fe 100644 --- a/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter/search-filter.component.spec.ts @@ -23,7 +23,6 @@ import { Subject } from 'rxjs'; import { SearchFilterList } from '../../models/search-filter-list.model'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { disabledCategories, expandableCategories, @@ -45,6 +44,7 @@ import { MatExpansionPanelHarness } from '@angular/material/expansion/testing'; import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; import { MatButtonHarness } from '@angular/material/button/testing'; import { MatInputHarness } from '@angular/material/input/testing'; +import { provideRouter } from '@angular/router'; describe('SearchFilterComponent', () => { let loader: HarnessLoader; @@ -59,8 +59,8 @@ describe('SearchFilterComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - providers: [{ provide: SearchService, useValue: searchMock }] + imports: [SearchFilterComponent], + providers: [provideRouter([]), { provide: SearchService, useValue: searchMock }] }); searchFacetFiltersService = TestBed.inject(SearchFacetFiltersService); queryBuilder = TestBed.inject(SearchQueryBuilderService); 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 60594d5289..f045f8fcac 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 { ContentTestingModule } from '../../../testing/content.testing.module'; import { SearchQueryBuilderService } from '../../services/search-query-builder.service'; import { SearchForm } from '../../models/search-form.interface'; import { By } from '@angular/platform-browser'; @@ -25,6 +24,7 @@ import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatMenuHarness } from '@angular/material/menu/testing'; import { MatButtonHarness } from '@angular/material/button/testing'; +import { provideRouter } from '@angular/router'; describe('SearchFormComponent', () => { let loader: HarnessLoader; @@ -39,7 +39,8 @@ describe('SearchFormComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchFormComponent], + providers: [provideRouter([])] }); fixture = TestBed.createComponent(SearchFormComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/components/search-input/search-input.component.spec.ts b/lib/content-services/src/lib/search/components/search-input/search-input.component.spec.ts index 7023a12884..64c4cdbaaa 100644 --- a/lib/content-services/src/lib/search/components/search-input/search-input.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-input/search-input.component.spec.ts @@ -15,13 +15,13 @@ * limitations under the License. */ -import { SearchConfiguration, SearchInputComponent } from '@alfresco/adf-content-services'; import { AppConfigService } from '@alfresco/adf-core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatInputHarness } from '@angular/material/input/testing'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; +import { SearchInputComponent } from './search-input.component'; +import { SearchConfiguration } from '../../models'; describe('SearchInputComponent', () => { let loader: HarnessLoader; @@ -45,7 +45,7 @@ describe('SearchInputComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SearchInputComponent] + imports: [SearchInputComponent] }); fixture = TestBed.createComponent(SearchInputComponent); diff --git a/lib/content-services/src/lib/search/components/search-logical-filter/search-logical-filter.component.spec.ts b/lib/content-services/src/lib/search/components/search-logical-filter/search-logical-filter.component.spec.ts index ec230380cc..8e1eb62382 100644 --- a/lib/content-services/src/lib/search/components/search-logical-filter/search-logical-filter.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-logical-filter/search-logical-filter.component.spec.ts @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { LogicalSearchCondition, LogicalSearchFields, SearchLogicalFilterComponent } from './search-logical-filter.component'; import { ReplaySubject } from 'rxjs'; @@ -27,7 +26,7 @@ describe('SearchLogicalFilterComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SearchLogicalFilterComponent] + imports: [SearchLogicalFilterComponent] }); fixture = TestBed.createComponent(SearchLogicalFilterComponent); diff --git a/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.spec.ts b/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.spec.ts index 2010d65d68..e8f5a7118d 100644 --- a/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-number-range/search-number-range.component.spec.ts @@ -19,7 +19,6 @@ import { ReplaySubject } from 'rxjs'; import { SearchNumberRangeComponent } from './search-number-range.component'; import { UntypedFormControl, UntypedFormGroup } from '@angular/forms'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; describe('SearchNumberRangeComponent', () => { let component: SearchNumberRangeComponent; @@ -27,7 +26,7 @@ describe('SearchNumberRangeComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SearchNumberRangeComponent] + imports: [SearchNumberRangeComponent] }); fixture = TestBed.createComponent(SearchNumberRangeComponent); component = fixture.componentInstance; 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 6540eb5687..1ecc3f58fe 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 @@ -15,12 +15,12 @@ * limitations under the License. */ -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchPanelComponent } from './search-panel.component'; import { By } from '@angular/platform-browser'; import { ContentNodeSelectorPanelService } from '../../../content-node-selector'; import { SearchCategory } from '../../models'; +import { provideRouter } from '@angular/router'; describe('SearchPanelComponent', () => { let fixture: ComponentFixture; @@ -30,7 +30,8 @@ describe('SearchPanelComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchPanelComponent], + providers: [provideRouter([])] }); fixture = TestBed.createComponent(SearchPanelComponent); contentNodeSelectorPanelService = TestBed.inject(ContentNodeSelectorPanelService); diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.spec.ts b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.spec.ts index e65989e039..6fb303e06f 100644 --- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.spec.ts @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchPropertiesComponent } from './search-properties.component'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { By } from '@angular/platform-browser'; import { MatOption } from '@angular/material/core'; import { FileSizeUnit } from './file-size-unit.enum'; @@ -61,8 +60,8 @@ describe('SearchPropertiesComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SearchPropertiesComponent] - }).compileComponents(); + imports: [SearchPropertiesComponent] + }); fixture = TestBed.createComponent(SearchPropertiesComponent); 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 f586d96eed..283afbd9a9 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 @@ -18,7 +18,6 @@ import { sizeOptions, stepOne, stepThree } from '../../../mock'; import { SearchRadioComponent } from './search-radio.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatRadioButtonHarness, MatRadioGroupHarness } from '@angular/material/radio/testing'; @@ -31,7 +30,7 @@ describe('SearchRadioComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchRadioComponent] }); 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 5f51836cf1..52c37a67ba 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 @@ -16,7 +16,6 @@ */ import { SearchSliderComponent } from './search-slider.component'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ReplaySubject } from 'rxjs'; @@ -26,7 +25,7 @@ describe('SearchSliderComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchSliderComponent] }); fixture = TestBed.createComponent(SearchSliderComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts b/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts index 03d0907ccf..f62b215fa9 100644 --- a/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-sorting-picker/search-sorting-picker.component.spec.ts @@ -18,7 +18,6 @@ import { SearchSortingPickerComponent } from './search-sorting-picker.component'; import { SearchQueryBuilderService } from '../../services/search-query-builder.service'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { SearchConfiguration } from '../../models'; import { BaseQueryBuilderService } from '../../services/base-query-builder.service'; @@ -47,7 +46,7 @@ describe('SearchSortingPickerComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], + imports: [], providers: [ { provide: SearchQueryBuilderService, 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 326d06f87e..9bb277f9d8 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 { ContentTestingModule } from '../../../testing/content.testing.module'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; @@ -31,7 +30,7 @@ describe('SearchTextComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [SearchTextComponent] }); fixture = TestBed.createComponent(SearchTextComponent); component = fixture.componentInstance; 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 9ca7a98bf6..f76ceb3f30 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 @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SearchService } from '../services/search.service'; import { differentResult, result, SimpleSearchTestComponent } from '../../mock'; import { of, throwError } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; describe('SearchComponent', () => { let fixture: ComponentFixture; @@ -29,7 +28,7 @@ describe('SearchComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, SimpleSearchTestComponent] + imports: [SimpleSearchTestComponent] }); fixture = TestBed.createComponent(SimpleSearchTestComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/search/services/search-facet-filters.service.spec.ts b/lib/content-services/src/lib/search/services/search-facet-filters.service.spec.ts index d2746da492..b241299395 100644 --- a/lib/content-services/src/lib/search/services/search-facet-filters.service.spec.ts +++ b/lib/content-services/src/lib/search/services/search-facet-filters.service.spec.ts @@ -18,11 +18,11 @@ import { TestBed } from '@angular/core/testing'; import { SearchFacetFiltersService } from './search-facet-filters.service'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { SearchQueryBuilderService } from './search-query-builder.service'; import { EMPTY, of } from 'rxjs'; import { CategoryService } from '../../category/services/category.service'; import { FacetBucketSortBy, FacetBucketSortDirection } from '../models/facet-field.interface'; +import { provideRouter } from '@angular/router'; describe('SearchFacetFiltersService', () => { let searchFacetFiltersService: SearchFacetFiltersService; @@ -31,8 +31,8 @@ describe('SearchFacetFiltersService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], providers: [ + provideRouter([]), { provide: CategoryService, useValue: { diff --git a/lib/content-services/src/lib/search/services/search-header-query-builder.service.spec.ts b/lib/content-services/src/lib/search/services/search-header-query-builder.service.spec.ts index 646e174a29..3c11c9044a 100644 --- a/lib/content-services/src/lib/search/services/search-header-query-builder.service.spec.ts +++ b/lib/content-services/src/lib/search/services/search-header-query-builder.service.spec.ts @@ -19,9 +19,8 @@ import { SearchConfiguration } from '../models/search-configuration.interface'; import { AppConfigService } from '@alfresco/adf-core'; import { SearchHeaderQueryBuilderService } from './search-header-query-builder.service'; import { TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, provideRouter, Router } from '@angular/router'; import { SearchCategory } from '../models'; describe('SearchHeaderQueryBuilderService', () => { @@ -31,7 +30,7 @@ describe('SearchHeaderQueryBuilderService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + providers: [provideRouter([])] }); router = TestBed.inject(Router); activatedRoute = TestBed.inject(ActivatedRoute); diff --git a/lib/content-services/src/lib/search/services/search-query-builder.service.spec.ts b/lib/content-services/src/lib/search/services/search-query-builder.service.spec.ts index b720c76216..7bb937e708 100644 --- a/lib/content-services/src/lib/search/services/search-query-builder.service.spec.ts +++ b/lib/content-services/src/lib/search/services/search-query-builder.service.spec.ts @@ -21,9 +21,8 @@ import { AppConfigService } from '@alfresco/adf-core'; import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { FacetField } from '../models/facet-field.interface'; import { TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { ADF_SEARCH_CONFIGURATION } from '../search-configuration.token'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, provideRouter, Router } from '@angular/router'; import { skip } from 'rxjs/operators'; const buildConfig = (searchSettings = {}): AppConfigService => { @@ -40,8 +39,7 @@ describe('SearchQueryBuilder (runtime config)', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - providers: [{ provide: ADF_SEARCH_CONFIGURATION, useValue: runtimeConfig }] + providers: [provideRouter([]), { provide: ADF_SEARCH_CONFIGURATION, useValue: runtimeConfig }] }); }); @@ -79,7 +77,7 @@ describe('SearchQueryBuilder', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + providers: [provideRouter([])] }); router = TestBed.inject(Router); activatedRoute = TestBed.inject(ActivatedRoute); 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 5b945d0c68..c270091fc2 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 @@ -18,7 +18,6 @@ import { AppConfigService, 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'; import { firstValueFrom, throwError } from 'rxjs'; import { Pagination, Tag, TagBody, TagEntry, TagPaging, TagPagingList } from '@alfresco/js-api'; @@ -40,9 +39,6 @@ describe('TagService', () => { }; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ContentTestingModule] - }); service = TestBed.inject(TagService); userPreferencesService = TestBed.inject(UserPreferencesService); diff --git a/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.spec.ts b/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.spec.ts index 9f8924dbc0..5e1a608e3b 100644 --- a/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.spec.ts +++ b/lib/content-services/src/lib/tag/tag-actions/tag-actions.component.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TagActionsComponent } from './tag-actions.component'; import { TagService } from '../services/tag.service'; import { of } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; describe('TagActionsComponent', () => { const dataTag = { @@ -50,7 +49,7 @@ describe('TagActionsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, TagActionsComponent] + imports: [TagActionsComponent] }); fixture = TestBed.createComponent(TagActionsComponent); tagService = TestBed.inject(TagService); diff --git a/lib/content-services/src/lib/tag/tag-list/tag-list.component.spec.ts b/lib/content-services/src/lib/tag/tag-list/tag-list.component.spec.ts index 79d092fc01..1bb92960c7 100644 --- a/lib/content-services/src/lib/tag/tag-list/tag-list.component.spec.ts +++ b/lib/content-services/src/lib/tag/tag-list/tag-list.component.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TagService } from '../services/tag.service'; import { TagListComponent } from './tag-list.component'; import { of } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; describe('TagList', () => { const dataTag = { @@ -50,7 +49,7 @@ describe('TagList', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, TagListComponent] + imports: [TagListComponent] }); tagService = TestBed.inject(TagService); diff --git a/lib/content-services/src/lib/tag/tag-node-list/tag-node-list.component.spec.ts b/lib/content-services/src/lib/tag/tag-node-list/tag-node-list.component.spec.ts index 415ad7589c..23f4a37b92 100644 --- a/lib/content-services/src/lib/tag/tag-node-list/tag-node-list.component.spec.ts +++ b/lib/content-services/src/lib/tag/tag-node-list/tag-node-list.component.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TagNodeListComponent } from './tag-node-list.component'; import { TagService } from '../services/tag.service'; import { Observable, of, Subject } from 'rxjs'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { Tag, TagEntry, TagPaging } from '@alfresco/js-api'; import { DynamicChipListComponent } from '@alfresco/adf-core'; import { By } from '@angular/platform-browser'; @@ -30,7 +29,7 @@ describe('TagNodeList', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, TagNodeListComponent] + imports: [TagNodeListComponent] }); fixture = TestBed.createComponent(TagNodeListComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/testing/content.testing.module.ts b/lib/content-services/src/lib/testing/content.testing.module.ts deleted file mode 100644 index 52eb3e3f0e..0000000000 --- a/lib/content-services/src/lib/testing/content.testing.module.ts +++ /dev/null @@ -1,41 +0,0 @@ -/*! - * @license - * Copyright © 2005-2025 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 { NgModule, APP_INITIALIZER } from '@angular/core'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { CoreModule, NoopTranslateModule, NoopAuthModule } from '@alfresco/adf-core'; -import { ContentModule } from '../content.module'; -import { versionCompatibilityFactory } from '../version-compatibility/version-compatibility-factory'; -import { AlfrescoApiService } from '../services/alfresco-api.service'; -import { VersionCompatibilityService } from '../version-compatibility/version-compatibility.service'; -import { MatIconTestingModule } from '@angular/material/icon/testing'; -import { AlfrescoApiServiceMock } from '../mock'; - -@NgModule({ - imports: [NoopAnimationsModule, CoreModule, NoopAuthModule, NoopTranslateModule, ContentModule, MatIconTestingModule], - providers: [ - { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, - { - provide: APP_INITIALIZER, - useFactory: versionCompatibilityFactory, - deps: [VersionCompatibilityService], - multi: true - } - ], - exports: [NoopAnimationsModule, CoreModule, ContentModule] -}) -export class ContentTestingModule {} diff --git a/lib/content-services/src/lib/testing/providers.ts b/lib/content-services/src/lib/testing/providers.ts new file mode 100644 index 0000000000..fb7e48aa9e --- /dev/null +++ b/lib/content-services/src/lib/testing/providers.ts @@ -0,0 +1,34 @@ +/*! + * @license + * Copyright © 2005-2025 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 { AlfrescoApiService } from '../services'; +import { AlfrescoApiServiceMock } from '../mock'; +import { EnvironmentProviders, Provider } from '@angular/core'; + +/** + * Provides all necessary entries to test AlfrescoApiService + * + * @returns list of providers + */ +export function provideApiTesting(): (Provider | EnvironmentProviders)[] { + return [ + { + provide: AlfrescoApiService, + useClass: AlfrescoApiServiceMock + } + ]; +} 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 cd714cb0ab..9bc114861d 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 @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TreeViewComponent } from './tree-view.component'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { TreeViewService } from '../services/tree-view.service'; import { of, throwError } from 'rxjs'; import { TreeBaseNode } from '../models/tree-view.model'; @@ -74,7 +73,7 @@ describe('TreeViewComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, TreeViewComponent] + imports: [TreeViewComponent] }); }); 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 67b1b3f918..0a63120de3 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 @@ -18,7 +18,6 @@ import { NodesApiService } from '../../common/services/nodes-api.service'; import { TreeViewService } from './tree-view.service'; import { TestBed } from '@angular/core/testing'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { of } from 'rxjs'; import { TreeBaseNode } from '../models/tree-view.model'; import { Node, NodePaging } from '@alfresco/js-api'; @@ -52,9 +51,6 @@ describe('TreeViewService', () => { }); beforeEach(() => { - TestBed.configureTestingModule({ - imports: [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 d09ca22c50..28a766963d 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 @@ -19,11 +19,11 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { UploadBase } from './upload-base'; import { UploadFilesEvent } from '../upload-files.event'; -import { ContentTestingModule } from '../../../testing/content.testing.module'; import { mockUploadSuccessPromise } from '../../../mock/upload.service.mock'; import { UploadService } from '../../../common/services/upload.service'; import { FileModel } from '../../../common/models/file.model'; import { FileUploadErrorEvent } from '../../../common/events/file.event'; +import { NoopAuthModule } from '@alfresco/adf-core'; @Component({ selector: 'adf-upload-button-test', @@ -41,7 +41,7 @@ describe('UploadBase', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, UploadTestComponent] + imports: [NoopAuthModule, UploadTestComponent] }); fixture = TestBed.createComponent(UploadTestComponent); uploadService = TestBed.inject(UploadService); @@ -57,7 +57,7 @@ describe('UploadBase', () => { spyOn(uploadService, 'addToQueue').and.stub(); spyOn(uploadService, 'uploadFilesInTheQueue').and.stub(); - component.beginUpload.subscribe((uploadFilesEvent: UploadFilesEvent) => { + component.beginUpload.subscribe((uploadFilesEvent) => { expect(uploadFilesEvent.files[0].file).toEqual(file); }); 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 d371b453c0..aeab0a2f22 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,10 +17,8 @@ import { EventEmitter } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; -import { UserPreferencesService } from '@alfresco/adf-core'; -import { UploadModule } from '../upload.module'; +import { NoopAuthModule, UserPreferencesService } from '@alfresco/adf-core'; import { FileUploadingDialogComponent } from './file-uploading-dialog.component'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { UploadService } from '../../common/services/upload.service'; import { FileModel } from '../../common/models/file.model'; import { FileUploadCompleteEvent, FileUploadErrorEvent } from '../../common/events/file.event'; @@ -35,7 +33,7 @@ describe('FileUploadingDialogComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, UploadModule] + imports: [NoopAuthModule, FileUploadingDialogComponent] }); 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 cf634c2d92..aa313cd085 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 @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FileUploadingListRowComponent } from './file-uploading-list-row.component'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { By } from '@angular/platform-browser'; import { FileModel, FileUploadStatus } from '../../common/models/file.model'; @@ -28,7 +27,7 @@ describe('FileUploadingListRowComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [FileUploadingListRowComponent] }); 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 06892ec881..0ef2295b4d 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,10 +16,9 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslationService } from '@alfresco/adf-core'; +import { NoopAuthModule, TranslationService } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { FileUploadingListComponent } from './file-uploading-list.component'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { UploadService } from '../../common/services/upload.service'; import { NodesApiService } from '../../common/services/nodes-api.service'; import { FileModel, FileUploadStatus } from '../../common/models/file.model'; @@ -38,7 +37,7 @@ describe('FileUploadingListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule, FileUploadingListComponent] }); nodesApiService = TestBed.inject(NodesApiService); diff --git a/lib/content-services/src/lib/upload/components/upload-button.component.spec.ts b/lib/content-services/src/lib/upload/components/upload-button.component.spec.ts index e49f859593..4bceefdedd 100644 --- a/lib/content-services/src/lib/upload/components/upload-button.component.spec.ts +++ b/lib/content-services/src/lib/upload/components/upload-button.component.spec.ts @@ -20,12 +20,11 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; import { UploadButtonComponent } from './upload-button.component'; import { Node, NodeEntry } from '@alfresco/js-api'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { mockUploadErrorPromise } from '../../mock/upload.service.mock'; import { UploadService } from '../../common/services/upload.service'; import { NodesApiService } from '../../common/services/nodes-api.service'; import { FileUploadErrorEvent } from '../../common/events/file.event'; -import { UnitTestingUtils } from '@alfresco/adf-core'; +import { NoopAuthModule, UnitTestingUtils } from '@alfresco/adf-core'; describe('UploadButtonComponent', () => { const file = { name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json' }; @@ -48,7 +47,7 @@ describe('UploadButtonComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule, UploadButtonComponent] }); fixture = TestBed.createComponent(UploadButtonComponent); 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 3d2df00a6f..7964a4b90b 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 @@ -17,11 +17,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UploadDragAreaComponent } from './upload-drag-area.component'; -import { ContentTestingModule } from '../../testing/content.testing.module'; import { mockUploadSuccessPromise, mockUploadErrorPromise } from '../../mock/upload.service.mock'; import { UploadService } from '../../common/services/upload.service'; import { FileModel } from '../../common/models/file.model'; import { FileUploadErrorEvent } from '../../common/events/file.event'; +import { NoopAuthModule } from '@alfresco/adf-core'; +import { provideApiTesting } from '../../testing/providers'; const getFakeShareDataRow = (allowableOperations = ['delete', 'update', 'create']) => ({ obj: { @@ -105,7 +106,8 @@ describe('UploadDragAreaComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule] + imports: [NoopAuthModule, UploadDragAreaComponent], + providers: [provideApiTesting()] }); fixture = TestBed.createComponent(UploadDragAreaComponent); uploadService = TestBed.inject(UploadService); 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 785be1c8ec..b667003f13 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,8 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { VersionComparisonComponent } from './version-comparison.component'; -import { ContentTestingModule } from '../testing/content.testing.module'; -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { Node } from '@alfresco/js-api'; describe('VersionComparisonComponent', () => { @@ -51,8 +49,7 @@ describe('VersionComparisonComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + imports: [VersionComparisonComponent] }); fixture = TestBed.createComponent(VersionComparisonComponent); component = fixture.componentInstance; 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 ea00e43634..a73f152f12 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 @@ -15,17 +15,17 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { VersionListComponent, VersionListDataSource } from './version-list.component'; import { MatDialog } from '@angular/material/dialog'; import { of } from 'rxjs'; import { Node, NodeEntry, VersionEntry, Version } from '@alfresco/js-api'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { ContentVersionService } from './content-version.service'; import { take } from 'rxjs/operators'; import { CdkFixedSizeVirtualScroll } from '@angular/cdk/scrolling'; +import { NoopAuthModule } from '@alfresco/adf-core'; +import { provideApiTesting } from '../testing/providers'; describe('VersionListComponent', () => { let component: VersionListComponent; @@ -48,8 +48,8 @@ describe('VersionListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + imports: [NoopAuthModule, VersionListComponent], + providers: [provideApiTesting()] }); fixture = TestBed.createComponent(VersionListComponent); dialog = TestBed.inject(MatDialog); 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 f49d758167..50c8394fe7 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 @@ -15,13 +15,12 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Node, Version, VersionEntry, VersionPaging } from '@alfresco/js-api'; import { VersionManagerComponent } from './version-manager.component'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { NodesApiService } from '../common/services/nodes-api.service'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('VersionManagerComponent', () => { let component: VersionManagerComponent; @@ -39,8 +38,7 @@ describe('VersionManagerComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + imports: [NoopAuthModule, VersionManagerComponent] }); fixture = TestBed.createComponent(VersionManagerComponent); component = fixture.componentInstance; 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 b76abbfddc..1aac0c3dcd 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 @@ -15,16 +15,16 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { VersionUploadComponent } from './version-upload.component'; -import { ContentTestingModule } from '../testing/content.testing.module'; import { Node } from '@alfresco/js-api'; import { UploadService } from '../common/services/upload.service'; import { ContentService } from '../common/services/content.service'; import { Subject } from 'rxjs'; -import { FileUploadErrorEvent, FileUploadEvent, UploadVersionButtonComponent } from '@alfresco/adf-content-services'; import { By } from '@angular/platform-browser'; +import { UploadVersionButtonComponent } from '../upload'; +import { FileUploadErrorEvent, FileUploadEvent } from '../common'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('VersionUploadComponent', () => { let component: VersionUploadComponent; @@ -51,9 +51,7 @@ describe('VersionUploadComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - providers: [UploadService], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + imports: [NoopAuthModule, VersionUploadComponent] }); fixture = TestBed.createComponent(VersionUploadComponent); component = fixture.componentInstance; 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 70f0463a3c..1c2e60df17 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 @@ -26,13 +26,13 @@ import { EventMock, ViewUtilService, ViewerComponent, - VIEWER_DIRECTIVES, ViewerSidebarComponent, ViewerToolbarComponent, ViewerOpenWithComponent, ViewerMoreActionsComponent, ViewerToolbarActionsComponent, - NoopAuthModule + NoopAuthModule, + NoopTranslateModule } from '@alfresco/adf-core'; import { NodesApiService } from '../../common/services/nodes-api.service'; import { UploadService } from '../../common/services/upload.service'; @@ -47,8 +47,7 @@ import { MatButtonModule } from '@angular/material/button'; import { AlfrescoViewerComponent } from './alfresco-viewer.component'; import { RenditionService } from '../../common/services/rendition.service'; import { NodeActionsService } from '../../document-list/services/node-actions.service'; -import { ContentTestingModule } from '../../testing/content.testing.module'; -import { ContentService } from '../../common/services/content.service'; +import { provideApiTesting } from '../../testing/providers'; @Component({ selector: 'adf-viewer-container-toolbar', @@ -180,19 +179,9 @@ describe('AlfrescoViewerComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - ContentTestingModule, - NoopAuthModule, - MatDialogModule, - ...VIEWER_DIRECTIVES, - ViewerWithCustomToolbarComponent, - ViewerWithCustomSidebarComponent, - ViewerWithCustomOpenWithComponent, - ViewerWithCustomMoreActionsComponent, - ViewerWithCustomToolbarActionsComponent - ], + imports: [NoopAuthModule, NoopTranslateModule, MatDialogModule, AlfrescoViewerComponent], providers: [ - ContentService, + provideApiTesting(), { provide: RenditionService, useValue: { diff --git a/lib/content-services/src/public-api.ts b/lib/content-services/src/public-api.ts index aa031f92d0..3762d1f1b4 100644 --- a/lib/content-services/src/public-api.ts +++ b/lib/content-services/src/public-api.ts @@ -54,4 +54,3 @@ export * from './lib/search-ai/index'; export * from './lib/content.module'; export * from './lib/material.module'; -export * from './lib/testing/content.testing.module';