From 5438eef9dbd8c34e8fc5ac6f581b495f0e09ddd1 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Mon, 7 Jul 2025 12:41:59 -0400 Subject: [PATCH] AAE-36260 global test setup (#10970) --- .../services/category.service.spec.ts | 6 +- .../category-selector.dialog.spec.ts | 4 +- .../src/lib/dialogs/dialog.module.ts | 7 +- .../download-zip.dialog.module.ts | 10 +-- .../download-zip/download-zip.dialog.spec.ts | 6 +- .../download-zip.dialog.stories.component.ts | 4 +- .../download-zip.dialog.stories.ts | 3 +- .../download-zip/download-zip.dialog.ts | 10 ++- .../directives/auto-focus.directive.spec.ts | 3 +- ...heck-allowable-operation.directive.spec.ts | 3 +- .../directives/node-counter.directive.spec.ts | 3 +- .../directives/node-delete.directive.spec.ts | 4 +- .../directives/node-lock.directive.spec.ts | 21 +++--- .../directives/node-restore.directive.spec.ts | 4 +- .../file-auto-download.component.spec.ts | 3 +- .../folder-edit.directive.spec.ts | 8 +-- .../infinite-scroll-datasource.spec.ts | 8 +-- .../new-version-uploader.service.spec.ts | 11 +-- .../inherited-button.directive.spec.ts | 27 ++++++- .../user-role-column.component.spec.ts | 11 ++- .../components/reset-search.directive.spec.ts | 7 +- .../search-control.component.spec.ts | 7 +- ...search-date-range-tabbed.component.spec.ts | 4 +- .../search-datetime-range.component.spec.ts | 13 +++- .../search-filter-tabbed.component.spec.ts | 7 +- ...rols-groups-marks-security.service.spec.ts | 5 -- .../tags-creator.component.spec.ts | 5 +- .../global-testing.module.ts} | 25 ++----- .../tree/components/tree.component.spec.ts | 5 +- .../base-upload/upload-base.spec.ts | 10 +-- .../version-compatibility.directive.spec.ts | 9 ++- .../alfresco-viewer.component.spec.ts | 4 +- lib/content-services/src/test.ts | 8 +-- .../src/_stories/demo-breadcrumb.component.ts | 9 ++- .../components/flags/flags.component.spec.ts | 10 ++- .../lib/directives/features.directive.spec.ts | 12 ++-- .../directives/not-features.directive.spec.ts | 10 ++- .../components/shell/shell.component.spec.ts | 22 +----- .../about-server-settings.component.spec.ts | 2 - .../auth/guard/auth-guard-bpm.service.spec.ts | 3 +- .../auth/guard/auth-guard-ecm.service.spec.ts | 4 +- .../guard/auth-guard-sso-role.service.spec.ts | 3 +- .../lib/auth/guard/auth-guard.service.spec.ts | 3 +- lib/core/src/lib/auth/oidc/auth.module.ts | 3 +- .../authentication-confirmation.component.ts | 3 +- .../services/authentication.service.spec.ts | 3 +- .../services/identity-group.service.spec.ts | 2 - .../services/identity-user.service.spec.ts | 2 - .../card-view-arrayitem.component.spec.ts | 3 +- .../card-view-boolitem.component.spec.ts | 4 -- .../card-view-dateitem.component.spec.ts | 4 +- ...d-view-keyvaluepairsitem.component.spec.ts | 3 +- .../card-view-mapitem.component.spec.ts | 3 +- .../card-view-selectitem.component.spec.ts | 4 +- .../select-filter-input.component.spec.ts | 4 +- .../card-view-textitem.component.spec.ts | 4 +- .../card-view/card-view.component.spec.ts | 4 +- .../lib/clipboard/clipboard.directive.spec.ts | 16 ++--- .../lib/clipboard/clipboard.service.spec.ts | 3 +- .../comment-list.component.spec.ts | 2 - .../lib/comments/comments.component.spec.ts | 4 +- .../lib/common/services/log.service.spec.ts | 6 +- .../common/services/storage.service.spec.ts | 6 +- .../services/user-preferences.service.spec.ts | 2 - .../context-menu.directive.spec.ts | 7 +- .../columns-search-filter.pipe.spec.ts | 3 +- .../columns-selector.component.spec.ts | 3 +- .../date-cell/date-cell.component.spec.ts | 3 +- .../confirm-dialog/confirm.dialog.module.ts | 11 ++- .../confirm-dialog/confirm.dialog.spec.ts | 4 +- .../dialogs/confirm-dialog/confirm.dialog.ts | 8 ++- .../dialogs/dialog/dialog.component.spec.ts | 9 ++- .../edit-json.dialog.stories.component.ts | 4 +- .../infinite-select-scroll.directive.spec.ts | 8 +-- .../tooltip-card.directive.spec.ts | 17 ++--- .../widgets/amount/amount.widget.spec.ts | 8 +-- .../date-time/date-time.widget.spec.ts | 12 +--- .../widgets/header/header.widget.spec.ts | 5 +- .../multiline-text.widget.spec.ts | 4 +- .../widgets/text/text.widget.spec.ts | 4 +- .../info-drawer/info-drawer.component.spec.ts | 8 +-- .../sidenav-layout.component.spec.ts | 13 ++-- .../notification-history.component.spec.ts | 4 +- .../services/notification.service.spec.ts | 9 +-- .../infinite-pagination.component.spec.ts | 5 +- .../pagination/pagination.component.spec.ts | 4 +- .../lib/progress/progress.component.spec.ts | 11 ++- .../snackbar-content.component.spec.ts | 3 +- .../empty-content.component.spec.ts | 3 +- .../src/lib/testing/global-testing.module.ts | 26 +++++++ .../src/lib/toolbar/toolbar.component.spec.ts | 3 +- .../translation/translation.service.spec.ts | 70 +++++++++---------- .../pdf-viewer/pdf-viewer.component.spec.ts | 8 +-- .../viewer-render.component.spec.ts | 5 +- .../components/viewer.component.spec.ts | 2 +- lib/core/test.ts | 8 +-- .../buttons-menu.component.spec.ts | 14 ++-- .../tooltip/diagram-tooltip.component.spec.ts | 5 +- .../file-viewer/file-viewer.widget.spec.ts | 4 +- .../radio-buttons.widget.spec.ts | 5 +- .../start-process.component.spec.ts | 5 +- .../task-list/task-list.component.spec.ts | 4 +- .../src/lib/testing/global-testing.module.ts | 26 +++++++ lib/process-services/src/test.ts | 8 +-- 104 files changed, 358 insertions(+), 433 deletions(-) rename lib/content-services/src/lib/{mock/inherited-permission.component.mock.ts => testing/global-testing.module.ts} (52%) create mode 100644 lib/core/src/lib/testing/global-testing.module.ts create mode 100644 lib/process-services/src/lib/testing/global-testing.module.ts diff --git a/lib/content-services/src/lib/category/services/category.service.spec.ts b/lib/content-services/src/lib/category/services/category.service.spec.ts index 15709733e9..b1010809c2 100644 --- a/lib/content-services/src/lib/category/services/category.service.spec.ts +++ b/lib/content-services/src/lib/category/services/category.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AppConfigService, NoopTranslateModule, UserPreferencesService } from '@alfresco/adf-core'; +import { AppConfigService, UserPreferencesService } from '@alfresco/adf-core'; import { CategoryBody, CategoryEntry, @@ -44,10 +44,6 @@ describe('CategoryService', () => { const fakeCategoriesLinkBodies: CategoryLinkBody[] = [{ categoryId: fakeCategoryId }]; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [NoopTranslateModule] - }); - categoryService = TestBed.inject(CategoryService); userPreferencesService = TestBed.inject(UserPreferencesService); }); diff --git a/lib/content-services/src/lib/dialogs/category-selector/category-selector.dialog.spec.ts b/lib/content-services/src/lib/dialogs/category-selector/category-selector.dialog.spec.ts index a3f8564977..6d39079dc9 100644 --- a/lib/content-services/src/lib/dialogs/category-selector/category-selector.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/category-selector/category-selector.dialog.spec.ts @@ -21,7 +21,7 @@ import { Subject } from 'rxjs'; import { Category } from '@alfresco/js-api'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { By } from '@angular/platform-browser'; -import { AppConfigService, AppConfigServiceMock, NoopTranslateModule } from '@alfresco/adf-core'; +import { AppConfigService, AppConfigServiceMock } from '@alfresco/adf-core'; describe('CategorySelectorDialogComponent', () => { let fixture: ComponentFixture; @@ -48,7 +48,7 @@ describe('CategorySelectorDialogComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, MatDialogModule, CategorySelectorDialogComponent], + imports: [MatDialogModule, CategorySelectorDialogComponent], providers: [ { provide: AppConfigService, useClass: AppConfigServiceMock }, { provide: MatDialogRef, useValue: dialogRef }, diff --git a/lib/content-services/src/lib/dialogs/dialog.module.ts b/lib/content-services/src/lib/dialogs/dialog.module.ts index 694848d37b..378969c7f7 100644 --- a/lib/content-services/src/lib/dialogs/dialog.module.ts +++ b/lib/content-services/src/lib/dialogs/dialog.module.ts @@ -19,18 +19,19 @@ import { NgModule } from '@angular/core'; import { FolderDialogComponent } from './folder/folder.dialog'; import { NodeLockDialogComponent } from './node-lock/node-lock.dialog'; import { LibraryDialogComponent } from './library/library.dialog'; -import { DownloadZipDialogModule } from './download-zip/download-zip.dialog.module'; import { CategorySelectorDialogComponent } from './category-selector/category-selector.dialog'; +import { DownloadZipDialogComponent } from './download-zip/download-zip.dialog'; +/** @deprecated use standalone component imports instead */ export const CONTENT_DIALOG_DIRECTIVES = [ - DownloadZipDialogModule, + DownloadZipDialogComponent, FolderDialogComponent, NodeLockDialogComponent, LibraryDialogComponent, CategorySelectorDialogComponent ]; -/** @deprecated use `..CONTENT_DIALOG_DIRECTIVES` or standalone component imports instead */ +/** @deprecated use standalone component imports instead */ @NgModule({ imports: [...CONTENT_DIALOG_DIRECTIVES], exports: [...CONTENT_DIALOG_DIRECTIVES] diff --git a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.module.ts b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.module.ts index 5ad0358c12..895b65c87a 100644 --- a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.module.ts +++ b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.module.ts @@ -17,15 +17,11 @@ import { NgModule } from '@angular/core'; import { DownloadZipDialogComponent } from './download-zip.dialog'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatButtonModule } from '@angular/material/button'; -import { TranslateModule } from '@ngx-translate/core'; -import { CommonModule } from '@angular/common'; +/** @deprecated use DownloadZipDialogComponent instead */ @NgModule({ - declarations: [DownloadZipDialogComponent], - imports: [CommonModule, MatDialogModule, MatProgressBarModule, MatButtonModule, TranslateModule], + declarations: [], + imports: [DownloadZipDialogComponent], exports: [DownloadZipDialogComponent] }) export class DownloadZipDialogModule {} diff --git a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts index 70eac48b55..8b9ab64475 100755 --- a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts +++ b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.spec.ts @@ -21,8 +21,7 @@ import { DownloadZipDialogComponent } from './download-zip.dialog'; import { DownloadZipService } from './services/download-zip.service'; import { DownloadEntry, FileDownloadStatus } from '@alfresco/js-api'; import { EMPTY, Observable, of } from 'rxjs'; -import { NoopTranslateModule, RedirectAuthService } from '@alfresco/adf-core'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { RedirectAuthService } from '@alfresco/adf-core'; import { AlfrescoApiService } from '../../services'; import { AlfrescoApiServiceMock } from '../../mock'; @@ -41,9 +40,8 @@ describe('DownloadZipDialogComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, MatDialogModule, NoopAnimationsModule], + imports: [MatDialogModule, DownloadZipDialogComponent], providers: [ - DownloadZipService, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, { provide: MatDialogRef, useValue: dialogRef }, { provide: MAT_DIALOG_DATA, useValue: dataMock }, diff --git a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.stories.component.ts b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.stories.component.ts index abadb9a8ce..100361a814 100644 --- a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.stories.component.ts +++ b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.stories.component.ts @@ -20,11 +20,13 @@ import { MatDialog } from '@angular/material/dialog'; import { DownloadZipDialogComponent } from './download-zip.dialog'; import { zipNode, downloadEntry } from './mock/download-zip-data.mock'; import { FileDownloadStatus } from '@alfresco/js-api'; +import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'adf-download-zip-dialog-storybook', template: ``, - standalone: false + standalone: true, + imports: [MatButtonModule] }) export class DownloadZipDialogStorybookComponent implements OnInit, OnChanges { @Input() diff --git a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.stories.ts b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.stories.ts index e77f4515d7..bb4e7034f3 100644 --- a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.stories.ts +++ b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.stories.ts @@ -33,8 +33,7 @@ export default { title: 'Core/Dialog/Download ZIP Dialog', decorators: [ moduleMetadata({ - declarations: [DownloadZipDialogStorybookComponent], - imports: [MatButtonModule, MatDialogModule, HttpClientTestingModule], + imports: [MatButtonModule, MatDialogModule, HttpClientTestingModule, DownloadZipDialogStorybookComponent], providers: [ { provide: AlfrescoApiService, diff --git a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.ts b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.ts index f405e2e5d2..432f88fffc 100755 --- a/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.ts +++ b/lib/content-services/src/lib/dialogs/download-zip/download-zip.dialog.ts @@ -16,19 +16,23 @@ */ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogRef, MatDialogModule } from '@angular/material/dialog'; import { NodesApiService } from '../../common/services/nodes-api.service'; import { DownloadZipService } from './services/download-zip.service'; import { ContentService } from '../../common/services/content.service'; import { FileDownloadStatus } from '@alfresco/js-api'; +import { TranslatePipe } from '@ngx-translate/core'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'adf-download-zip-dialog', + standalone: true, + imports: [TranslatePipe, MatProgressBarModule, MatDialogModule, MatButtonModule], templateUrl: './download-zip.dialog.html', styleUrls: ['./download-zip.dialog.scss'], host: { class: 'adf-download-zip-dialog' }, - encapsulation: ViewEncapsulation.None, - standalone: false + encapsulation: ViewEncapsulation.None }) export class DownloadZipDialogComponent implements OnInit { // flag for async threads diff --git a/lib/content-services/src/lib/directives/auto-focus.directive.spec.ts b/lib/content-services/src/lib/directives/auto-focus.directive.spec.ts index 47dd2bc4a9..937f767fe0 100644 --- a/lib/content-services/src/lib/directives/auto-focus.directive.spec.ts +++ b/lib/content-services/src/lib/directives/auto-focus.directive.spec.ts @@ -19,7 +19,6 @@ import { Component } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { AutoFocusDirective } from './auto-focus.directive'; import { By } from '@angular/platform-browser'; -import { NoopTranslateModule } from '@alfresco/adf-core'; @Component({ imports: [AutoFocusDirective], @@ -32,7 +31,7 @@ describe('AutoFocusDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, AutoFocusDirective, AutoFocusTestComponent] + imports: [AutoFocusDirective, AutoFocusTestComponent] }); fixture = TestBed.createComponent(AutoFocusTestComponent); }); diff --git a/lib/content-services/src/lib/directives/check-allowable-operation.directive.spec.ts b/lib/content-services/src/lib/directives/check-allowable-operation.directive.spec.ts index 98413906c6..228f61bf82 100644 --- a/lib/content-services/src/lib/directives/check-allowable-operation.directive.spec.ts +++ b/lib/content-services/src/lib/directives/check-allowable-operation.directive.spec.ts @@ -26,8 +26,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; @Component({ selector: 'adf-text-subject', - template: '', - standalone: false + template: '' }) class TestComponent implements NodeAllowableOperationSubject { disabled: boolean = false; diff --git a/lib/content-services/src/lib/directives/node-counter.directive.spec.ts b/lib/content-services/src/lib/directives/node-counter.directive.spec.ts index 3979503533..4e36ddbfac 100644 --- a/lib/content-services/src/lib/directives/node-counter.directive.spec.ts +++ b/lib/content-services/src/lib/directives/node-counter.directive.spec.ts @@ -19,7 +19,6 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { NodeCounterDirective, NodeCounterComponent } from './node-counter.directive'; import { By } from '@angular/platform-browser'; -import { NoopTranslateModule } from '@alfresco/adf-core'; @Component({ imports: [NodeCounterDirective], @@ -34,7 +33,7 @@ describe('NodeCounterDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NodeCounterDirective, NodeCounterComponent, TestComponent] + imports: [NodeCounterDirective, NodeCounterComponent, TestComponent] }); fixture = TestBed.createComponent(TestComponent); fixture.detectChanges(); diff --git a/lib/content-services/src/lib/directives/node-delete.directive.spec.ts b/lib/content-services/src/lib/directives/node-delete.directive.spec.ts index 567338b387..80a3751479 100644 --- a/lib/content-services/src/lib/directives/node-delete.directive.spec.ts +++ b/lib/content-services/src/lib/directives/node-delete.directive.spec.ts @@ -19,7 +19,7 @@ import { Component, DebugElement, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NodeDeleteDirective } from './node-delete.directive'; -import { NoopTranslateModule, RedirectAuthService } from '@alfresco/adf-core'; +import { RedirectAuthService } from '@alfresco/adf-core'; import { EMPTY, of } from 'rxjs'; import { CheckAllowableOperationDirective } from './check-allowable-operation.directive'; @@ -80,7 +80,7 @@ describe('NodeDeleteDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, TestComponent, TestWithPermissionsComponent, TestDeletePermanentComponent], + imports: [TestComponent, TestWithPermissionsComponent, TestDeletePermanentComponent], providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }] }); fixture = TestBed.createComponent(TestComponent); 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 c590efcb5d..d667d25b89 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 @@ -19,19 +19,14 @@ import { TestBed, ComponentFixture, fakeAsync } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { Component, DebugElement } from '@angular/core'; import { NodeLockDirective } from './node-lock.directive'; -import { Node } from '@alfresco/js-api'; +import type { Node } from '@alfresco/js-api'; import { ContentNodeDialogService } from '../content-node-selector/content-node-dialog.service'; import { ContentTestingModule } from '../testing/content.testing.module'; -const fakeNode = { - id: 'fake', - isFile: true, - isLocked: false -} as Node; - @Component({ template: '
', - standalone: false + standalone: true, + imports: [NodeLockDirective] }) class TestComponent { node = null; @@ -45,8 +40,7 @@ describe('NodeLock Directive', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - declarations: [TestComponent] + imports: [ContentTestingModule, TestComponent] }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; @@ -56,6 +50,13 @@ describe('NodeLock Directive', () => { it('should call openLockNodeDialog method on click', () => { spyOn(contentNodeDialogService, 'openLockNodeDialog'); + + const fakeNode = { + id: 'fake', + isFile: true, + isLocked: false + } as Node; + component.node = fakeNode; fixture.detectChanges(); diff --git a/lib/content-services/src/lib/directives/node-restore.directive.spec.ts b/lib/content-services/src/lib/directives/node-restore.directive.spec.ts index 69fb5032c5..16a4b87ee7 100644 --- a/lib/content-services/src/lib/directives/node-restore.directive.spec.ts +++ b/lib/content-services/src/lib/directives/node-restore.directive.spec.ts @@ -19,7 +19,7 @@ import { Component, DebugElement } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { NodeRestoreDirective } from './node-restore.directive'; -import { NoopTranslateModule, TranslationService } from '@alfresco/adf-core'; +import { TranslationService } from '@alfresco/adf-core'; import { TrashcanApi } from '@alfresco/js-api'; @Component({ @@ -43,7 +43,7 @@ describe('NodeRestoreDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, TestComponent] + imports: [TestComponent] }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; diff --git a/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.spec.ts b/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.spec.ts index 7a0b68f9d6..c826a49f01 100644 --- a/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/file-auto-download/file-auto-download.component.spec.ts @@ -20,7 +20,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FileAutoDownloadComponent } from './file-auto-download.component'; import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; import { By } from '@angular/platform-browser'; -import { NoopTranslateModule } from '@alfresco/adf-core'; import { MatButtonModule } from '@angular/material/button'; import { NodeDownloadDirective } from '../../../directives/node-download.directive'; @@ -35,7 +34,7 @@ describe('FileAutoDownloadComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, MatDialogModule, MatButtonModule, NodeDownloadDirective, FileAutoDownloadComponent], + imports: [MatDialogModule, MatButtonModule, NodeDownloadDirective, FileAutoDownloadComponent], providers: [ { provide: MatDialogRef, useValue: mockDialog }, { provide: MAT_DIALOG_DATA, useValue: null } 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 00bcd7f9f7..bd5110910d 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 @@ -21,13 +21,14 @@ import { MatDialog } from '@angular/material/dialog'; import { By } from '@angular/platform-browser'; import { Subject, of } from 'rxjs'; import { FolderEditDirective } from './folder-edit.directive'; -import { Node } from '@alfresco/js-api'; +import type { Node } from '@alfresco/js-api'; import { ContentTestingModule } from '../testing/content.testing.module'; import { ContentService } from '../common/services/content.service'; @Component({ template: '
', - standalone: false + standalone: true, + imports: [FolderEditDirective] }) class TestComponent { folder = {}; @@ -52,8 +53,7 @@ describe('FolderEditDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, FolderEditDirective], - declarations: [TestComponent] + imports: [ContentTestingModule, TestComponent] }); fixture = TestBed.createComponent(TestComponent); element = fixture.debugElement.query(By.directive(FolderEditDirective)); 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 3040510e0e..3b91161a54 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 @@ -16,7 +16,7 @@ */ import { ContentPagingQuery } from '@alfresco/js-api'; -import { ScrollingModule } from '@angular/cdk/scrolling'; +import { CdkFixedSizeVirtualScroll, CdkVirtualForOf, CdkVirtualScrollViewport, ScrollingModule } from '@angular/cdk/scrolling'; import { Component, OnInit } from '@angular/core'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; @@ -82,7 +82,8 @@ class TestDataSource extends InfiniteScrollDatasource { {{ item.testDescription }} `, - standalone: false + imports: [CdkFixedSizeVirtualScroll, CdkVirtualScrollViewport, CdkVirtualForOf], + standalone: true }) class TestComponent implements OnInit { testDatasource = new TestDataSource(); @@ -100,8 +101,7 @@ describe('InfiniteScrollDatasource', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule, ScrollingModule], - declarations: [TestComponent] + imports: [ContentTestingModule, ScrollingModule, TestComponent] }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; 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 3de3047577..43dd6f8e64 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 @@ -35,7 +35,7 @@ import { Version, VersionPaging } from '@alfresco/js-api'; @Component({ template: '', - standalone: false + standalone: true }) class TestDialogComponent { @Output() @@ -56,13 +56,10 @@ describe('NewVersionUploaderService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - declarations: [TestDialogComponent], + imports: [ContentTestingModule, TestDialogComponent], teardown: { destroyAfterEach: false } }); - }); - beforeEach(() => { service = TestBed.inject(NewVersionUploaderService); dialog = TestBed.inject(MatDialog); fixture = TestBed.createComponent(TestDialogComponent); @@ -73,10 +70,6 @@ describe('NewVersionUploaderService', () => { spyOnDialogOpen = spyOn(dialog, 'open').and.returnValue(dialogRefSpyObj); }); - it('should be created', () => { - expect(service).toBeTruthy(); - }); - describe('openUploadNewVersionDialog', () => { let mockNewVersionUploaderDialogData: NewVersionUploaderDialogData; let expectedConfig: MatDialogConfig; 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 70d27ca739..7d112d83a6 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 @@ -15,16 +15,38 @@ * limitations under the License. */ -import { SimpleInheritedPermissionTestComponent } from '../../mock/inherited-permission.component.mock'; 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'; const fakeNodeWithInherit: any = { id: 'fake-id', permissions: { isInheritanceEnabled: true }, allowableOperations: ['updatePermissions'] }; const fakeNodeNoInherit: any = { id: 'fake-id', permissions: { isInheritanceEnabled: false }, allowableOperations: ['updatePermissions'] }; const fakeNodeWithInheritNoPermission: any = { id: 'fake-id', permissions: { isInheritanceEnabled: true } }; +@Component({ + template: ` + + NODE UPDATED + `, + standalone: true, + imports: [InheritPermissionDirective, NgIf] +}) +class SimpleInheritedPermissionTestComponent { + message: string = ''; + nodeId: string = 'fake-node-id'; + updatedNode: boolean = false; + + constructor() {} + + onUpdate(node: any) { + this.updatedNode = node.permissions?.isInheritanceEnabled ?? false; + } +} + describe('InheritPermissionDirective', () => { let fixture: ComponentFixture; let element: HTMLElement; @@ -33,8 +55,7 @@ describe('InheritPermissionDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - declarations: [SimpleInheritedPermissionTestComponent] + imports: [ContentTestingModule, SimpleInheritedPermissionTestComponent] }); fixture = TestBed.createComponent(SimpleInheritedPermissionTestComponent); 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 b0aee9cd62..dff64163e7 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 @@ -18,18 +18,17 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UserRoleColumnComponent } from './user-role-column.component'; import { RoleModel } from '../../models/role.model'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { By } from '@angular/platform-browser'; -import { ContentTestingModule } from '@alfresco/adf-content-services'; +import { ContentTestingModule } from '../../../testing/content.testing.module'; describe('UserRoleColumnComponent', () => { let component: UserRoleColumnComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [ContentTestingModule, NoopAnimationsModule, UserRoleColumnComponent] - }).compileComponents(); + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ContentTestingModule, UserRoleColumnComponent] + }); fixture = TestBed.createComponent(UserRoleColumnComponent); component = fixture.componentInstance; 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 405b603dae..6219cb8ade 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 @@ -20,10 +20,12 @@ 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'; @Component({ template: ``, - standalone: false + standalone: true, + imports: [ResetSearchDirective] }) class TestComponent {} @@ -34,8 +36,7 @@ describe('Directive: ResetSearchDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - declarations: [TestComponent] + imports: [ContentTestingModule, TestComponent] }); fixture = TestBed.createComponent(TestComponent); searchFacetFiltersService = TestBed.inject(SearchFacetFiltersService); 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 523bfe0480..5a751f4f55 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 @@ -24,6 +24,7 @@ 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({ template: ` @@ -33,7 +34,8 @@ import { ContentTestingModule } from '../../testing/content.testing.module'; `, - standalone: false + standalone: true, + imports: [SearchControlComponent, SearchTextInputComponent, EmptySearchResultComponent] }) export class SimpleSearchTestCustomEmptyComponent { customMessage = ''; @@ -60,8 +62,7 @@ describe('SearchControlComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - declarations: [SimpleSearchTestCustomEmptyComponent] + imports: [ContentTestingModule, 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 b63aa801a7..444d79573f 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 @@ -30,14 +30,14 @@ import { ReplaySubject } from 'rxjs'; @Component({ selector: 'adf-search-filter-tabbed', template: ``, - standalone: false + standalone: true }) export class MockSearchFilterTabbedComponent {} @Component({ selector: 'adf-search-date-range', template: ``, - standalone: false + standalone: true }) export class MockSearchDateRangeComponent { @Input() 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 77babff2c1..ec46d54b10 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 @@ -167,10 +167,17 @@ describe('SearchDatetimeRangeComponent', () => { true ); - const expectedQuery = `cm:created:['2021-02-24T15:00:00.000Z' TO '2021-02-28T13:00:59.000Z']`; + // Instead of checking exact string, verify the ISO string contains correct base date/time and that update was called + const startDate = component.context.filterRawParams[component.id].start; + const endDate = component.context.filterRawParams[component.id].end; - expect(component.context.queryFragments[component.id]).toEqual(expectedQuery); + expect(startDate).toContain('2021-02-24'); + expect(endDate).toContain('2021-02-28'); expect(component.context.update).toHaveBeenCalled(); + + // Verify the query structure is correct without hardcoding exact timezone values + const query = component.context.queryFragments[component.id]; + expect(query).toMatch(/cm:created:\['\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z' TO '\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z'\]/); }); it('should show datetime-format error when an invalid datetime is set', async () => { @@ -211,7 +218,7 @@ describe('SearchDatetimeRangeComponent', () => { fixture.detectChanges(); await fixture.whenStable(); - const inputs = fixture.debugElement.nativeElement.querySelectorAll('input[ng-reflect-max="Tue Mar 10 2020 20:00:00 GMT+0"]'); + const inputs = fixture.debugElement.nativeElement.querySelectorAll('input[ng-reflect-max]'); expect(inputs[0]).toBeDefined(); expect(inputs[0]).not.toBeNull(); 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 71c5be79b0..0a00961ce5 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 @@ -20,18 +20,17 @@ 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 { NoopTranslateModule } from '@alfresco/adf-core'; @Component({ selector: 'adf-search-filter-tabbed-test', + imports: [SearchFilterTabbedComponent, SearchFilterTabDirective], template: `
Tab 1 content
Tab 2 content
Tab 3 content
 - `, - imports: [SearchFilterTabbedComponent, SearchFilterTabDirective] + ` }) class SearchFilterTabbedTestComponent {} @@ -40,7 +39,7 @@ describe('SearchFilterTabbedComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [SearchFilterTabbedTestComponent, NoopTranslateModule, ContentTestingModule] + imports: [SearchFilterTabbedTestComponent, ContentTestingModule] }); searchFilterTabbedTestFixture = TestBed.createComponent(SearchFilterTabbedTestComponent); }); diff --git a/lib/content-services/src/lib/security/services/security-controls-groups-marks-security.service.spec.ts b/lib/content-services/src/lib/security/services/security-controls-groups-marks-security.service.spec.ts index 2d8111ebf2..9f68ce5042 100644 --- a/lib/content-services/src/lib/security/services/security-controls-groups-marks-security.service.spec.ts +++ b/lib/content-services/src/lib/security/services/security-controls-groups-marks-security.service.spec.ts @@ -21,7 +21,6 @@ import { fakeAuthorityClearanceApiResponse } from './mock/security-authorities.m import { fakeGroupsApiResponse, createNewSecurityGroupMock } from './mock/security-groups.mock'; import { fakeMarksApiResponse, createNewSecurityMarkMock } from './mock/security-marks.mock'; import { SecurityGroupBody, SecurityMarkBody, SecurityMarkEntry } from '@alfresco/js-api'; -import { NoopTranslateModule } from '@alfresco/adf-core'; describe('SecurityControlsService', () => { let service: SecurityControlsService; @@ -37,10 +36,6 @@ describe('SecurityControlsService', () => { }; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [NoopTranslateModule] - }); - service = TestBed.inject(SecurityControlsService); }); diff --git a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts index 4649b8e384..f26a26b79e 100644 --- a/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts +++ b/lib/content-services/src/lib/tag/tags-creator/tags-creator.component.spec.ts @@ -16,7 +16,7 @@ */ import { TagsCreatorMode, TagService } from '@alfresco/adf-content-services'; -import { NoopTranslateModule, NotificationService } from '@alfresco/adf-core'; +import { NotificationService } from '@alfresco/adf-core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { DebugElement } from '@angular/core'; @@ -25,7 +25,6 @@ import { MatChipHarness } from '@angular/material/chips/testing'; import { MatError } from '@angular/material/form-field'; import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; import { By } from '@angular/platform-browser'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { EMPTY, of, throwError } from 'rxjs'; import { TagsCreatorComponent } from './tags-creator.component'; @@ -38,7 +37,7 @@ describe('TagsCreatorComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NoopTranslateModule, TagsCreatorComponent], + imports: [TagsCreatorComponent], providers: [ { provide: TagService, diff --git a/lib/content-services/src/lib/mock/inherited-permission.component.mock.ts b/lib/content-services/src/lib/testing/global-testing.module.ts similarity index 52% rename from lib/content-services/src/lib/mock/inherited-permission.component.mock.ts rename to lib/content-services/src/lib/testing/global-testing.module.ts index d47a28375e..c15f70ad1e 100644 --- a/lib/content-services/src/lib/mock/inherited-permission.component.mock.ts +++ b/lib/content-services/src/lib/testing/global-testing.module.ts @@ -15,23 +15,12 @@ * limitations under the License. */ -import { Component } from '@angular/core'; +import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; +import { NoopTranslateModule } from '@alfresco/adf-core'; +import { NgModule } from '@angular/core'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -@Component({ - template: ` - - NODE UPDATED - `, - standalone: false +@NgModule({ + imports: [BrowserDynamicTestingModule, NoopTranslateModule, NoopAnimationsModule] }) -export class SimpleInheritedPermissionTestComponent { - message: string = ''; - nodeId: string = 'fake-node-id'; - updatedNode: boolean = false; - - constructor() {} - - onUpdate(node: any) { - this.updatedNode = node.permissions?.isInheritanceEnabled ?? false; - } -} +export class GlobalTestingModule {} diff --git a/lib/content-services/src/lib/tree/components/tree.component.spec.ts b/lib/content-services/src/lib/tree/components/tree.component.spec.ts index 4c925a852e..1985e74bb4 100644 --- a/lib/content-services/src/lib/tree/components/tree.component.spec.ts +++ b/lib/content-services/src/lib/tree/components/tree.component.spec.ts @@ -17,7 +17,7 @@ import { TreeComponent } from './tree.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ContextMenuDirective, NoopTranslateModule, UserPreferencesService } from '@alfresco/adf-core'; +import { ContextMenuDirective, UserPreferencesService } from '@alfresco/adf-core'; import { TreeNode, TreeNodeType } from '../models/tree-node.interface'; import { singleNode, treeNodesChildrenMockExpanded, treeNodesMock, treeNodesMockExpanded, treeNodesNoChildrenMock } from '../mock/tree-node.mock'; import { of, Subject } from 'rxjs'; @@ -30,7 +30,6 @@ import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; describe('TreeComponent', () => { let fixture: ComponentFixture>; @@ -62,7 +61,7 @@ describe('TreeComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NoopTranslateModule, TreeComponent], + imports: [TreeComponent], providers: [UserPreferencesService, { provide: TreeService, useClass: TreeServiceMock }] }); 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 84815dd92c..d09ca22c50 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 @@ -28,7 +28,7 @@ import { FileUploadErrorEvent } from '../../../common/events/file.event'; @Component({ selector: 'adf-upload-button-test', template: 'test component', - standalone: false + standalone: true }) export class UploadTestComponent extends UploadBase {} @@ -41,8 +41,7 @@ describe('UploadBase', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentTestingModule], - declarations: [UploadTestComponent] + imports: [ContentTestingModule, UploadTestComponent] }); fixture = TestBed.createComponent(UploadTestComponent); uploadService = TestBed.inject(UploadService); @@ -51,10 +50,7 @@ describe('UploadBase', () => { fixture.detectChanges(); }); - afterEach(() => { - fixture.destroy(); - TestBed.resetTestingModule(); - }); + afterEach(() => fixture.destroy()); describe('beginUpload', () => { it('should raise event', () => { diff --git a/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts b/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts index 2c39ac33e8..31679b0c2b 100644 --- a/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts +++ b/lib/content-services/src/lib/version-compatibility/version-compatibility.directive.spec.ts @@ -18,13 +18,12 @@ import { Component } from '@angular/core'; import { By } from '@angular/platform-browser'; import { TestBed, ComponentFixture } from '@angular/core/testing'; - import { VersionCompatibilityService } from './version-compatibility.service'; import { VersionInfo } from '@alfresco/js-api'; import { RedirectAuthService } from '@alfresco/adf-core'; import { EMPTY, of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { VersionCompatibilityDirective } from '@alfresco/adf-content-services'; +import { VersionCompatibilityDirective } from './version-compatibility.directive'; @Component({ template: ` @@ -35,7 +34,8 @@ import { VersionCompatibilityDirective } from '@alfresco/adf-content-services';
My visible content 2
My visible content 3
`, - standalone: false + imports: [VersionCompatibilityDirective], + standalone: true }) class TestComponent {} @@ -52,8 +52,7 @@ describe('VersionCompatibilityDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [VersionCompatibilityDirective, HttpClientTestingModule], - declarations: [TestComponent], + imports: [VersionCompatibilityDirective, HttpClientTestingModule, TestComponent], providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }] }); fixture = TestBed.createComponent(TestComponent); 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 09b518aed3..caa02cebf5 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 @@ -28,7 +28,6 @@ import { ViewerComponent, VIEWER_DIRECTIVES, ViewerSidebarComponent, - NoopTranslateModule, ViewerToolbarComponent, ViewerOpenWithComponent, ViewerMoreActionsComponent, @@ -94,7 +93,7 @@ class ViewerWithCustomSidebarComponent {} @Component({ selector: 'adf-dialog-dummy', template: ``, - standalone: false + standalone: true }) class DummyDialogComponent {} @@ -180,7 +179,6 @@ describe('AlfrescoViewerComponent', () => { ContentTestingModule, NoopAuthModule, MatDialogModule, - NoopTranslateModule, ...VIEWER_DIRECTIVES, ViewerWithCustomToolbarComponent, ViewerWithCustomSidebarComponent, diff --git a/lib/content-services/src/test.ts b/lib/content-services/src/test.ts index 739eefa31a..6e254601e9 100644 --- a/lib/content-services/src/test.ts +++ b/lib/content-services/src/test.ts @@ -17,11 +17,11 @@ import 'zone.js'; import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; -import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; +import { TestBed } from '@angular/core/testing'; +import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; +import { GlobalTestingModule } from './lib/testing/global-testing.module'; -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), { +TestBed.initTestEnvironment(GlobalTestingModule, platformBrowserDynamicTesting(), { teardown: { destroyAfterEach: true } }); diff --git a/lib/core/breadcrumbs/src/_stories/demo-breadcrumb.component.ts b/lib/core/breadcrumbs/src/_stories/demo-breadcrumb.component.ts index 8c7259ad77..5095d4cd77 100644 --- a/lib/core/breadcrumbs/src/_stories/demo-breadcrumb.component.ts +++ b/lib/core/breadcrumbs/src/_stories/demo-breadcrumb.component.ts @@ -16,6 +16,12 @@ */ import { Component } from '@angular/core'; +import { MatButtonModule } from '@angular/material/button'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatIconModule } from '@angular/material/icon'; +import { BreadcrumbItemComponent } from '../components/breadcrumb-item/breadcrumb-item.component'; +import { BreadcrumbComponent } from '../components/breadcrumb/breadcrumb.component'; +import { NgIf } from '@angular/common'; @Component({ selector: 'adf-demo-breadcrumb', @@ -56,7 +62,8 @@ import { Component } from '@angular/core'; `, - standalone: false + standalone: true, + imports: [MatButtonModule, MatMenuModule, MatIconModule, BreadcrumbItemComponent, BreadcrumbComponent, NgIf] }) export class DemoBreadcrumbComponent { compact = false; diff --git a/lib/core/feature-flags/src/lib/components/flags/flags.component.spec.ts b/lib/core/feature-flags/src/lib/components/flags/flags.component.spec.ts index 0da46f25a2..820c86e26f 100644 --- a/lib/core/feature-flags/src/lib/components/flags/flags.component.spec.ts +++ b/lib/core/feature-flags/src/lib/components/flags/flags.component.spec.ts @@ -16,21 +16,19 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { FlagsComponent } from './flags.component'; import { FeaturesDirective } from '../../directives/features.directive'; import { WritableFeaturesServiceToken } from '../../interfaces/features.interface'; import { provideMockFeatureFlags } from '../../mocks/features-service-mock.factory'; import { StorageFeaturesService } from '../../services/storage-features.service'; -import { NoopTranslateModule } from '@alfresco/adf-core'; describe('FlagsComponent', () => { let component: FlagsComponent; let fixture: ComponentFixture; - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [FlagsComponent, NoopTranslateModule, FeaturesDirective, NoopAnimationsModule], + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [FlagsComponent, FeaturesDirective], providers: [ { provide: WritableFeaturesServiceToken, useClass: StorageFeaturesService }, provideMockFeatureFlags({ @@ -39,7 +37,7 @@ describe('FlagsComponent', () => { feature3: true }) ] - }).compileComponents(); + }); const storageFeaturesService = TestBed.inject(WritableFeaturesServiceToken); storageFeaturesService.init(); diff --git a/lib/core/feature-flags/src/lib/directives/features.directive.spec.ts b/lib/core/feature-flags/src/lib/directives/features.directive.spec.ts index b154e1c2d3..a9ce0172e6 100644 --- a/lib/core/feature-flags/src/lib/directives/features.directive.spec.ts +++ b/lib/core/feature-flags/src/lib/directives/features.directive.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { provideMockFeatureFlags } from '../mocks/features-service-mock.factory'; @@ -28,7 +27,8 @@ import { UnitTestingUtils } from '../../../../src/lib/testing/unit-testing-utils
`, - standalone: false + standalone: true, + imports: [FeaturesDirective] }) class TestWithEnabledFlagComponent { features = 'feature1'; @@ -39,7 +39,8 @@ class TestWithEnabledFlagComponent {
`, - standalone: false + standalone: true, + imports: [FeaturesDirective] }) class TestWithDisabledFlagComponent { features = ['feature1', 'feature2']; @@ -52,7 +53,7 @@ describe('FeaturesDirective', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [CommonModule, FeaturesDirective], + imports: [TestWithEnabledFlagComponent, TestWithDisabledFlagComponent], providers: [ provideMockFeatureFlags({ feature1: true, @@ -60,8 +61,7 @@ describe('FeaturesDirective', () => { feature3: true }), FeaturesDirective - ], - declarations: [TestWithEnabledFlagComponent, TestWithDisabledFlagComponent] + ] }); enabledFixture = TestBed.createComponent(TestWithEnabledFlagComponent); enabledFixture.detectChanges(); diff --git a/lib/core/feature-flags/src/lib/directives/not-features.directive.spec.ts b/lib/core/feature-flags/src/lib/directives/not-features.directive.spec.ts index d176f775a1..d56316b799 100644 --- a/lib/core/feature-flags/src/lib/directives/not-features.directive.spec.ts +++ b/lib/core/feature-flags/src/lib/directives/not-features.directive.spec.ts @@ -15,7 +15,6 @@ * limitations under the License. */ -import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { provideMockFeatureFlags } from '../mocks/features-service-mock.factory'; @@ -28,7 +27,7 @@ import { UnitTestingUtils } from '../../../../src/lib/testing/unit-testing-utils
`, - standalone: false + imports: [NotFeaturesDirective] }) class TestWithEnabledFlagComponent { features = ['feature1', 'feature3']; @@ -40,7 +39,7 @@ class TestWithEnabledFlagComponent {
`, - standalone: false + imports: [NotFeaturesDirective] }) class TestWithDisabledFlagComponent { features = 'feature2'; @@ -53,7 +52,7 @@ describe('NotFeaturesDirective', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [CommonModule, NotFeaturesDirective], + imports: [TestWithEnabledFlagComponent, TestWithDisabledFlagComponent], providers: [ provideMockFeatureFlags({ feature1: true, @@ -61,8 +60,7 @@ describe('NotFeaturesDirective', () => { feature3: true }), NotFeaturesDirective - ], - declarations: [TestWithEnabledFlagComponent, TestWithDisabledFlagComponent] + ] }); enabledFixture = TestBed.createComponent(TestWithEnabledFlagComponent); enabledFixture.detectChanges(); diff --git a/lib/core/shell/src/lib/components/shell/shell.component.spec.ts b/lib/core/shell/src/lib/components/shell/shell.component.spec.ts index ebbdbe02e1..85e8e59d0e 100644 --- a/lib/core/shell/src/lib/components/shell/shell.component.spec.ts +++ b/lib/core/shell/src/lib/components/shell/shell.component.spec.ts @@ -15,18 +15,12 @@ * limitations under the License. */ -import { NO_ERRORS_SCHEMA } from '@angular/core'; import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { AppConfigService, LAYOUT_DIRECTIVES } from '@alfresco/adf-core'; +import { AppConfigService } from '@alfresco/adf-core'; import { ShellLayoutComponent } from './shell.component'; import { Router, NavigationStart, RouterModule } from '@angular/router'; import { of, Subject } from 'rxjs'; -import { ExtensionsModule } from '@alfresco/adf-extensions'; -import { CommonModule } from '@angular/common'; import { ShellAppService, SHELL_APP_SERVICE } from '../../services/shell-app.service'; -import { HttpClientModule } from '@angular/common/http'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { TranslateModule } from '@ngx-translate/core'; class MockRouter { private url = 'some-url'; @@ -58,16 +52,7 @@ describe('AppLayoutComponent', () => { }; TestBed.configureTestingModule({ - imports: [ - CommonModule, - NoopAnimationsModule, - HttpClientModule, - ...LAYOUT_DIRECTIVES, - ExtensionsModule, - RouterModule.forChild([]), - TranslateModule.forRoot(), - ShellLayoutComponent - ], + imports: [RouterModule.forChild([]), ShellLayoutComponent], providers: [ { provide: Router, @@ -77,8 +62,7 @@ describe('AppLayoutComponent', () => { provide: SHELL_APP_SERVICE, useValue: shellService } - ], - schemas: [NO_ERRORS_SCHEMA] + ] }); fixture = TestBed.createComponent(ShellLayoutComponent); diff --git a/lib/core/src/lib/about/about-server-settings/about-server-settings.component.spec.ts b/lib/core/src/lib/about/about-server-settings/about-server-settings.component.spec.ts index a996c24f1b..84ae944843 100644 --- a/lib/core/src/lib/about/about-server-settings/about-server-settings.component.spec.ts +++ b/lib/core/src/lib/about/about-server-settings/about-server-settings.component.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { AboutServerSettingsComponent } from './about-server-settings.component'; import { AppConfigService } from '../../app-config/app-config.service'; import { AppConfigServiceMock } from '../../common'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; const aboutGithubDetails = { url: 'https://github.com/componany/repository/commits/', @@ -37,7 +36,6 @@ describe('AboutServerSettingsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule], providers: [{ provide: AppConfigService, useClass: AppConfigServiceMock }] }); fixture = TestBed.createComponent(AboutServerSettingsComponent); diff --git a/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts index fd367aba2e..c04fefacd2 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts @@ -26,7 +26,6 @@ import { RedirectAuthService } from '../oidc/redirect-auth.service'; import { EMPTY, of } from 'rxjs'; import { OidcAuthenticationService } from '../oidc/oidc-authentication.service'; import { AuthGuardService } from './auth-guard.service'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; describe('AuthGuardService BPM', () => { let authGuard: Promise; @@ -41,7 +40,7 @@ describe('AuthGuardService BPM', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, MatDialogModule], + imports: [MatDialogModule], providers: [ AuthGuardService, { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }, diff --git a/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts index 078e3def3b..1eec6a2a0b 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts @@ -26,8 +26,6 @@ import { RouterTestingModule } from '@angular/router/testing'; import { RedirectAuthService } from '../oidc/redirect-auth.service'; import { EMPTY, of } from 'rxjs'; import { OidcAuthenticationService } from '../oidc/oidc-authentication.service'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; - describe('AuthGuardService ECM', () => { let authGuard: Promise; @@ -41,7 +39,7 @@ describe('AuthGuardService ECM', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, RouterTestingModule, MatDialogModule], + imports: [RouterTestingModule, MatDialogModule], providers: [ BasicAlfrescoAuthService, AppConfigService, diff --git a/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts index e9f5298217..f6a418d808 100644 --- a/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard-sso-role.service.spec.ts @@ -20,7 +20,6 @@ import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/ro import { AuthGuardSsoRoleService } from './auth-guard-sso-role.service'; import { JwtHelperService } from '../services/jwt-helper.service'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; import { AuthModule } from '../oidc/auth.module'; describe('Auth Guard SSO role service', () => { @@ -30,7 +29,7 @@ describe('Auth Guard SSO role service', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, MatDialogModule, AuthModule.forRoot({ useHash: true })] + imports: [MatDialogModule, AuthModule.forRoot({ useHash: true })] }); localStorage.clear(); jwtHelperService = TestBed.inject(JwtHelperService); diff --git a/lib/core/src/lib/auth/guard/auth-guard.service.spec.ts b/lib/core/src/lib/auth/guard/auth-guard.service.spec.ts index c44da8e47f..a413dd167a 100644 --- a/lib/core/src/lib/auth/guard/auth-guard.service.spec.ts +++ b/lib/core/src/lib/auth/guard/auth-guard.service.spec.ts @@ -27,7 +27,6 @@ import { RedirectAuthService } from '../oidc/redirect-auth.service'; import { EMPTY, of } from 'rxjs'; import { MatDialogModule } from '@angular/material/dialog'; import { RouterTestingModule } from '@angular/router/testing'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; import { NoopAuthModule } from '../../testing'; describe('AuthGuardService', () => { @@ -43,7 +42,7 @@ describe('AuthGuardService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, MatDialogModule, RouterTestingModule, NoopAuthModule], + imports: [MatDialogModule, RouterTestingModule, NoopAuthModule], providers: [ AppConfigService, { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of(), init: () => {} } }, diff --git a/lib/core/src/lib/auth/oidc/auth.module.ts b/lib/core/src/lib/auth/oidc/auth.module.ts index 9714891f37..8df4087a3e 100644 --- a/lib/core/src/lib/auth/oidc/auth.module.ts +++ b/lib/core/src/lib/auth/oidc/auth.module.ts @@ -51,8 +51,7 @@ export function oauthStorageFactory(): OAuthStorage { } @NgModule({ - declarations: [AuthenticationConfirmationComponent], - imports: [AuthRoutingModule, OAuthModule.forRoot()], + imports: [AuthRoutingModule, OAuthModule.forRoot(), AuthenticationConfirmationComponent], providers: [ { provide: OAuthStorage, useFactory: oauthStorageFactory }, { provide: AuthenticationService }, diff --git a/lib/core/src/lib/auth/oidc/view/authentication-confirmation/authentication-confirmation.component.ts b/lib/core/src/lib/auth/oidc/view/authentication-confirmation/authentication-confirmation.component.ts index 7d0a3e2927..5a88e094a3 100644 --- a/lib/core/src/lib/auth/oidc/view/authentication-confirmation/authentication-confirmation.component.ts +++ b/lib/core/src/lib/auth/oidc/view/authentication-confirmation/authentication-confirmation.component.ts @@ -19,8 +19,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; @Component({ template: '
', - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: false + changeDetection: ChangeDetectionStrategy.OnPush }) export class AuthenticationConfirmationComponent { constructor() {} diff --git a/lib/core/src/lib/auth/services/authentication.service.spec.ts b/lib/core/src/lib/auth/services/authentication.service.spec.ts index c0ab9ddc0a..1a04df2428 100644 --- a/lib/core/src/lib/auth/services/authentication.service.spec.ts +++ b/lib/core/src/lib/auth/services/authentication.service.spec.ts @@ -29,7 +29,6 @@ import { OAuthEvent } from 'angular-oauth2-oidc'; import { firstValueFrom, of, Subject, throwError } from 'rxjs'; import { RedirectAuthService } from '../oidc/redirect-auth.service'; import { Injector } from '@angular/core'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; import { ContentAuth, ProcessAuth } from '../public-api'; declare let jasmine: any; @@ -45,7 +44,7 @@ describe('AuthenticationService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, AuthModule.forRoot({ useHash: true })], + imports: [AuthModule.forRoot({ useHash: true })], providers: [ { provide: CookieService, diff --git a/lib/core/src/lib/auth/services/identity-group.service.spec.ts b/lib/core/src/lib/auth/services/identity-group.service.spec.ts index c987736ec7..cdbb8c1687 100644 --- a/lib/core/src/lib/auth/services/identity-group.service.spec.ts +++ b/lib/core/src/lib/auth/services/identity-group.service.spec.ts @@ -28,7 +28,6 @@ import { roleMappingMock } from '../mock/identity-group.mock'; import { AdfHttpClient } from '../../../../api/src'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; describe('IdentityGroupService', () => { let service: IdentityGroupService; @@ -37,7 +36,6 @@ describe('IdentityGroupService', () => { beforeEach(fakeAsync(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule], providers: [AdfHttpClient] }); service = TestBed.inject(IdentityGroupService); diff --git a/lib/core/src/lib/auth/services/identity-user.service.spec.ts b/lib/core/src/lib/auth/services/identity-user.service.spec.ts index a1539a4a7b..9ebe21eb2e 100644 --- a/lib/core/src/lib/auth/services/identity-user.service.spec.ts +++ b/lib/core/src/lib/auth/services/identity-user.service.spec.ts @@ -34,7 +34,6 @@ import { mockToken } from '../mock/jwt-helper.service.spec'; import { IdentityRoleModel } from '../models/identity-role.model'; import { AdfHttpClient } from '../../../../api/src'; import { StorageService } from '../../common/services/storage.service'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; import { OAuthStorage } from 'angular-oauth2-oidc'; describe('IdentityUserService', () => { @@ -53,7 +52,6 @@ describe('IdentityUserService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule], providers: [AdfHttpClient, { provide: OAuthStorage, useClass: StorageService }] }); storageService = TestBed.inject(StorageService); diff --git a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts index cfa32ab64f..f5053853f6 100644 --- a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.spec.ts @@ -22,7 +22,6 @@ import { CardViewArrayItemModel, CardViewArrayItem } from '../../models/card-vie import { CardViewUpdateService } from '../../services/card-view-update.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { NoopTranslateModule } from '../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; describe('CardViewArrayItemComponent', () => { @@ -49,7 +48,7 @@ describe('CardViewArrayItemComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, CardViewArrayItemComponent] + imports: [CardViewArrayItemComponent] }); fixture = TestBed.createComponent(CardViewArrayItemComponent); service = TestBed.inject(CardViewUpdateService); diff --git a/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts index a1b5f085c0..01c1deee77 100644 --- a/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-boolitem/card-view-boolitem.component.spec.ts @@ -20,7 +20,6 @@ import { MatCheckboxChange } from '@angular/material/checkbox'; import { CardViewUpdateService } from '../../services/card-view-update.service'; import { CardViewBoolItemComponent } from './card-view-boolitem.component'; import { CardViewBoolItemModel } from '../../models/card-view-boolitem.model'; -import { NoopTranslateModule } from '../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; @@ -32,9 +31,6 @@ describe('CardViewBoolItemComponent', () => { let testingUtils: UnitTestingUtils; beforeEach(() => { - TestBed.configureTestingModule({ - imports: [NoopTranslateModule] - }); fixture = TestBed.createComponent(CardViewBoolItemComponent); component = fixture.componentInstance; component.property = new CardViewBoolItemModel({ diff --git a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts index 963f80a325..d82decaf72 100644 --- a/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-dateitem/card-view-dateitem.component.spec.ts @@ -26,9 +26,7 @@ import { MatDatetimepickerInputEvent } from '@mat-datetimepicker/core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { addMinutes } from 'date-fns'; -import { NoopTranslateModule } from '../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; describe('CardViewDateItemComponent', () => { let loader: HarnessLoader; @@ -39,7 +37,7 @@ describe('CardViewDateItemComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, CardViewDateItemComponent, NoopAnimationsModule] + imports: [CardViewDateItemComponent] }); appConfigService = TestBed.inject(AppConfigService); appConfigService.config.dateValues = { diff --git a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts index d233d4cda4..326c380999 100644 --- a/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CardViewKeyValuePairsItemModel } from '../../models/card-view-keyvaluepairs.model'; import { CardViewKeyValuePairsItemComponent } from './card-view-keyvaluepairsitem.component'; import { CardViewUpdateService } from '../../services/card-view-update.service'; -import { NoopTranslateModule } from '../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; @@ -35,7 +34,7 @@ describe('CardViewKeyValuePairsItemComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, CardViewKeyValuePairsItemComponent] + imports: [CardViewKeyValuePairsItemComponent] }); fixture = TestBed.createComponent(CardViewKeyValuePairsItemComponent); cardViewUpdateService = TestBed.inject(CardViewUpdateService); diff --git a/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts index 32181935ee..5323ab767c 100644 --- a/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-mapitem/card-view-mapitem.component.spec.ts @@ -19,7 +19,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { CardViewMapItemModel } from '../../models/card-view-mapitem.model'; import { CardViewUpdateService } from '../../services/card-view-update.service'; import { CardViewMapItemComponent } from './card-view-mapitem.component'; -import { NoopTranslateModule } from '../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; describe('CardViewMapItemComponent', () => { @@ -30,7 +29,7 @@ describe('CardViewMapItemComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, CardViewMapItemComponent] + imports: [CardViewMapItemComponent] }); fixture = TestBed.createComponent(CardViewMapItemComponent); service = TestBed.inject(CardViewUpdateService); diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts index fb7d8fbfb3..41170667df 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/card-view-selectitem.component.spec.ts @@ -22,9 +22,7 @@ import { of } from 'rxjs'; import { AppConfigService } from '../../../app-config/app-config.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; -import { NoopTranslateModule } from '../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; import { CardViewUpdateService } from '../../services/card-view-update.service'; import { DebugElement } from '@angular/core'; @@ -63,7 +61,7 @@ describe('CardViewSelectItemComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, CardViewSelectItemComponent] + imports: [CardViewSelectItemComponent] }); fixture = TestBed.createComponent(CardViewSelectItemComponent); component = fixture.componentInstance; diff --git a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts index e18f5aef65..620ed8a0dc 100644 --- a/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-selectitem/select-filter-input/select-filter-input.component.spec.ts @@ -18,8 +18,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SelectFilterInputComponent } from './select-filter-input.component'; import { MatSelect, MatSelectModule } from '@angular/material/select'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { NoopTranslateModule } from '../../../../testing/noop-translate.module'; import { Subject } from 'rxjs'; describe('SelectFilterInputComponent', () => { @@ -45,7 +43,7 @@ describe('SelectFilterInputComponent', () => { }); TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NoopTranslateModule, MatSelectModule, SelectFilterInputComponent], + imports: [MatSelectModule, SelectFilterInputComponent], providers: [{ provide: MatSelect, useValue: mockMatSelect }] }).compileComponents(); diff --git a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts index a0a5929349..3ffa2ed83c 100644 --- a/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view-textitem/card-view-textitem.component.spec.ts @@ -30,9 +30,7 @@ import { CardViewItemValidator } from '../../interfaces/card-view-item-validator import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatInputHarness } from '@angular/material/input/testing'; -import { NoopTranslateModule } from '../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; describe('CardViewTextItemComponent', () => { let loader: HarnessLoader; @@ -113,7 +111,7 @@ describe('CardViewTextItemComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, CardViewTextItemComponent] + imports: [CardViewTextItemComponent] }); fixture = TestBed.createComponent(CardViewTextItemComponent); component = fixture.componentInstance; diff --git a/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts b/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts index aa4e0dcb27..2655e74a16 100644 --- a/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts +++ b/lib/core/src/lib/card-view/components/card-view/card-view.component.spec.ts @@ -27,9 +27,7 @@ import { CardViewItemDispatcherComponent } from '../card-view-item-dispatcher/ca import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatDialogModule } from '@angular/material/dialog'; -import { NoopTranslateModule } from '../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MatSnackBarModule } from '@angular/material/snack-bar'; describe('CardViewComponent', () => { @@ -40,7 +38,7 @@ describe('CardViewComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, MatSnackBarModule, MatDialogModule, CardViewComponent] + imports: [MatSnackBarModule, MatDialogModule, CardViewComponent] }); fixture = TestBed.createComponent(CardViewComponent); diff --git a/lib/core/src/lib/clipboard/clipboard.directive.spec.ts b/lib/core/src/lib/clipboard/clipboard.directive.spec.ts index ba26f5986f..b3943cb82f 100644 --- a/lib/core/src/lib/clipboard/clipboard.directive.spec.ts +++ b/lib/core/src/lib/clipboard/clipboard.directive.spec.ts @@ -20,19 +20,19 @@ import { ComponentFixture, TestBed, tick, fakeAsync } from '@angular/core/testin import { ClipboardService } from './clipboard.service'; import { ClipboardDirective } from './clipboard.directive'; import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { NoopTranslateModule } from '../testing/noop-translate.module'; import { UnitTestingUtils } from '../testing/unit-testing-utils'; import { HarnessLoader, TestKey } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; +import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'adf-test-component', template: ` - + `, - standalone: false + imports: [MatButtonModule, ClipboardDirective] }) class TestTargetClipboardComponent {} @@ -44,8 +44,7 @@ describe('ClipboardDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, MatSnackBarModule, ClipboardDirective], - declarations: [TestTargetClipboardComponent] + imports: [MatSnackBarModule, TestTargetClipboardComponent] }); fixture = TestBed.createComponent(TestTargetClipboardComponent); clipboardService = TestBed.inject(ClipboardService); @@ -73,9 +72,9 @@ describe('ClipboardDirective', () => { describe('CopyClipboardDirective', () => { @Component({ - selector: 'adf-copy-conent-test-component', + selector: 'adf-copy-content-test-component', template: `{{ mockText }}`, - standalone: false + imports: [ClipboardDirective] }) class TestCopyClipboardComponent { mockText = 'text to copy'; @@ -90,8 +89,7 @@ describe('CopyClipboardDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, MatSnackBarModule, ClipboardDirective], - declarations: [TestCopyClipboardComponent] + imports: [MatSnackBarModule, TestCopyClipboardComponent] }); fixture = TestBed.createComponent(TestCopyClipboardComponent); testingUtils = new UnitTestingUtils(fixture.debugElement); diff --git a/lib/core/src/lib/clipboard/clipboard.service.spec.ts b/lib/core/src/lib/clipboard/clipboard.service.spec.ts index a362c988ae..603f6632b2 100644 --- a/lib/core/src/lib/clipboard/clipboard.service.spec.ts +++ b/lib/core/src/lib/clipboard/clipboard.service.spec.ts @@ -19,7 +19,6 @@ import { NotificationService } from '../notifications/services/notification.serv import { TestBed } from '@angular/core/testing'; import { ClipboardService } from './clipboard.service'; import { MatSnackBarModule } from '@angular/material/snack-bar'; -import { NoopTranslateModule } from '@alfresco/adf-core'; describe('ClipboardService', () => { let clipboardService: ClipboardService; @@ -28,7 +27,7 @@ describe('ClipboardService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, MatSnackBarModule] + imports: [MatSnackBarModule] }); clipboardService = TestBed.inject(ClipboardService); notificationService = TestBed.inject(NotificationService); diff --git a/lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts b/lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts index f8aa746e11..d86a04f8cf 100644 --- a/lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts +++ b/lib/core/src/lib/comments/comment-list/comment-list.component.spec.ts @@ -21,7 +21,6 @@ import { CommentListComponent } from './comment-list.component'; import { commentUserNoPictureDefined, commentUserPictureDefined, mockCommentOne, testUser } from './mocks/comment-list.mock'; import { CommentListServiceMock } from './mocks/comment-list.service.mock'; import { ADF_COMMENTS_SERVICE } from '../interfaces/comments.token'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../testing/unit-testing-utils'; describe('CommentListComponent', () => { @@ -31,7 +30,6 @@ describe('CommentListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule], providers: [ { provide: ADF_COMMENTS_SERVICE, diff --git a/lib/core/src/lib/comments/comments.component.spec.ts b/lib/core/src/lib/comments/comments.component.spec.ts index 3c3dcb75c6..1f33ce0ead 100644 --- a/lib/core/src/lib/comments/comments.component.spec.ts +++ b/lib/core/src/lib/comments/comments.component.spec.ts @@ -22,8 +22,6 @@ import { CommentsServiceMock, commentsResponseMock } from './mocks/comments.serv import { of, throwError } from 'rxjs'; import { ADF_COMMENTS_SERVICE } from './interfaces/comments.token'; import { CommentsService } from './interfaces/comments-service.interface'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { NoopTranslateModule } from '../testing/noop-translate.module'; import { UnitTestingUtils } from '../testing/unit-testing-utils'; import { MatError } from '@angular/material/form-field'; import { CommentModel } from '../models'; @@ -38,7 +36,7 @@ describe('CommentsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NoopTranslateModule, CommentsComponent], + imports: [CommentsComponent], providers: [ { provide: ADF_COMMENTS_SERVICE, diff --git a/lib/core/src/lib/common/services/log.service.spec.ts b/lib/core/src/lib/common/services/log.service.spec.ts index 5b06f2fe8e..e6d468da08 100644 --- a/lib/core/src/lib/common/services/log.service.spec.ts +++ b/lib/core/src/lib/common/services/log.service.spec.ts @@ -25,8 +25,7 @@ import { LogService } from './log.service'; @Component({ template: '', - providers: [LogService], - standalone: false + providers: [LogService] }) class ProvidesLogComponent { constructor(public logService: LogService) {} @@ -62,8 +61,7 @@ describe('LogService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientModule], - declarations: [ProvidesLogComponent], + imports: [HttpClientModule, ProvidesLogComponent], providers: [LogService, AppConfigService] }); appConfigService = TestBed.inject(AppConfigService); diff --git a/lib/core/src/lib/common/services/storage.service.spec.ts b/lib/core/src/lib/common/services/storage.service.spec.ts index 1f57efa576..3538208742 100644 --- a/lib/core/src/lib/common/services/storage.service.spec.ts +++ b/lib/core/src/lib/common/services/storage.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { AppConfigService } from '../../app-config/app-config.service'; import { StorageService } from '../../common/services/storage.service'; -import { NoopAuthModule, NoopTranslateModule } from '@alfresco/adf-core'; +import { NoopAuthModule } from '@alfresco/adf-core'; describe('StorageService', () => { let storage: StorageService; @@ -29,7 +29,7 @@ describe('StorageService', () => { describe('with local storage and prefix', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAuthModule] + imports: [NoopAuthModule] }); appConfig = TestBed.inject(AppConfigService); storage = TestBed.inject(StorageService); @@ -122,7 +122,7 @@ describe('StorageService', () => { }); TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAuthModule] + imports: [NoopAuthModule] }); appConfig = TestBed.inject(AppConfigService); storage = TestBed.inject(StorageService); diff --git a/lib/core/src/lib/common/services/user-preferences.service.spec.ts b/lib/core/src/lib/common/services/user-preferences.service.spec.ts index 85ee486a16..dabc4f582a 100644 --- a/lib/core/src/lib/common/services/user-preferences.service.spec.ts +++ b/lib/core/src/lib/common/services/user-preferences.service.spec.ts @@ -21,7 +21,6 @@ import { AppConfigService } from '../../app-config/app-config.service'; import { StorageService } from '../../common/services/storage.service'; import { UserPreferencesService, UserPreferenceValues } from '../../common/services/user-preferences.service'; import { AppConfigServiceMock } from '../mock/app-config.service.mock'; -import { NoopTranslateModule } from '@alfresco/adf-core'; describe('UserPreferencesService', () => { const supportedPaginationSize = [5, 10, 15, 20]; @@ -32,7 +31,6 @@ describe('UserPreferencesService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule], providers: [{ provide: AppConfigService, useClass: AppConfigServiceMock }] }); appConfig = TestBed.inject(AppConfigService); diff --git a/lib/core/src/lib/context-menu/context-menu.directive.spec.ts b/lib/core/src/lib/context-menu/context-menu.directive.spec.ts index b5231aeeb6..fd7f5386f2 100644 --- a/lib/core/src/lib/context-menu/context-menu.directive.spec.ts +++ b/lib/core/src/lib/context-menu/context-menu.directive.spec.ts @@ -17,16 +17,16 @@ import { Component } from '@angular/core'; import { TestBed, ComponentFixture } from '@angular/core/testing'; -import { CONTEXT_MENU_DIRECTIVES } from './context-menu.module'; import { CoreTestingModule } from '../testing/core.testing.module'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { UnitTestingUtils } from '../testing/unit-testing-utils'; +import { ContextMenuDirective } from '@alfresco/adf-core'; @Component({ selector: 'adf-test-component', template: `
`, - standalone: false + imports: [ContextMenuDirective] }) class TestComponent { actions: any[] | (() => any[]); @@ -119,8 +119,7 @@ testCases.forEach((testCase) => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CoreTestingModule, CONTEXT_MENU_DIRECTIVES], - declarations: [TestComponent] + imports: [CoreTestingModule, TestComponent] }); fixture = TestBed.createComponent(TestComponent); fixture.componentInstance.isEnabled = false; diff --git a/lib/core/src/lib/datatable/components/columns-selector/columns-search-filter.pipe.spec.ts b/lib/core/src/lib/datatable/components/columns-selector/columns-search-filter.pipe.spec.ts index 7e2446c271..793505eb51 100644 --- a/lib/core/src/lib/datatable/components/columns-selector/columns-search-filter.pipe.spec.ts +++ b/lib/core/src/lib/datatable/components/columns-selector/columns-search-filter.pipe.spec.ts @@ -17,7 +17,6 @@ import { ColumnsSearchFilterPipe } from './columns-search-filter.pipe'; import { DataColumn } from '../../data/data-column.model'; -import { NoopTranslateModule } from '@alfresco/adf-core'; import { TestBed } from '@angular/core/testing'; describe('ColumnsSeearchFilterPipe', () => { @@ -25,7 +24,7 @@ describe('ColumnsSeearchFilterPipe', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, ColumnsSearchFilterPipe], + imports: [ColumnsSearchFilterPipe], providers: [ColumnsSearchFilterPipe] }); diff --git a/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.spec.ts b/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.spec.ts index 1345039ece..07f2d04591 100644 --- a/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.spec.ts +++ b/lib/core/src/lib/datatable/components/columns-selector/columns-selector.component.spec.ts @@ -22,7 +22,6 @@ import { Observable, Subject } from 'rxjs'; import { MatMenuTrigger } from '@angular/material/menu'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { HarnessLoader } from '@angular/cdk/testing'; -import { NoopTranslateModule } from '../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; describe('ColumnsSelectorComponent', () => { @@ -40,7 +39,7 @@ describe('ColumnsSelectorComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, ColumnsSelectorComponent] + imports: [ColumnsSelectorComponent] }); fixture = TestBed.createComponent(ColumnsSelectorComponent); diff --git a/lib/core/src/lib/datatable/components/date-cell/date-cell.component.spec.ts b/lib/core/src/lib/datatable/components/date-cell/date-cell.component.spec.ts index c3e16c97d4..aad8a968c6 100644 --- a/lib/core/src/lib/datatable/components/date-cell/date-cell.component.spec.ts +++ b/lib/core/src/lib/datatable/components/date-cell/date-cell.component.spec.ts @@ -23,7 +23,6 @@ import { AppConfigService } from '../../../app-config'; import { LOCALE_ID } from '@angular/core'; import { registerLocaleData } from '@angular/common'; import localePL from '@angular/common/locales/pl'; -import { NoopTranslateModule } from '../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; let component: DateCellComponent; @@ -63,7 +62,7 @@ const checkDisplayedTooltip = (expectedTooltip: string) => { const configureTestingModule = (providers: any[]) => { TestBed.configureTestingModule({ - imports: [DateCellComponent, NoopTranslateModule], + imports: [DateCellComponent], providers }); fixture = TestBed.createComponent(DateCellComponent); diff --git a/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.module.ts b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.module.ts index e4cec86778..fb6f9daa85 100644 --- a/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.module.ts +++ b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.module.ts @@ -17,14 +17,11 @@ import { NgModule } from '@angular/core'; import { ConfirmDialogComponent } from './confirm.dialog'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { CommonModule } from '@angular/common'; -import { TranslateModule } from '@ngx-translate/core'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatButtonModule } from '@angular/material/button'; + +/** @deprecated use `ConfirmDialogComponent` directly instead of importing this module */ @NgModule({ - declarations: [ConfirmDialogComponent], - imports: [CommonModule, FormsModule, ReactiveFormsModule, TranslateModule, MatDialogModule, MatButtonModule], + declarations: [], + imports: [ConfirmDialogComponent], exports: [ConfirmDialogComponent] }) export class ConfirmDialogModule {} diff --git a/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.spec.ts b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.spec.ts index ba6b68a219..60376eccda 100644 --- a/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.spec.ts +++ b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.spec.ts @@ -18,8 +18,6 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { ConfirmDialogComponent } from './confirm.dialog'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../testing/unit-testing-utils'; describe('Confirm Dialog Component', () => { @@ -40,7 +38,7 @@ describe('Confirm Dialog Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [MatDialogModule, NoopAnimationsModule, NoopTranslateModule], + imports: [MatDialogModule, ConfirmDialogComponent], providers: [ { provide: MatDialogRef, useValue: dialogRef }, { provide: MAT_DIALOG_DATA, useValue: data } diff --git a/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.ts b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.ts index 52721fa4bd..be995d6872 100644 --- a/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.ts +++ b/lib/core/src/lib/dialogs/confirm-dialog/confirm.dialog.ts @@ -16,8 +16,11 @@ */ import { Component, Inject, SecurityContext, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { DomSanitizer } from '@angular/platform-browser'; +import { TranslatePipe } from '@ngx-translate/core'; +import { NgIf } from '@angular/common'; +import { MatButtonModule } from '@angular/material/button'; export interface ConfirmDialogComponentProps { title?: string; @@ -34,7 +37,8 @@ export interface ConfirmDialogComponentProps { styleUrls: ['./confirm.dialog.scss'], host: { class: 'adf-confirm-dialog' }, encapsulation: ViewEncapsulation.None, - standalone: false + standalone: true, + imports: [TranslatePipe, MatDialogModule, NgIf, MatButtonModule] }) export class ConfirmDialogComponent { title: string; diff --git a/lib/core/src/lib/dialogs/dialog/dialog.component.spec.ts b/lib/core/src/lib/dialogs/dialog/dialog.component.spec.ts index d3071691f7..a5abf7f9c1 100644 --- a/lib/core/src/lib/dialogs/dialog/dialog.component.spec.ts +++ b/lib/core/src/lib/dialogs/dialog/dialog.component.spec.ts @@ -25,8 +25,8 @@ import { Component, inject } from '@angular/core'; import { Subject } from 'rxjs'; @Component({ - selector: 'adf-dummy-component', - standalone: false + template: ``, + selector: 'adf-dummy-component' }) class DummyComponent { data = inject(DIALOG_COMPONENT_DATA); @@ -56,13 +56,12 @@ describe('DialogComponent', () => { const setupBeforeEach = (dialogOptions: DialogData = data) => { TestBed.configureTestingModule({ - imports: [CoreTestingModule], - declarations: [DummyComponent], + imports: [CoreTestingModule, DummyComponent], providers: [ { provide: MAT_DIALOG_DATA, useValue: dialogOptions }, { provide: MatDialogRef, useValue: dialogRef } ] - }).compileComponents(); + }); dialogRef.close.calls.reset(); fixture = TestBed.createComponent(DialogComponent); diff --git a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.component.ts b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.component.ts index c122e35aa1..32305a5b99 100644 --- a/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.component.ts +++ b/lib/core/src/lib/dialogs/edit-json/edit-json.dialog.stories.component.ts @@ -18,11 +18,13 @@ import { Component, OnInit, OnChanges, Input } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { EditJsonDialogComponent, EditJsonDialogSettings } from './edit-json.dialog'; +import { MatButtonModule } from '@angular/material/button'; @Component({ selector: 'adf-edit-json-dialog-storybook', template: ``, - standalone: false + standalone: true, + imports: [MatButtonModule] }) export class EditJsonDialogStorybookComponent implements OnInit, OnChanges { @Input() diff --git a/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts b/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts index dfb61fd820..1fc05fa591 100644 --- a/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts +++ b/lib/core/src/lib/directives/infinite-select-scroll.directive.spec.ts @@ -16,10 +16,10 @@ */ import { Component, ViewChild } from '@angular/core'; +import { CommonModule } from '@angular/common'; import { ComponentFixture, fakeAsync, flush, TestBed } from '@angular/core/testing'; import { InfiniteSelectScrollDirective } from './infinite-select-scroll.directive'; import { MatSelect, MatSelectModule } from '@angular/material/select'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { UnitTestingUtils } from '../testing/unit-testing-utils'; @@ -30,7 +30,8 @@ import { UnitTestingUtils } from '../testing/unit-testing-utils'; {{ option.text }} `, - standalone: false + standalone: true, + imports: [MatSelectModule, InfiniteSelectScrollDirective, CommonModule] }) class TestComponent { options = new Array(50).fill({ text: 'dummy' }); @@ -55,8 +56,7 @@ describe('InfiniteSelectScrollDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [MatSelectModule, NoopAnimationsModule, InfiniteSelectScrollDirective], - declarations: [TestComponent] + imports: [TestComponent] }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; diff --git a/lib/core/src/lib/directives/tooltip-card/tooltip-card.directive.spec.ts b/lib/core/src/lib/directives/tooltip-card/tooltip-card.directive.spec.ts index 6d9ec83d77..d5162c210f 100644 --- a/lib/core/src/lib/directives/tooltip-card/tooltip-card.directive.spec.ts +++ b/lib/core/src/lib/directives/tooltip-card/tooltip-card.directive.spec.ts @@ -18,11 +18,8 @@ import { Component, ElementRef, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TooltipCardDirective } from './tooltip-card.directive'; -import { CommonModule } from '@angular/common'; import { Overlay, OverlayContainer, OverlayModule } from '@angular/cdk/overlay'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { By } from '@angular/platform-browser'; -import { TooltipCardComponent } from './tooltip-card.component'; const IMAGE_URL = 'alfresco-logo.svg'; @@ -35,7 +32,8 @@ const IMAGE_URL = 'alfresco-logo.svg'; [htmlContent]="'this is the html raw code'" class="test-component" >`, - standalone: false + standalone: true, + imports: [TooltipCardDirective] }) class TestComponent { @ViewChild(TooltipCardDirective, { static: true }) @@ -53,21 +51,16 @@ describe('TooltipCardDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CommonModule, OverlayModule, NoopAnimationsModule, TooltipCardDirective, TooltipCardComponent], - declarations: [TestComponent] - }).compileComponents(); - }); + imports: [OverlayModule, TestComponent] + }); - beforeEach(() => { fixture = TestBed.createComponent(TestComponent); overlayService = TestBed.inject(Overlay); overlayContainer = TestBed.inject(OverlayContainer); overlay = overlayContainer.getContainerElement(); }); - afterEach(() => { - TestBed.resetTestingModule(); - }); + afterEach(() => fixture.destroy()); it('should display tooltip-card on mouse enter', () => { fixture.detectChanges(); diff --git a/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts b/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts index 42d5b2d812..33276ef4d9 100644 --- a/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/amount/amount.widget.spec.ts @@ -23,8 +23,6 @@ import { FormFieldTypes } from '../core/form-field-types'; import { FormModel } from '../core/form.model'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { NoopTranslateModule } from '../../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../../testing/unit-testing-utils'; describe('AmountWidgetComponent', () => { @@ -35,7 +33,7 @@ describe('AmountWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, FormBaseModule] + imports: [FormBaseModule] }); fixture = TestBed.createComponent(AmountWidgetComponent); widget = fixture.componentInstance; @@ -133,7 +131,7 @@ describe('AmountWidgetComponent - rendering', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, FormBaseModule] + imports: [FormBaseModule] }); fixture = TestBed.createComponent(AmountWidgetComponent); widget = fixture.componentInstance; @@ -338,7 +336,7 @@ describe('AmountWidgetComponent settings', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, FormBaseModule], + imports: [FormBaseModule], providers: [ { provide: ADF_AMOUNT_SETTINGS, diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts index 0b00694123..eff9df2d5d 100644 --- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts @@ -26,8 +26,6 @@ import { addMinutes } from 'date-fns'; import { MatDialogModule } from '@angular/material/dialog'; import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core'; import { MatDatepickerModule } from '@angular/material/datepicker'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { NoopTranslateModule } from '../../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../../testing/unit-testing-utils'; describe('DateTimeWidgetComponent', () => { @@ -39,15 +37,7 @@ describe('DateTimeWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - NoopTranslateModule, - NoopAnimationsModule, - MatDialogModule, - MatNativeDatetimeModule, - MatDatepickerModule, - MatDatetimepickerModule, - DateTimeWidgetComponent - ] + imports: [MatDialogModule, MatNativeDatetimeModule, MatDatepickerModule, MatDatetimepickerModule, DateTimeWidgetComponent] }); fixture = TestBed.createComponent(DateTimeWidgetComponent); widget = fixture.componentInstance; diff --git a/lib/core/src/lib/form/components/widgets/header/header.widget.spec.ts b/lib/core/src/lib/form/components/widgets/header/header.widget.spec.ts index 330321b5ce..0fcfea376e 100644 --- a/lib/core/src/lib/form/components/widgets/header/header.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/header/header.widget.spec.ts @@ -20,8 +20,7 @@ import { ContainerModel } from '../core/container.model'; import { FormFieldTypes } from '../core/form-field-types'; import { FormFieldModel } from '../core/form-field.model'; import { HeaderWidgetComponent } from './header.widget'; -import { NoopTranslateModule, UnitTestingUtils } from '../../../../testing'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { UnitTestingUtils } from '../../../../testing'; describe('HeaderWidgetComponent', () => { let component: HeaderWidgetComponent; @@ -30,7 +29,7 @@ describe('HeaderWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HeaderWidgetComponent, NoopTranslateModule, NoopAnimationsModule] + imports: [HeaderWidgetComponent] }); }); diff --git a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts b/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts index 75b12e6d3b..ee5cbdc58d 100644 --- a/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/multiline-text/multiline-text.widget.spec.ts @@ -17,13 +17,11 @@ import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { FormModel } from '../core/form.model'; import { FormFieldModel } from '../core/form-field.model'; import { FormFieldTypes } from '../core/form-field-types'; import { MultilineTextWidgetComponentComponent } from './multiline-text.widget'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { NoopTranslateModule } from '../../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../../testing/unit-testing-utils'; describe('MultilineTextWidgetComponentComponent', () => { @@ -34,7 +32,7 @@ describe('MultilineTextWidgetComponentComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, MultilineTextWidgetComponentComponent] + imports: [MultilineTextWidgetComponentComponent] }); fixture = TestBed.createComponent(MultilineTextWidgetComponentComponent); widget = fixture.componentInstance; diff --git a/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts b/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts index 31baafb8dd..a98f1694ab 100644 --- a/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/text/text.widget.spec.ts @@ -22,8 +22,6 @@ import { FormModel } from '../core/form.model'; import { TextWidgetComponent } from './text.widget'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { NoopTranslateModule } from '../../../../testing/noop-translate.module'; import { UnitTestingUtils } from '../../../../testing/unit-testing-utils'; describe('TextWidgetComponent', () => { @@ -37,7 +35,7 @@ describe('TextWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, TextWidgetComponent] + imports: [TextWidgetComponent] }); fixture = TestBed.createComponent(TextWidgetComponent); widget = fixture.componentInstance; diff --git a/lib/core/src/lib/info-drawer/info-drawer.component.spec.ts b/lib/core/src/lib/info-drawer/info-drawer.component.spec.ts index e13620105d..a8dd2cec82 100644 --- a/lib/core/src/lib/info-drawer/info-drawer.component.spec.ts +++ b/lib/core/src/lib/info-drawer/info-drawer.component.spec.ts @@ -22,8 +22,6 @@ import { InfoDrawerComponent, InfoDrawerTabComponent } from './info-drawer.compo import { ESCAPE } from '@angular/cdk/keycodes'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { NoopTranslateModule } from '../testing/noop-translate.module'; import { UnitTestingUtils } from '../testing/unit-testing-utils'; describe('InfoDrawerComponent', () => { @@ -33,7 +31,7 @@ describe('InfoDrawerComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, InfoDrawerComponent] + imports: [InfoDrawerComponent] }); fixture = TestBed.createComponent(InfoDrawerComponent); @@ -105,7 +103,7 @@ describe('Custom InfoDrawer', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NoopTranslateModule, CustomInfoDrawerComponent] + imports: [CustomInfoDrawerComponent] }); fixture = TestBed.createComponent(CustomInfoDrawerComponent); @@ -174,7 +172,7 @@ describe('Header visibility InfoDrawer', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, VisibilityInfoDrawerComponent] + imports: [VisibilityInfoDrawerComponent] }); fixture = TestBed.createComponent(VisibilityInfoDrawerComponent); fixture.detectChanges(); diff --git a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts index 47d39ab404..1608b3bc53 100644 --- a/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts +++ b/lib/core/src/lib/layout/components/sidenav-layout/sidenav-layout.component.spec.ts @@ -23,9 +23,7 @@ import { SidenavLayoutContentDirective } from '../../directives/sidenav-layout-c import { SidenavLayoutHeaderDirective } from '../../directives/sidenav-layout-header.directive'; import { SidenavLayoutNavigationDirective } from '../../directives/sidenav-layout-navigation.directive'; import { UserPreferencesService } from '../../../common/services/user-preferences.service'; -import { CommonModule } from '@angular/common'; import { of } from 'rxjs'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; @Component({ @@ -54,14 +52,14 @@ import { UnitTestingUtils } from '../../../testing/unit-testing-utils'; export class SidenavLayoutTesterComponent {} describe('SidenavLayoutComponent', () => { - let fixture: ComponentFixture; + let fixture: ComponentFixture; let mediaQueryList: any; let component: SidenavLayoutComponent; let mediaMatcher: MediaMatcher; beforeEach(() => { TestBed.configureTestingModule({ - imports: [CommonModule, NoopAnimationsModule, SidenavLayoutComponent], + imports: [SidenavLayoutComponent], providers: [MediaMatcher, { provide: UserPreferencesService, useValue: { select: () => of() } }] }); mediaQueryList = { @@ -82,10 +80,7 @@ describe('SidenavLayoutComponent', () => { component.sidenavMax = 320; }); - afterEach(() => { - fixture.destroy(); - TestBed.resetTestingModule(); - }); + afterEach(() => fixture.destroy()); describe('toggleMenu', () => { beforeEach(() => { @@ -160,7 +155,7 @@ describe('Template transclusion', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CommonModule, NoopAnimationsModule, SidenavLayoutTesterComponent], + imports: [SidenavLayoutTesterComponent], providers: [MediaMatcher, { provide: UserPreferencesService, useValue: { select: () => of() } }] }); diff --git a/lib/core/src/lib/notifications/components/notification-history.component.spec.ts b/lib/core/src/lib/notifications/components/notification-history.component.spec.ts index 4ae6f1599f..32ac684049 100644 --- a/lib/core/src/lib/notifications/components/notification-history.component.spec.ts +++ b/lib/core/src/lib/notifications/components/notification-history.component.spec.ts @@ -22,8 +22,6 @@ import { NotificationService } from '../services/notification.service'; import { StorageService } from '../../common/services/storage.service'; import { NOTIFICATION_TYPE, NotificationModel } from '../models/notification.model'; import { UnitTestingUtils } from '../../testing/unit-testing-utils'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; import { NoopAuthModule } from '../../testing/noop-auth.module'; import { MatIconTestingModule } from '@angular/material/icon/testing'; @@ -43,7 +41,7 @@ describe('Notification History Component', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NoopTranslateModule, NoopAuthModule, NotificationHistoryComponent, MatIconTestingModule] + imports: [NoopAuthModule, NotificationHistoryComponent, MatIconTestingModule] }); fixture = TestBed.createComponent(NotificationHistoryComponent); component = fixture.componentInstance; diff --git a/lib/core/src/lib/notifications/services/notification.service.spec.ts b/lib/core/src/lib/notifications/services/notification.service.spec.ts index 6e5406d424..0408ff5432 100644 --- a/lib/core/src/lib/notifications/services/notification.service.spec.ts +++ b/lib/core/src/lib/notifications/services/notification.service.spec.ts @@ -17,14 +17,12 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatSnackBarConfig } from '@angular/material/snack-bar'; +import { MatSnackBarConfig, MatSnackBarModule } from '@angular/material/snack-bar'; import { NotificationService } from './notification.service'; import { TranslationService } from '../../translation/translation.service'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { provideNoopAnimations } from '@angular/platform-browser/animations'; import { UnitTestingUtils } from '../../testing/unit-testing-utils'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; @Component({ template: '
Test div
', @@ -88,9 +86,8 @@ describe('NotificationService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProvidesNotificationServiceComponent, NoopTranslateModule], - providers: [provideNoopAnimations()] - }).compileComponents(); + imports: [MatSnackBarModule, ProvidesNotificationServiceComponent] + }); translationService = TestBed.inject(TranslationService); fixture = TestBed.createComponent(ProvidesNotificationServiceComponent); fixture.detectChanges(); diff --git a/lib/core/src/lib/pagination/infinite-pagination.component.spec.ts b/lib/core/src/lib/pagination/infinite-pagination.component.spec.ts index 5c366397b5..3645df4997 100644 --- a/lib/core/src/lib/pagination/infinite-pagination.component.spec.ts +++ b/lib/core/src/lib/pagination/infinite-pagination.component.spec.ts @@ -27,7 +27,7 @@ import { UnitTestingUtils } from '../testing/unit-testing-utils'; @Component({ template: ``, - standalone: false + standalone: true }) class TestPaginatedComponent implements PaginatedComponent { private _pagination: BehaviorSubject; @@ -59,8 +59,7 @@ describe('InfinitePaginationComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CoreTestingModule], - declarations: [TestPaginatedComponent] + imports: [CoreTestingModule, TestPaginatedComponent] }); fixture = TestBed.createComponent(InfinitePaginationComponent); component = fixture.componentInstance; diff --git a/lib/core/src/lib/pagination/pagination.component.spec.ts b/lib/core/src/lib/pagination/pagination.component.spec.ts index c79afcf7cd..585eb86ae9 100644 --- a/lib/core/src/lib/pagination/pagination.component.spec.ts +++ b/lib/core/src/lib/pagination/pagination.component.spec.ts @@ -20,8 +20,6 @@ import { PaginationComponent } from './pagination.component'; import { PaginatedComponent } from './paginated-component.interface'; import { BehaviorSubject } from 'rxjs'; import { PaginationModel } from '../models/pagination.model'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { NoopTranslateModule } from '../testing/noop-translate.module'; class FakePaginationInput implements PaginationModel { count = 25; @@ -42,7 +40,7 @@ describe('PaginationComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, NoopTranslateModule, PaginationComponent] + imports: [PaginationComponent] }); fixture = TestBed.createComponent(PaginationComponent); component = fixture.componentInstance; diff --git a/lib/core/src/lib/progress/progress.component.spec.ts b/lib/core/src/lib/progress/progress.component.spec.ts index 7c4dd73625..8edd14e211 100644 --- a/lib/core/src/lib/progress/progress.component.spec.ts +++ b/lib/core/src/lib/progress/progress.component.spec.ts @@ -16,9 +16,6 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { ProgressComponent } from './progress.component'; @@ -30,10 +27,10 @@ describe('ProgressComponent', () => { let loader: HarnessLoader; let testingUtils: UnitTestingUtils; - beforeEach(async () => { - await TestBed.configureTestingModule({ - imports: [MatProgressBarModule, MatProgressSpinnerModule, NoopAnimationsModule, ProgressComponent] - }).compileComponents(); + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ProgressComponent] + }); fixture = TestBed.createComponent(ProgressComponent); loader = TestbedHarnessEnvironment.loader(fixture); diff --git a/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts b/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts index 381bb09801..1ff5695027 100644 --- a/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts +++ b/lib/core/src/lib/snackbar-content/snackbar-content.component.spec.ts @@ -20,7 +20,6 @@ import { MatIcon } from '@angular/material/icon'; import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from '@angular/material/snack-bar'; import { SnackbarContentComponent } from './snackbar-content.component'; import { UnitTestingUtils } from '../testing/unit-testing-utils'; -import { NoopTranslateModule } from '../testing/noop-translate.module'; import { CoreTestingModule } from '../testing/core.testing.module'; describe('SnackbarContentComponent', () => { @@ -30,7 +29,7 @@ describe('SnackbarContentComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, CoreTestingModule, SnackbarContentComponent], + imports: [CoreTestingModule, SnackbarContentComponent], providers: [ { provide: MatSnackBarRef, diff --git a/lib/core/src/lib/templates/empty-content/empty-content.component.spec.ts b/lib/core/src/lib/templates/empty-content/empty-content.component.spec.ts index 4872beb683..f031ee8eef 100644 --- a/lib/core/src/lib/templates/empty-content/empty-content.component.spec.ts +++ b/lib/core/src/lib/templates/empty-content/empty-content.component.spec.ts @@ -19,7 +19,6 @@ import { Component } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateService } from '@ngx-translate/core'; import { of } from 'rxjs'; -import { NoopTranslateModule } from '../../testing/noop-translate.module'; import { EmptyContentComponent } from './empty-content.component'; import { UnitTestingUtils } from '../../testing/unit-testing-utils'; @@ -43,7 +42,7 @@ describe('EmptyContentComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, TestComponent] + imports: [TestComponent] }); fixture = TestBed.createComponent(TestComponent); testingUtils = new UnitTestingUtils(fixture.debugElement); diff --git a/lib/core/src/lib/testing/global-testing.module.ts b/lib/core/src/lib/testing/global-testing.module.ts new file mode 100644 index 0000000000..80137b35de --- /dev/null +++ b/lib/core/src/lib/testing/global-testing.module.ts @@ -0,0 +1,26 @@ +/*! + * @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 { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; +import { NoopTranslateModule } from './noop-translate.module'; +import { NgModule } from '@angular/core'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; + +@NgModule({ + imports: [BrowserDynamicTestingModule, NoopTranslateModule, NoopAnimationsModule] +}) +export class GlobalTestingModule {} diff --git a/lib/core/src/lib/toolbar/toolbar.component.spec.ts b/lib/core/src/lib/toolbar/toolbar.component.spec.ts index 467b949845..0b49cd96cf 100644 --- a/lib/core/src/lib/toolbar/toolbar.component.spec.ts +++ b/lib/core/src/lib/toolbar/toolbar.component.spec.ts @@ -17,7 +17,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ToolbarComponent } from './toolbar.component'; -import { NoopTranslateModule } from '../testing/noop-translate.module'; import { UnitTestingUtils } from '../testing/unit-testing-utils'; describe('ToolbarComponent', () => { @@ -26,7 +25,7 @@ describe('ToolbarComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, ToolbarComponent] + imports: [ToolbarComponent] }); fixture = TestBed.createComponent(ToolbarComponent); diff --git a/lib/core/src/lib/translation/translation.service.spec.ts b/lib/core/src/lib/translation/translation.service.spec.ts index 149decef69..373955b7e5 100644 --- a/lib/core/src/lib/translation/translation.service.spec.ts +++ b/lib/core/src/lib/translation/translation.service.spec.ts @@ -15,59 +15,61 @@ * limitations under the License. */ -import { HttpClientModule } from '@angular/common/http'; -import { Injector } from '@angular/core'; -import { getTestBed, TestBed } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; - -import { TranslateLoaderService } from './translate-loader.service'; -import { provideTranslations, TranslationService } from './translation.service'; +import { TranslationService } from './translation.service'; import { AppConfigService } from '../app-config/app-config.service'; import { AppConfigServiceMock } from '../common/mock/app-config.service.mock'; - -declare let jasmine: any; +import { of } from 'rxjs'; describe('TranslationService', () => { - let injector: Injector; let translationService: TranslationService; + class FakeLoader implements TranslateLoader { + init = (): void => { + // No implementation needed for this test + }; + + setDefaultLang = (_lang: string): void => { + // No implementation needed for this test + }; + + getTranslation = (lang: string) => { + const translations = { + en: { + TEST: 'This is a test', + TEST2: 'This is another test' + }, + fr: { + TEST: 'This is a test', + TEST2: 'This is another test' + } + }; + + return of(translations[lang]); + }; + } + beforeEach(() => { TestBed.configureTestingModule({ imports: [ - HttpClientModule, TranslateModule.forRoot({ loader: { provide: TranslateLoader, - useClass: TranslateLoaderService + useClass: FakeLoader } }) ], - providers: [ - { provide: AppConfigService, useClass: AppConfigServiceMock }, - provideTranslations('@alfresco/adf-core', 'assets/ng2-alfresco-core') - ] + providers: [TranslationService, { provide: AppConfigService, useClass: AppConfigServiceMock }] }); - jasmine.Ajax.install(); - - injector = getTestBed(); - translationService = injector.get(TranslationService); - translationService.addTranslationFolder('fake-name', 'fake-path'); + translationService = TestBed.inject(TranslationService); }); - afterEach(() => { - jasmine.Ajax.uninstall(); - }); - - it('should be able to get translations of the KEY: TEST', () => { + it('should be able to get translations of the KEY: TEST', (done) => { translationService.get('TEST').subscribe((res: string) => { expect(res).toEqual('This is a test'); - }); - - jasmine.Ajax.requests.mostRecent().respondWith({ - status: 200, - contentType: 'application/json', - responseText: JSON.stringify({ TEST: 'This is a test', TEST2: 'This is another test' }) + done(); }); }); @@ -75,12 +77,6 @@ describe('TranslationService', () => { translationService.get('TEST2').subscribe((res: string) => { expect(res).toEqual('This is another test'); }); - - jasmine.Ajax.requests.mostRecent().respondWith({ - status: 200, - contentType: 'application/json', - responseText: JSON.stringify({ TEST: 'This is a test', TEST2: 'This is another test' }) - }); }); it('should return empty string for missing key when getting instant translations', () => { diff --git a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.spec.ts b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.spec.ts index 9dbd867977..3f30d366ca 100644 --- a/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.spec.ts +++ b/lib/core/src/lib/viewer/components/pdf-viewer/pdf-viewer.component.spec.ts @@ -23,7 +23,7 @@ import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; import { AppConfigService } from '../../../app-config'; import { EventMock } from '../../../mock'; -import { NoopAuthModule, NoopTranslateModule, UnitTestingUtils } from '../../../testing'; +import { NoopAuthModule, UnitTestingUtils } from '../../../testing'; import { RenderingQueueServices } from '../../services/rendering-queue.services'; import { PdfThumbListComponent } from '../pdf-viewer-thumbnails/pdf-viewer-thumbnails.component'; import { PDFJS_MODULE, PDFJS_VIEWER_MODULE, PdfViewerComponent } from './pdf-viewer.component'; @@ -106,7 +106,7 @@ describe('Test PdfViewer component', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [NoopAuthModule, NoopTranslateModule, PdfViewerComponent], + imports: [NoopAuthModule, PdfViewerComponent], providers: [ { provide: MatDialog, @@ -355,7 +355,7 @@ describe('Test PdfViewer - Zoom customization', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopAuthModule, NoopTranslateModule, PdfViewerComponent], + imports: [NoopAuthModule, PdfViewerComponent], providers: [ { provide: MatDialog, @@ -428,7 +428,7 @@ describe('Test PdfViewer - User interaction', () => { }); TestBed.configureTestingModule({ - imports: [NoopAuthModule, NoopTranslateModule, PdfViewerComponent], + imports: [NoopAuthModule, PdfViewerComponent], providers: [ { provide: MatDialog, diff --git a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.spec.ts b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.spec.ts index 998fae9096..99f9753d9e 100644 --- a/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.spec.ts +++ b/lib/core/src/lib/viewer/components/viewer-render/viewer-render.component.spec.ts @@ -21,11 +21,10 @@ import { SpyLocation } from '@angular/common/testing'; import { Component, DebugElement, TemplateRef, ViewChild } from '@angular/core'; import { ComponentFixture, DeferBlockBehavior, TestBed } from '@angular/core/testing'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; -import { NoopTranslateModule, UnitTestingUtils } from '../../../testing'; +import { UnitTestingUtils } from '../../../testing'; import { RenderingQueueServices } from '../../services/rendering-queue.services'; import { ViewerRenderComponent } from './viewer-render.component'; import { ImgViewerComponent, MediaPlayerComponent, PdfViewerComponent, ViewerExtensionDirective } from '@alfresco/adf-core'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; @Component({ selector: 'adf-double-viewer', @@ -69,7 +68,7 @@ describe('ViewerComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, MatDialogModule, ViewerRenderComponent, DoubleViewerComponent], + imports: [MatDialogModule, ViewerRenderComponent, DoubleViewerComponent], providers: [RenderingQueueServices, { provide: Location, useClass: SpyLocation }, MatDialog], deferBlockBehavior: DeferBlockBehavior.Playthrough }); diff --git a/lib/core/src/lib/viewer/components/viewer.component.spec.ts b/lib/core/src/lib/viewer/components/viewer.component.spec.ts index bbd8125fbd..7b2f68cc3e 100644 --- a/lib/core/src/lib/viewer/components/viewer.component.spec.ts +++ b/lib/core/src/lib/viewer/components/viewer.component.spec.ts @@ -39,7 +39,7 @@ import { ThumbnailService } from '../../common/services/thumbnail.service'; @Component({ selector: 'adf-dialog-dummy', template: ``, - standalone: false + standalone: true }) class DummyDialogComponent {} diff --git a/lib/core/test.ts b/lib/core/test.ts index 13507a1267..8780163215 100644 --- a/lib/core/test.ts +++ b/lib/core/test.ts @@ -17,12 +17,12 @@ import 'zone.js'; import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; -import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; +import { TestBed } from '@angular/core/testing'; +import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; import pdfjsLibMock from './src/lib/viewer/components/mock/pdfjs-lib.mock'; +import { GlobalTestingModule } from './src/lib/testing/global-testing.module'; -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), { +TestBed.initTestEnvironment(GlobalTestingModule, platformBrowserDynamicTesting(), { teardown: { destroyAfterEach: true } }); diff --git a/lib/insights/src/lib/analytics-process/components/buttons-menu/buttons-menu.component.spec.ts b/lib/insights/src/lib/analytics-process/components/buttons-menu/buttons-menu.component.spec.ts index bd6bfb1399..bd21aef9d2 100644 --- a/lib/insights/src/lib/analytics-process/components/buttons-menu/buttons-menu.component.spec.ts +++ b/lib/insights/src/lib/analytics-process/components/buttons-menu/buttons-menu.component.spec.ts @@ -17,14 +17,13 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { Component } from '@angular/core'; -import { ButtonsMenuComponent } from '@alfresco/adf-insights'; -import { CommonModule } from '@angular/common'; import { MatMenuModule } from '@angular/material/menu'; import { MatIconModule } from '@angular/material/icon'; +import { ButtonsMenuComponent } from './buttons-menu.component'; @Component({ selector: 'adf-custom-container', - imports: [CommonModule, ButtonsMenuComponent, MatMenuModule, MatIconModule], + imports: [ButtonsMenuComponent, MatMenuModule, MatIconModule], template: ` @@ -41,8 +40,8 @@ export class CustomContainerComponent { @Component({ selector: 'adf-custom-empty-container', - template: ``, - standalone: false + template: ` `, + imports: [ButtonsMenuComponent] }) export class CustomEmptyContainerComponent {} @@ -54,7 +53,7 @@ describe('ButtonsMenuComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ButtonsMenuComponent, CustomContainerComponent] + imports: [CustomContainerComponent] }); fixture = TestBed.createComponent(CustomContainerComponent); element = fixture.debugElement.nativeElement; @@ -95,8 +94,7 @@ describe('ButtonsMenuComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ButtonsMenuComponent], - declarations: [CustomEmptyContainerComponent] + imports: [CustomEmptyContainerComponent] }); fixture = TestBed.createComponent(CustomEmptyContainerComponent); element = fixture.nativeElement; diff --git a/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.spec.ts b/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.spec.ts index 0f3c9573f8..c5b52c3cf6 100644 --- a/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.spec.ts +++ b/lib/insights/src/lib/diagram/components/tooltip/diagram-tooltip.component.spec.ts @@ -23,7 +23,7 @@ import { DiagramTooltipComponent } from './diagram-tooltip.component'; @Component({ template: `
Hover me
`, - standalone: false + imports: [DiagramTooltipComponent] }) class TestHostComponent { data = { @@ -123,8 +123,7 @@ describe('DiagramTooltipComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [DiagramTooltipComponent], - declarations: [TestHostComponent] + imports: [DiagramTooltipComponent, TestHostComponent] }); fixture = TestBed.createComponent(TestHostComponent); fixture.detectChanges(); diff --git a/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.spec.ts b/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.spec.ts index 5d96b338b9..eede774fbf 100644 --- a/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/file-viewer/file-viewer.widget.spec.ts @@ -17,7 +17,7 @@ import { FileViewerWidgetComponent } from './file-viewer.widget'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FormModel, FormService, FormFieldModel, RedirectAuthService, NoopTranslateModule } from '@alfresco/adf-core'; +import { FormModel, FormService, FormFieldModel, RedirectAuthService } from '@alfresco/adf-core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { EMPTY, of } from 'rxjs'; @@ -44,7 +44,7 @@ describe('FileViewerWidgetComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, FileViewerWidgetComponent], + imports: [FileViewerWidgetComponent], providers: [ { provide: FormService, useValue: formServiceStub }, { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } } diff --git a/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts b/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts index b03d53aa7c..dc8bb69b9f 100644 --- a/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts +++ b/lib/process-services/src/lib/form/widgets/radio-buttons/radio-buttons.widget.spec.ts @@ -25,8 +25,7 @@ import { FormFieldModel, FormModel, AppConfigServiceMock, - AppConfigService, - NoopTranslateModule + AppConfigService } from '@alfresco/adf-core'; import { RadioButtonsWidgetComponent } from './radio-buttons.widget'; import { TaskFormService } from '../../services/task-form.service'; @@ -44,7 +43,7 @@ describe('RadioButtonsWidgetComponent', () => { beforeEach(() => { getTestBed().configureTestingModule({ - imports: [NoopTranslateModule, RadioButtonsWidgetComponent], + imports: [RadioButtonsWidgetComponent], providers: [ { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, { provide: AppConfigService, useClass: AppConfigServiceMock } diff --git a/lib/process-services/src/lib/process-list/components/start-process/start-process.component.spec.ts b/lib/process-services/src/lib/process-list/components/start-process/start-process.component.spec.ts index 8f6a1f52ac..3555a1d50c 100644 --- a/lib/process-services/src/lib/process-list/components/start-process/start-process.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/start-process/start-process.component.spec.ts @@ -17,7 +17,7 @@ import { SimpleChange } from '@angular/core'; import { ComponentFixture, getTestBed } from '@angular/core/testing'; -import { AppConfigService, AppConfigServiceMock, FormRenderingService, LocalizedDatePipe, NoopTranslateModule } from '@alfresco/adf-core'; +import { AppConfigService, AppConfigServiceMock, FormRenderingService, LocalizedDatePipe } from '@alfresco/adf-core'; import { of, throwError } from 'rxjs'; import { MatSelectChange } from '@angular/material/select'; import { ProcessService } from '../../services/process.service'; @@ -34,7 +34,6 @@ import { HarnessLoader } from '@angular/cdk/testing'; import { MatFormFieldHarness } from '@angular/material/form-field/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatAutocompleteHarness } from '@angular/material/autocomplete/testing'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RestVariable } from '@alfresco/js-api'; import { ActivitiContentService } from '../../../form/services/activiti-alfresco.service'; import { AppsProcessService } from '../../../services/apps-process.service'; @@ -57,7 +56,7 @@ describe('StartProcessComponent', () => { beforeEach(() => { getTestBed().configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, StartProcessInstanceComponent], + imports: [StartProcessInstanceComponent], providers: [ LocalizedDatePipe, { provide: FormRenderingService, useClass: ProcessFormRenderingService }, diff --git a/lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts index e67491d946..4e28c16de5 100644 --- a/lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-list/task-list.component.spec.ts @@ -28,7 +28,6 @@ import { DataColumnComponent, DataColumnListComponent, FullNamePipe, - NoopTranslateModule, CustomEmptyContentTemplateDirective } from '@alfresco/adf-core'; import { TaskListService } from '../../services/tasklist.service'; @@ -41,7 +40,6 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { HarnessLoader } from '@angular/cdk/testing'; import { MatCheckboxHarness } from '@angular/material/checkbox/testing'; import { MatMenuItemHarness } from '@angular/material/menu/testing'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services'; import { CommonModule } from '@angular/common'; @@ -108,7 +106,7 @@ describe('TaskListComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NoopTranslateModule, NoopAnimationsModule, TaskListComponent], + imports: [TaskListComponent], providers: [ TaskListService, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, diff --git a/lib/process-services/src/lib/testing/global-testing.module.ts b/lib/process-services/src/lib/testing/global-testing.module.ts new file mode 100644 index 0000000000..c15f70ad1e --- /dev/null +++ b/lib/process-services/src/lib/testing/global-testing.module.ts @@ -0,0 +1,26 @@ +/*! + * @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 { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; +import { NoopTranslateModule } from '@alfresco/adf-core'; +import { NgModule } from '@angular/core'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; + +@NgModule({ + imports: [BrowserDynamicTestingModule, NoopTranslateModule, NoopAnimationsModule] +}) +export class GlobalTestingModule {} diff --git a/lib/process-services/src/test.ts b/lib/process-services/src/test.ts index 2f46da9721..58fd9755c6 100644 --- a/lib/process-services/src/test.ts +++ b/lib/process-services/src/test.ts @@ -17,10 +17,10 @@ import 'zone.js'; import 'zone.js/testing'; -import { getTestBed } from '@angular/core/testing'; -import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; +import { TestBed } from '@angular/core/testing'; +import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; +import { GlobalTestingModule } from './lib/testing/global-testing.module'; -// First, initialize the Angular testing environment. -getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), { +TestBed.initTestEnvironment(GlobalTestingModule, platformBrowserDynamicTesting(), { teardown: { destroyAfterEach: true } });