hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Additional fix for CI tests

Browse Source
This commit is contained in:
Matteo Perelli
2020-06-26 11:19:44 +02:00
parent 97b4b90585
commit e094663a77
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.spec.ts
View File

@@ -21,7 +21,8 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
let compAsAny: any; let compAsAny: any;
let fixture: ComponentFixture<SubmissionImportExternalPreviewComponent>; let fixture: ComponentFixture<SubmissionImportExternalPreviewComponent>;
let submissionServiceStub: SubmissionServiceStub; 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(), { const externalEntry = Object.assign(new ExternalSourceEntry(), {
id: '0001-0001-0001-0001', id: '0001-0001-0001-0001',
display: 'John Doe', display: 'John Doe',
@@ -49,8 +50,8 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
{ provide: Router, useValue: new RouterStub() }, { provide: Router, useValue: new RouterStub() },
{ provide: SubmissionService, useValue: new SubmissionServiceStub() }, { provide: SubmissionService, useValue: new SubmissionServiceStub() },
{ provide: NotificationsService, useValue: new NotificationsServiceStub() }, { provide: NotificationsService, useValue: new NotificationsServiceStub() },
{ provide: NgbModal, useValue: { open: () => {/*comment*/} } }, { provide: NgbModal, useValue: ngbModal },
{ provide: NgbActiveModal, useValue: modal }, { provide: NgbActiveModal, useValue: ngbActiveModal },
SubmissionImportExternalPreviewComponent SubmissionImportExternalPreviewComponent
], ],
schemas: [NO_ERRORS_SCHEMA] schemas: [NO_ERRORS_SCHEMA]
@@ -129,7 +130,7 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
{ id: 'jk11k13o-9v4z-632i-sr88-wq071n0h1d47' } { id: 'jk11k13o-9v4z-632i-sr88-wq071n0h1d47' }
]; ];
comp.externalSourceEntry = externalEntry; comp.externalSourceEntry = externalEntry;
spyOn(compAsAny.modalService, 'open').and.returnValue({componentInstance: { selectedEvent: observableOf(emittedEvent)}}); ngbModal.open.and.returnValue({componentInstance: { selectedEvent: observableOf(emittedEvent)}});
spyOn(comp, 'closeMetadataModal'); spyOn(comp, 'closeMetadataModal');
submissionServiceStub.createSubmissionFromExternalSource.and.returnValue(observableOf(submissionObjects)); submissionServiceStub.createSubmissionFromExternalSource.and.returnValue(observableOf(submissionObjects));
spyOn(compAsAny.router, 'navigateByUrl'); spyOn(compAsAny.router, 'navigateByUrl');

6
src/app/submission/import-external/submission-import-external.component.spec.ts
View File

@@ -23,6 +23,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
let comp: SubmissionImportExternalComponent; let comp: SubmissionImportExternalComponent;
let compAsAny: any; let compAsAny: any;
let fixture: ComponentFixture<SubmissionImportExternalComponent>; let fixture: ComponentFixture<SubmissionImportExternalComponent>;
const ngbModal = jasmine.createSpyObj('modal', ['open']);
const mockSearchOptions = of(new PaginatedSearchOptions({ const mockSearchOptions = of(new PaginatedSearchOptions({
pagination: Object.assign(new PaginationComponentOptions(), { pagination: Object.assign(new PaginationComponentOptions(), {
pageSize: 10, pageSize: 10,
@@ -48,7 +49,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
{ provide: SearchConfigurationService, useValue: searchConfigServiceStub }, { provide: SearchConfigurationService, useValue: searchConfigServiceStub },
{ provide: RouteService, useValue: routeServiceStub }, { provide: RouteService, useValue: routeServiceStub },
{ provide: Router, useValue: new RouterStub() }, { provide: Router, useValue: new RouterStub() },
NgbModal, { provide: NgbModal, useValue: ngbModal },
SubmissionImportExternalComponent SubmissionImportExternalComponent
], ],
schemas: [NO_ERRORS_SCHEMA] schemas: [NO_ERRORS_SCHEMA]
@@ -93,7 +94,6 @@ describe('SubmissionImportExternalComponent test suite', () => {
it('Should init component properly (without route data)', () => { it('Should init component properly (without route data)', () => {
const expectedEntries = createSuccessfulRemoteDataObject(createPaginatedList([])); const expectedEntries = createSuccessfulRemoteDataObject(createPaginatedList([]));
spyOn(compAsAny.routeService, 'getQueryParameterValue').and.returnValue(observableOf('')); spyOn(compAsAny.routeService, 'getQueryParameterValue').and.returnValue(observableOf(''));
comp.ngOnInit();
fixture.detectChanges(); fixture.detectChanges();
expect(comp.routeData).toEqual({ sourceId: '', query: '' }); 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); comp.import(entry);
expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalPreviewComponent, { size: 'lg' }); expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalPreviewComponent, { size: 'lg' });