From b54cc6885425e0241c1094009782228738f99a4e Mon Sep 17 00:00:00 2001 From: VitoAlbano Date: Fri, 21 Jun 2024 10:19:45 +0100 Subject: [PATCH] Fixed unit test after rebase --- .../src/lib/common/services/content.service.spec.ts | 4 ++-- .../src/lib/common/services/people-content.service.spec.ts | 4 ++-- .../src/lib/dialogs/download-zip/download-zip.dialog.spec.ts | 4 ++-- .../directives/check-allowable-operation.directive.spec.ts | 4 ++-- .../src/lib/directives/library-favorite.directive.spec.ts | 4 ++-- .../src/lib/directives/node-delete.directive.spec.ts | 4 ++-- .../src/lib/directives/node-download.directive.spec.ts | 4 ++-- .../file-auto-download/file-auto-download.component.spec.ts | 4 ++-- .../src/lib/document-list/services/lock.service.spec.ts | 4 ++-- .../lib/node-comments/services/node-comments.service.spec.ts | 4 ++-- .../src/lib/tag/tags-creator/tags-creator.component.spec.ts | 2 +- .../version-compatibility.directive.spec.ts | 4 ++-- lib/core/src/lib/auth/guard/auth-guard-bpm.service.spec.ts | 4 ++-- lib/core/src/lib/auth/guard/auth-guard-ecm.service.spec.ts | 4 ++-- lib/core/src/lib/auth/guard/auth-guard.service.spec.ts | 4 ++-- lib/core/src/lib/auth/services/authentication.service.spec.ts | 2 +- .../lib/form/widgets/file-viewer/file-viewer.widget.spec.ts | 4 ++-- .../components/start-process/start-process.component.spec.ts | 3 ++- .../components/task-list/task-list.component.spec.ts | 2 +- 19 files changed, 35 insertions(+), 34 deletions(-) diff --git a/lib/content-services/src/lib/common/services/content.service.spec.ts b/lib/content-services/src/lib/common/services/content.service.spec.ts index 5f206accbe..71bdd1017c 100644 --- a/lib/content-services/src/lib/common/services/content.service.spec.ts +++ b/lib/content-services/src/lib/common/services/content.service.spec.ts @@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing'; import { ContentService } from './content.service'; import { AppConfigService, AuthenticationService, RedirectAuthService, StorageService } from '@alfresco/adf-core'; import { Node, PermissionsInfo } from '@alfresco/js-api'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe('ContentService', () => { @@ -30,7 +30,7 @@ describe('ContentService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule], - providers: [ContentService, AuthenticationService, { provide: RedirectAuthService, useValue: { onLogin: EMPTY } }] + providers: [ContentService, AuthenticationService, { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }] }); authService = TestBed.inject(AuthenticationService); contentService = TestBed.inject(ContentService); diff --git a/lib/content-services/src/lib/common/services/people-content.service.spec.ts b/lib/content-services/src/lib/common/services/people-content.service.spec.ts index 3432e0277a..eff52f8f77 100644 --- a/lib/content-services/src/lib/common/services/people-content.service.spec.ts +++ b/lib/content-services/src/lib/common/services/people-content.service.spec.ts @@ -20,7 +20,7 @@ import { AlfrescoApiService, AlfrescoApiServiceMock, RedirectAuthService } from import { PeopleContentQueryRequestModel, PeopleContentService } from './people-content.service'; import { TestBed } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; describe('PeopleContentService', () => { let peopleContentService: PeopleContentService; @@ -31,7 +31,7 @@ describe('PeopleContentService', () => { providers: [ PeopleContentService, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, - { provide: RedirectAuthService, useValue: { onLogin: EMPTY } } + { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } } ] }); 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 767918e278..b8628d4fa4 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 @@ -19,7 +19,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { DownloadZipDialogComponent } from './download-zip.dialog'; import { DownloadZipService } from './services/download-zip.service'; -import { EMPTY, Observable } from 'rxjs'; +import { EMPTY, Observable, of } from 'rxjs'; import { AlfrescoApiService, AlfrescoApiServiceMock, RedirectAuthService, TranslationMock, TranslationService } from '@alfresco/adf-core'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TranslateModule } from '@ngx-translate/core'; @@ -47,7 +47,7 @@ describe('DownloadZipDialogComponent', () => { { provide: TranslationService, useClass: TranslationMock }, { provide: MatDialogRef, useValue: dialogRef }, { provide: MAT_DIALOG_DATA, useValue: dataMock }, - { provide: RedirectAuthService, useValue: { onLogin: EMPTY } } + { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } } ] }); dialogRef.close.calls.reset(); 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 6a53f34389..ea15e51780 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 @@ -22,7 +22,7 @@ import { TestBed } from '@angular/core/testing'; import { NodeAllowableOperationSubject } from '../interfaces/node-allowable-operation-subject.interface'; import { ContentDirectiveModule } from './content-directive.module'; import { RedirectAuthService } from '@alfresco/adf-core'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @Component({ @@ -39,7 +39,7 @@ describe('CheckAllowableOperationDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ContentDirectiveModule, HttpClientTestingModule], - providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY } }] + providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }] }); changeDetectorMock = { detectChanges: () => {} } as ChangeDetectorRef; }); diff --git a/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts b/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts index 1abc7a4a41..8fe872cd7d 100644 --- a/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts +++ b/lib/content-services/src/lib/directives/library-favorite.directive.spec.ts @@ -41,8 +41,8 @@ describe('LibraryFavoriteDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - declarations: [TestComponent, LibraryFavoriteDirective] + imports: [HttpClientTestingModule, TestComponent], + declarations: [LibraryFavoriteDirective] }); fixture = TestBed.createComponent(TestComponent); component = fixture.componentInstance; 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 8598ed2fe8..3c0508b2bf 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 @@ -23,7 +23,7 @@ import { ContentDirectiveModule } from './content-directive.module'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TranslateModule } from '@ngx-translate/core'; import { RedirectAuthService, TranslationMock, TranslationService } from '@alfresco/adf-core'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; @Component({ template: `
` @@ -82,7 +82,7 @@ describe('NodeDeleteDirective', () => { imports: [ContentDirectiveModule, HttpClientTestingModule, TranslateModule.forRoot()], providers: [ { provide: TranslationService, useClass: TranslationMock }, - { provide: RedirectAuthService, useValue: { onLogin: EMPTY } } + { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } } ], declarations: [TestComponent, TestWithPermissionsComponent, TestDeletePermanentComponent] }); diff --git a/lib/content-services/src/lib/directives/node-download.directive.spec.ts b/lib/content-services/src/lib/directives/node-download.directive.spec.ts index dd4cd43986..bbc6bd3551 100755 --- a/lib/content-services/src/lib/directives/node-download.directive.spec.ts +++ b/lib/content-services/src/lib/directives/node-download.directive.spec.ts @@ -17,7 +17,7 @@ import { TestBed, ComponentFixture } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { MatDialog } from '@angular/material/dialog'; +import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { Component, DebugElement, ViewChild } from '@angular/core'; import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-core'; import { NodeDownloadDirective } from './node-download.directive'; @@ -53,7 +53,7 @@ describe('NodeDownloadDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ContentDirectiveModule, HttpClientTestingModule], + imports: [ContentDirectiveModule, HttpClientTestingModule, MatDialogModule], declarations: [TestComponent], providers: [{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }] }); 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 aa702561b5..5c4b52e96f 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 @@ -37,8 +37,8 @@ describe('FileAutoDownloadComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, TranslateModule.forRoot(), MatDialogModule, MatButtonModule], - declarations: [FileAutoDownloadComponent, NodeDownloadDirective], + imports: [HttpClientTestingModule, TranslateModule.forRoot(), MatDialogModule, MatButtonModule, NodeDownloadDirective], + declarations: [FileAutoDownloadComponent], providers: [ { provide: MatDialogRef, useValue: mockDialog }, { provide: MAT_DIALOG_DATA, useValue: null }, diff --git a/lib/content-services/src/lib/document-list/services/lock.service.spec.ts b/lib/content-services/src/lib/document-list/services/lock.service.spec.ts index a91cee588b..59b7e55a0c 100644 --- a/lib/content-services/src/lib/document-list/services/lock.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/lock.service.spec.ts @@ -21,7 +21,7 @@ import { AuthenticationService, RedirectAuthService } from '@alfresco/adf-core'; import { Node } from '@alfresco/js-api'; import { addDays, subDays } from 'date-fns'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; describe('LockService', () => { let service: LockService; @@ -34,7 +34,7 @@ describe('LockService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientTestingModule], - providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY } }] + providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }] }); service = TestBed.inject(LockService); authenticationService = TestBed.inject(AuthenticationService); diff --git a/lib/content-services/src/lib/node-comments/services/node-comments.service.spec.ts b/lib/content-services/src/lib/node-comments/services/node-comments.service.spec.ts index 8b1301cb54..723eab3326 100644 --- a/lib/content-services/src/lib/node-comments/services/node-comments.service.spec.ts +++ b/lib/content-services/src/lib/node-comments/services/node-comments.service.spec.ts @@ -20,7 +20,7 @@ import { AlfrescoApiService, AlfrescoApiServiceMock, CommentModel, RedirectAuthS import { fakeContentComment, fakeContentComments } from '../mocks/node-comments.mock'; import { NodeCommentsService } from './node-comments.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; declare let jasmine: any; @@ -32,7 +32,7 @@ describe('NodeCommentsService', () => { imports: [HttpClientTestingModule], providers: [ { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, - { provide: RedirectAuthService, useValue: { onLogin: EMPTY } } + { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } } ] }); service = TestBed.inject(NodeCommentsService); 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 ecf8ccb9f2..9164adb21c 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 @@ -308,7 +308,7 @@ describe('TagsCreatorComponent', () => { component.tagNameControlVisible = true; fixture.detectChanges(); tick(100); - expect(getNameInput()).not.toBe(document.activeElement as HTMLInputElement); + expect(getNameInput()).not.toEqual(document.activeElement as HTMLInputElement); })); it('should input be autofocused after showing input second time', fakeAsync(() => { 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 f509dfcfb2..0b176a0b39 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 @@ -23,7 +23,7 @@ import { VersionCompatibilityService } from './version-compatibility.service'; import { VersionInfo } from '@alfresco/js-api'; import { VersionCompatibilityModule } from './version-compatibility.module'; import { RedirectAuthService } from '@alfresco/adf-core'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @Component({ @@ -53,7 +53,7 @@ describe('VersionCompatibilityDirective', () => { TestBed.configureTestingModule({ imports: [VersionCompatibilityModule, HttpClientTestingModule], declarations: [TestComponent], - providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY } }] + providers: [{ provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }] }); fixture = TestBed.createComponent(TestComponent); versionCompatibilityService = TestBed.inject(VersionCompatibilityService); 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 fa365b5609..f4c8770798 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 @@ -25,7 +25,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { RedirectAuthService } from '../oidc/redirect-auth.service'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; import { OidcAuthenticationService } from '../oidc/oidc-authentication.service'; describe('AuthGuardService BPM', () => { @@ -41,7 +41,7 @@ describe('AuthGuardService BPM', () => { TestBed.configureTestingModule({ imports: [TranslateModule.forRoot(), HttpClientTestingModule, MatDialogModule], providers: [ - { provide: RedirectAuthService, useValue: { onLogin: EMPTY } }, + { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }, { provide: OidcAuthenticationService, useValue: { 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 fc41edd864..7946bee14e 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,7 +26,7 @@ import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.serv import { HttpClientTestingModule } from '@angular/common/http/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { RedirectAuthService } from '../oidc/redirect-auth.service'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; import { OidcAuthenticationService } from '../oidc/oidc-authentication.service'; describe('AuthGuardService ECM', () => { @@ -52,7 +52,7 @@ describe('AuthGuardService ECM', () => { isLoggedIn: () => false } }, - { provide: RedirectAuthService, useValue: { onLogin: EMPTY } } + { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } } ] }); localStorage.clear(); 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 03d2049b40..0dadf36b86 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 @@ -25,7 +25,7 @@ import { StorageService } from '../../common/services/storage.service'; import { OidcAuthenticationService } from '../oidc/oidc-authentication.service'; import { BasicAlfrescoAuthService } from '../basic-auth/basic-alfresco-auth.service'; import { RedirectAuthService } from '../oidc/redirect-auth.service'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { MatDialogModule } from '@angular/material/dialog'; import { RouterTestingModule } from '@angular/router/testing'; @@ -46,7 +46,7 @@ describe('AuthGuardService', () => { providers: [ AppConfigService, StorageService, - { provide: RedirectAuthService, useValue: { onLogin: EMPTY } }, + { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } }, { provide: OidcAuthenticationService, useValue: { 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 6d66bdb0bc..78e53537de 100644 --- a/lib/core/src/lib/auth/services/authentication.service.spec.ts +++ b/lib/core/src/lib/auth/services/authentication.service.spec.ts @@ -542,7 +542,7 @@ describe('AuthenticationService', () => { const onTokenReceivedSpy = jasmine.createSpy(); authenticationService.onTokenReceived.subscribe(onTokenReceivedSpy); - onTokenReceived$.next(); + onTokenReceived$.next({ type: 'token_received' }); expect(onTokenReceivedSpy).toHaveBeenCalled(); }); 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 d09b482ac5..e664861c33 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 @@ -29,7 +29,7 @@ import { import { TranslateModule } from '@ngx-translate/core'; import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { EMPTY } from 'rxjs'; +import { EMPTY, of } from 'rxjs'; describe('FileViewerWidgetComponent', () => { const fakeForm = new FormModel(); @@ -59,7 +59,7 @@ describe('FileViewerWidgetComponent', () => { { provide: FormService, useValue: formServiceStub }, { provide: TranslationService, useClass: TranslationMock }, AuthenticationService, - { provide: RedirectAuthService, useValue: { onLogin: EMPTY } } + { provide: RedirectAuthService, useValue: { onLogin: EMPTY, onTokenReceived: of() } } ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }); 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 d61f2fb869..92db7c220f 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 @@ -53,9 +53,10 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { RestVariable } from '@alfresco/js-api'; import { ActivitiContentService } from '../../../form/services/activiti-alfresco.service'; import { AppsProcessService } from '../../../services/apps-process.service'; -import { deployedApps } from '../../../mock/apps-list.mock'; + import { ProcessFormRenderingService } from '../../../form'; import { FORM_FIELD_MODEL_RENDER_MIDDLEWARE } from 'lib/core/src/lib/form/components/middlewares/middleware'; +import { deployedApps } from '../../../testing/mock/apps-list.mock'; describe('StartProcessComponent', () => { let appConfig: AppConfigService; 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 c7b4edd89c..5efebb5c93 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 @@ -33,7 +33,7 @@ import { TaskListService } from '../../services/tasklist.service'; import { TaskListComponent } from './task-list.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; import { fakeGlobalTask, fakeEmptyTask, paginatedTask, fakeColumnSchema, fakeCustomSchema } from '../../../testing/mock'; -import { TranslateService } from '@ngx-translate/core'; +import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { of, Subject } from 'rxjs'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { HarnessLoader } from '@angular/cdk/testing';