[DURACOM-327] fix tests

Author: atarix83

src/app/access-control/epeople-registry/epeople-registry.component.spec.ts

@@ -71,13 +71,16 @@ describe('EPeopleRegistryComponent', () => {
   let authorizationService: AuthorizationDataService;
   let modalService: NgbModal;
   let paginationService: PaginationServiceStub;
+  let activeEPerson = null;
 
   beforeEach(waitForAsync(async () => {
     jasmine.getEnv().allowRespy(true);
     mockEPeople = [EPersonMock, EPersonMock2];
-    epeopleRegistryServiceStub = jasmine.createSpyObj('', {
-      getActiveEPerson: of(null),
-    });
+    epeopleRegistryServiceStub = {
+      getActiveEPerson(): Observable<EPerson> {
+        return of(activeEPerson);
+      },
+    };
     ePersonDataServiceStub = {
       activeEPerson: null,
       allEpeople: mockEPeople,
@@ -134,10 +137,10 @@ describe('EPeopleRegistryComponent', () => {
         return of(true);
       },
       editEPerson(ePerson: EPerson) {
-        this.activeEPerson = ePerson;
+        activeEPerson = ePerson;
       },
       cancelEditEPerson() {
-        this.activeEPerson = null;
+        activeEPerson = null;
       },
       clearEPersonRequests(): void {
         // empty

src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts

@@ -64,6 +64,7 @@ import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
 import { EPeopleRegistryComponent } from '../epeople-registry.component';
+import { EpeopleRegistryService } from '../epeople-registry.service';
 import { EPersonFormComponent } from './eperson-form.component';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
 
@@ -74,25 +75,29 @@ describe('EPersonFormComponent', () => {
 
   let mockEPeople;
   let ePersonDataServiceStub: any;
+  let epeopleRegistryServiceStub: any;
   let authService: AuthServiceStub;
   let authorizationService: AuthorizationDataService;
   let groupsDataService: GroupDataService;
   let epersonRegistrationService: EpersonRegistrationService;
   let route: ActivatedRouteStub;
   let router: RouterStub;
+  let activeEPerson = null;
 
   let paginationService;
 
 
 
   beforeEach(waitForAsync(() => {
     mockEPeople = [EPersonMock, EPersonMock2];
+    epeopleRegistryServiceStub = {
+      getActiveEPerson(): Observable<EPerson> {
+        return of(activeEPerson);
+      },
+    };
     ePersonDataServiceStub = {
       activeEPerson: null,
       allEpeople: mockEPeople,
-      getActiveEPerson(): Observable<EPerson> {
-        return of(this.activeEPerson);
-      },
       searchByScope(scope: string, query: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<EPerson>>> {
         if (scope === 'email') {
           const result = this.allEpeople.find((ePerson: EPerson) => {
@@ -122,10 +127,10 @@ describe('EPersonFormComponent', () => {
         return createSuccessfulRemoteDataObject$(ePerson);
       },
       editEPerson(ePerson: EPerson) {
-        this.activeEPerson = ePerson;
+        activeEPerson = ePerson;
       },
       cancelEditEPerson() {
-        this.activeEPerson = null;
+        activeEPerson = null;
       },
       clearEPersonRequests(): void {
         // empty
@@ -230,6 +235,7 @@ describe('EPersonFormComponent', () => {
       ],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
+        { provide: EpeopleRegistryService, useValue: epeopleRegistryServiceStub },
         { provide: GroupDataService, useValue: groupsDataService },
         { provide: FormBuilderService, useValue: builderService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
@@ -389,7 +395,7 @@ describe('EPersonFormComponent', () => {
     });
     describe('without active EPerson', () => {
       beforeEach(() => {
-        spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(of(undefined));
+        spyOn(epeopleRegistryServiceStub, 'getActiveEPerson').and.returnValue(of(undefined));
         component.onSubmit();
         fixture.detectChanges();
       });
@@ -429,7 +435,7 @@ describe('EPersonFormComponent', () => {
             },
           },
         });
-        spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(of(expectedWithId));
+        spyOn(epeopleRegistryServiceStub, 'getActiveEPerson').and.returnValue(of(expectedWithId));
         component.ngOnInit();
         component.onSubmit();
         fixture.detectChanges();
@@ -486,7 +492,7 @@ describe('EPersonFormComponent', () => {
       eperson = EPersonMock;
       component.epersonInitial = eperson;
       component.canDelete$ = of(true);
-      spyOn(component.epersonService, 'getActiveEPerson').and.returnValue(of(eperson));
+      spyOn(component.epeopleRegistryService, 'getActiveEPerson').and.returnValue(of(eperson));
       modalService = (component as any).modalService;
       spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: of(true) }) }));
       component.ngOnInit();

src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts

@@ -19,7 +19,6 @@ import { DefaultChangeAnalyzer } from '@core/data/default-change-analyzer.servic
 import { DSOChangeAnalyzer } from '@core/data/dso-change-analyzer.service';
 import { ItemDataService } from '@core/data/item-data.service';
 import { buildPaginatedList } from '@core/data/paginated-list.model';
-import { RelationshipDataService } from '@core/data/relationship-data.service';
 import { RemoteData } from '@core/data/remote-data';
 import { Bitstream } from '@core/shared/bitstream.model';
 import { HALEndpointService } from '@core/shared/hal-endpoint.service';
@@ -233,7 +232,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
       imports: [TruncatePipe, PersonSearchResultListSubmissionElementComponent],
       providers: [
         { provide: TruncatableService, useValue: {} },
-        { provide: RelationshipDataService, useValue: mockNameVariantService },
+        { provide: NameVariantService, useValue: mockNameVariantService },
         { provide: TranslateService, useValue: translateServiceStub },
         { provide: NgbModal, useValue: {} },
         { provide: ItemDataService, useValue: {} },

src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts

@@ -9,11 +9,10 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { RouterTestingModule } from '@angular/router/testing';
+import { provideRouter } from '@angular/router';
 import { RemoteDataBuildService } from '@core/cache/builders/remote-data-build.service';
 import { ExternalSourceDataService } from '@core/data/external-source-data.service';
 import { LookupRelationService } from '@core/data/lookup-relation.service';
-import { RelationshipDataService } from '@core/data/relationship-data.service';
 import { Collection } from '@core/shared/collection.model';
 import { ExternalSource } from '@core/shared/external-source.model';
 import { Item } from '@core/shared/item.model';
@@ -41,6 +40,7 @@ import { PaginatedSearchOptions } from '../../../../search/models/paginated-sear
 import { createPaginatedList } from '../../../../testing/utils.test';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component';
+import { NameVariantService } from './name-variant.service';
 import {
   AddRelationshipAction,
   RemoveRelationshipAction,
@@ -124,8 +124,9 @@ describe('DsDynamicLookupRelationModalComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule, DsDynamicLookupRelationModalComponent, BtnDisabledDirective],
+      imports: [TranslateModule.forRoot(), NgbModule, DsDynamicLookupRelationModalComponent, BtnDisabledDirective],
       providers: [
+        provideRouter(([])),
         {
           provide: SearchConfigurationService, useValue: {
             paginatedSearchOptions: of(pSearchOptions),
@@ -137,7 +138,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
           provide: SelectableListService, useValue: selectableListService,
         },
         {
-          provide: RelationshipDataService, useValue: { getNameVariant: () => of(nameVariant) },
+          provide: NameVariantService, useValue: { getNameVariant: () => of(nameVariant) },
         },
         { provide: RemoteDataBuildService, useValue: rdbService },
         {