diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts index 2060594de4..3bb6a19645 100644 --- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts +++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts @@ -21,7 +21,8 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => { let compAsAny: any; let fixture: ComponentFixture; let submissionServiceStub: SubmissionServiceStub; - const modal = jasmine.createSpyObj('modal', ['close', 'dismiss']); + const ngbActiveModal = jasmine.createSpyObj('modal', ['close', 'dismiss']); + const ngbModal = jasmine.createSpyObj('modal', ['open']); const externalEntry = Object.assign(new ExternalSourceEntry(), { id: '0001-0001-0001-0001', display: 'John Doe', @@ -49,8 +50,8 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => { { provide: Router, useValue: new RouterStub() }, { provide: SubmissionService, useValue: new SubmissionServiceStub() }, { provide: NotificationsService, useValue: new NotificationsServiceStub() }, - { provide: NgbModal, useValue: { open: () => {/*comment*/} } }, - { provide: NgbActiveModal, useValue: modal }, + { provide: NgbModal, useValue: ngbModal }, + { provide: NgbActiveModal, useValue: ngbActiveModal }, SubmissionImportExternalPreviewComponent ], schemas: [NO_ERRORS_SCHEMA] @@ -129,7 +130,7 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => { { id: 'jk11k13o-9v4z-632i-sr88-wq071n0h1d47' } ]; comp.externalSourceEntry = externalEntry; - spyOn(compAsAny.modalService, 'open').and.returnValue({componentInstance: { selectedEvent: observableOf(emittedEvent)}}); + ngbModal.open.and.returnValue({componentInstance: { selectedEvent: observableOf(emittedEvent)}}); spyOn(comp, 'closeMetadataModal'); submissionServiceStub.createSubmissionFromExternalSource.and.returnValue(observableOf(submissionObjects)); spyOn(compAsAny.router, 'navigateByUrl'); diff --git a/src/app/submission/import-external/submission-import-external.component.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts index 6b5ec05171..923d431923 100644 --- a/src/app/submission/import-external/submission-import-external.component.spec.ts +++ b/src/app/submission/import-external/submission-import-external.component.spec.ts @@ -23,6 +23,7 @@ describe('SubmissionImportExternalComponent test suite', () => { let comp: SubmissionImportExternalComponent; let compAsAny: any; let fixture: ComponentFixture; + const ngbModal = jasmine.createSpyObj('modal', ['open']); const mockSearchOptions = of(new PaginatedSearchOptions({ pagination: Object.assign(new PaginationComponentOptions(), { pageSize: 10, @@ -48,7 +49,7 @@ describe('SubmissionImportExternalComponent test suite', () => { { provide: SearchConfigurationService, useValue: searchConfigServiceStub }, { provide: RouteService, useValue: routeServiceStub }, { provide: Router, useValue: new RouterStub() }, - NgbModal, + { provide: NgbModal, useValue: ngbModal }, SubmissionImportExternalComponent ], schemas: [NO_ERRORS_SCHEMA] @@ -93,7 +94,6 @@ describe('SubmissionImportExternalComponent test suite', () => { it('Should init component properly (without route data)', () => { const expectedEntries = createSuccessfulRemoteDataObject(createPaginatedList([])); spyOn(compAsAny.routeService, 'getQueryParameterValue').and.returnValue(observableOf('')); - comp.ngOnInit(); fixture.detectChanges(); expect(comp.routeData).toEqual({ sourceId: '', query: '' }); @@ -139,7 +139,7 @@ describe('SubmissionImportExternalComponent test suite', () => { ] } }); - spyOn(compAsAny.modalService, 'open').and.returnValue({componentInstance: { externalSourceEntry: null}}); + ngbModal.open.and.returnValue({componentInstance: { externalSourceEntry: null}}); comp.import(entry); expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalPreviewComponent, { size: 'lg' });