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

113500: Fixed tests after bugfix

Browse Source 
(cherry picked from commit 4e0046022b)
This commit is contained in:
lotte
2024-03-27 14:07:55 +01:00
committed by github-actions[bot]
parent 47537a019c
commit d8b6e86896
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/submission/sections/form/section-form.component.spec.ts
View File

@@ -261,7 +261,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
expect(comp.sectionData.errorsToShow).toEqual([]); expect(comp.sectionData.errorsToShow).toEqual([]);
expect(comp.sectionData.data).toEqual(sectionData); expect(comp.sectionData.data).toEqual(sectionData);
expect(comp.isLoading).toBeFalsy(); expect(comp.isLoading).toBeFalsy();
expect(comp.initForm).toHaveBeenCalledWith(sectionData); expect(comp.initForm).toHaveBeenCalledWith(sectionData, [], []);
expect(comp.subscriptions).toHaveBeenCalled(); expect(comp.subscriptions).toHaveBeenCalled();
}); });
@@ -269,7 +269,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
formBuilderService.modelFromConfiguration.and.returnValue(testFormModel); formBuilderService.modelFromConfiguration.and.returnValue(testFormModel);
const sectionData = {}; const sectionData = {};
comp.initForm(sectionData); comp.initForm(sectionData, [], []);
expect(comp.formModel).toEqual(testFormModel); expect(comp.formModel).toEqual(testFormModel);
@@ -284,7 +284,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
path: '/sections/' + sectionObject.id path: '/sections/' + sectionObject.id
}; };
comp.initForm(sectionData); comp.initForm(sectionData, [], []);
expect(comp.formModel).toBeUndefined(); expect(comp.formModel).toBeUndefined();
expect(sectionsServiceStub.setSectionError).toHaveBeenCalledWith(submissionId, sectionObject.id, sectionError); expect(sectionsServiceStub.setSectionError).toHaveBeenCalledWith(submissionId, sectionObject.id, sectionError);
@@ -443,7 +443,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
compAsAny.formData = {}; compAsAny.formData = {};
compAsAny.sectionMetadata = ['dc.title']; compAsAny.sectionMetadata = ['dc.title'];
comp.updateForm(sectionData, sectionError); comp.updateForm({data: sectionData, errorsToShow: sectionError} as any);
expect(comp.isUpdating).toBeFalsy(); expect(comp.isUpdating).toBeFalsy();
expect(comp.initForm).toHaveBeenCalled(); expect(comp.initForm).toHaveBeenCalled();
@@ -455,15 +455,19 @@ describe('SubmissionSectionFormComponent test suite', () => {
it('should update form error properly', () => { it('should update form error properly', () => {
spyOn(comp, 'initForm'); spyOn(comp, 'initForm');
spyOn(comp, 'checksForErrors'); spyOn(comp, 'checksForErrors');
const sectionData: any = { const sectionData = {
'dc.title': [new FormFieldMetadataValueObject('test')] 'dc.title': [new FormFieldMetadataValueObject('test')]
}; };
const sectionState = {
data: sectionData,
errorsToShow: [{path: '/test', message: 'test'}],
} as any;
comp.sectionData.data = {}; comp.sectionData.data = {};
comp.sectionData.errorsToShow = []; comp.sectionData.errorsToShow = [];
compAsAny.formData = sectionData; compAsAny.formData = sectionData;
compAsAny.sectionMetadata = ['dc.title']; compAsAny.sectionMetadata = ['dc.title'];
comp.updateForm(sectionData, parsedSectionErrors); comp.updateForm(sectionState);
expect(comp.initForm).not.toHaveBeenCalled(); expect(comp.initForm).not.toHaveBeenCalled();
expect(comp.checksForErrors).toHaveBeenCalled(); expect(comp.checksForErrors).toHaveBeenCalled();
@@ -474,8 +478,9 @@ describe('SubmissionSectionFormComponent test suite', () => {
spyOn(comp, 'initForm'); spyOn(comp, 'initForm');
spyOn(comp, 'checksForErrors'); spyOn(comp, 'checksForErrors');
const sectionData: any = {}; const sectionData: any = {};
const sectionErrors: any = [{ path: '/test', message: 'test'}];
comp.updateForm(sectionData, parsedSectionErrors); comp.updateForm({data: sectionData, errorsToShow: sectionErrors} as any);
expect(comp.initForm).not.toHaveBeenCalled(); expect(comp.initForm).not.toHaveBeenCalled();
expect(comp.checksForErrors).toHaveBeenCalled(); expect(comp.checksForErrors).toHaveBeenCalled();
@@ -541,7 +546,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
const sectionState = { const sectionState = {
data: sectionData, data: sectionData,
errorsToShow: parsedSectionErrors errorsToShow: parsedSectionErrors
}; } as any;
formService.getFormData.and.returnValue(observableOf(formData)); formService.getFormData.and.returnValue(observableOf(formData));
sectionsServiceStub.getSectionState.and.returnValue(observableOf(sectionState)); sectionsServiceStub.getSectionState.and.returnValue(observableOf(sectionState));
@@ -550,7 +555,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
expect(compAsAny.subs.length).toBe(2); expect(compAsAny.subs.length).toBe(2);
expect(compAsAny.formData).toEqual(formData); expect(compAsAny.formData).toEqual(formData);
expect(comp.updateForm).toHaveBeenCalledWith(sectionState.data, sectionState.errorsToShow); expect(comp.updateForm).toHaveBeenCalledWith(sectionState);
}); });

6
src/app/submission/sections/form/section-form.component.ts
View File

@@ -322,10 +322,8 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
/** /**
* Update form model * Update form model
* *
* @param sectionData * @param sectionState
* the section data retrieved from the server * the section state retrieved from the server
* @param errors
* the section errors retrieved from the server
*/ */
updateForm(sectionState: SubmissionSectionObject): void { updateForm(sectionState: SubmissionSectionObject): void {