From fa64872a9b3ce1e215392bfe4cc0b00ec3c9bcef Mon Sep 17 00:00:00 2001 From: Amedeo Lepore Date: Thu, 29 Jun 2023 15:28:27 +0200 Subject: [PATCH] Fix content-services unit tests: getEcmUsername from authentication service Fix content-services unit tests: alfresco api service has been replaced by authentication service --- .../components/document-list.component.spec.ts | 12 ++++++------ .../document-list/services/lock.service.spec.ts | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts index c78326a8a4..80af384544 100644 --- a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts @@ -18,7 +18,6 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, QueryList, Component, ViewChild, SimpleChanges } from '@angular/core'; import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; import { - AlfrescoApiService, DataColumnListComponent, DataColumnComponent, DataColumn, @@ -27,7 +26,8 @@ import { ObjectDataTableAdapter, ShowHeaderMode, ThumbnailService, - AppConfigService + AppConfigService, + AuthenticationService } from '@alfresco/adf-core'; import { ContentService } from '../../common/services/content.service'; import { Subject, of, throwError } from 'rxjs'; @@ -69,7 +69,6 @@ const mockDialog = { describe('DocumentList', () => { let documentList: DocumentListComponent; let documentListService: DocumentListService; - let apiService: AlfrescoApiService; let customResourcesService: CustomResourcesService; let thumbnailService: ThumbnailService; let contentService: ContentService; @@ -81,6 +80,7 @@ describe('DocumentList', () => { let spyFavorite: any; let spyFolder: any; let spyFolderNode: any; + let authenticationService: AuthenticationService; beforeEach(() => { TestBed.configureTestingModule({ @@ -98,11 +98,11 @@ describe('DocumentList', () => { documentList = fixture.componentInstance; documentListService = TestBed.inject(DocumentListService); - apiService = TestBed.inject(AlfrescoApiService); customResourcesService = TestBed.inject(CustomResourcesService); thumbnailService = TestBed.inject(ThumbnailService); contentService = TestBed.inject(ContentService); appConfigService = TestBed.inject(AppConfigService); + authenticationService = TestBed.inject(AuthenticationService); spyFolder = spyOn(documentListService, 'getFolder').and.returnValue(of({ list: {} })); spyFolderNode = spyOn(documentListService, 'getFolderNode').and.returnValue(of(new NodeEntry({ entry: {} }))); @@ -622,7 +622,7 @@ describe('DocumentList', () => { title: 'FileAction' }); - spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('lockOwner'); + spyOn(authenticationService, 'getEcmUsername').and.returnValue('lockOwner'); documentList.actions = [documentMenu]; @@ -653,7 +653,7 @@ describe('DocumentList', () => { title: 'FileAction' }); - spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('jerryTheKillerCow'); + spyOn(authenticationService, 'getEcmUsername').and.returnValue('jerryTheKillerCow'); documentList.actions = [documentMenu]; 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 c4afc940ee..e0cb39b800 100644 --- a/lib/content-services/src/lib/document-list/services/lock.service.spec.ts +++ b/lib/content-services/src/lib/document-list/services/lock.service.spec.ts @@ -17,7 +17,7 @@ import { TestBed } from '@angular/core/testing'; import { LockService } from './lock.service'; -import { CoreTestingModule, AlfrescoApiService } from '@alfresco/adf-core'; +import { CoreTestingModule, AuthenticationService } from '@alfresco/adf-core'; import { Node } from '@alfresco/js-api'; import moment from 'moment'; import { TranslateModule } from '@ngx-translate/core'; @@ -25,7 +25,7 @@ import { TranslateModule } from '@ngx-translate/core'; describe('PeopleProcessService', () => { let service: LockService; - let apiService: AlfrescoApiService; + let authenticationService: AuthenticationService; const fakeNodeUnlocked: Node = { name: 'unlocked', isLocked: false, isFile: true } as Node; const fakeFolderNode: Node = { name: 'unlocked', isLocked: false, isFile: false, isFolder: true } as Node; @@ -39,7 +39,7 @@ describe('PeopleProcessService', () => { ] }); service = TestBed.inject(LockService); - apiService = TestBed.inject(AlfrescoApiService); + authenticationService = TestBed.inject(AuthenticationService); }); it('should return false when no lock is configured', () => { @@ -145,22 +145,22 @@ describe('PeopleProcessService', () => { } as Node; it('should return false when the user is the lock owner', () => { - spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('lock-owner-user'); + spyOn(authenticationService, 'getEcmUsername').and.returnValue('lock-owner-user'); expect(service.isLocked(nodeOwnerAllowedLock)).toBeFalsy(); }); it('should return true when the user is not the lock owner', () => { - spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('banana-user'); + spyOn(authenticationService, 'getEcmUsername').and.returnValue('banana-user'); expect(service.isLocked(nodeOwnerAllowedLock)).toBeTruthy(); }); it('should return false when the user is not the lock owner but the lock is expired', () => { - spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('banana-user'); + spyOn(authenticationService, 'getEcmUsername').and.returnValue('banana-user'); expect(service.isLocked(nodeOwnerAllowedLockWithExpiredDate)).toBeFalsy(); }); it('should return true when is not the lock owner and the expiration date is valid', () => { - spyOn(apiService.getInstance(), 'getEcmUsername').and.returnValue('banana-user'); + spyOn(authenticationService, 'getEcmUsername').and.returnValue('banana-user'); expect(service.isLocked(nodeOwnerAllowedLockWithActiveExpiration)).toBeTruthy(); }); });