From b7c6faf6b3cf47626d33acd1fa77798d2927b462 Mon Sep 17 00:00:00 2001 From: SheenaMalhotra182 Date: Mon, 21 Aug 2023 13:28:52 +0530 Subject: [PATCH] [ACS-5857] resolved unit tests and linting issues --- .../widgets/core/form-field-validator.spec.ts | 10 ++-- .../widgets/core/form-field-validator.ts | 48 +++++++++---------- .../widgets/core/form-field.model.spec.ts | 2 +- .../widgets/core/form-field.model.ts | 2 +- .../date-time/date-time.widget.spec.ts | 2 +- .../components/form-cloud.component.spec.ts | 4 +- .../widgets/date/date-cloud.widget.spec.ts | 2 +- .../src/lib/form/mocks/cloud-form.mock.ts | 6 +-- .../src/lib/form/start-form.component.spec.ts | 4 +- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/core/src/lib/form/components/widgets/core/form-field-validator.spec.ts b/lib/core/src/lib/form/components/widgets/core/form-field-validator.spec.ts index 95fd1294ba..335750dcd5 100644 --- a/lib/core/src/lib/form/components/widgets/core/form-field-validator.spec.ts +++ b/lib/core/src/lib/form/components/widgets/core/form-field-validator.spec.ts @@ -714,7 +714,7 @@ describe('FormFieldValidator', () => { it('should take into account that max value is in UTC and NOT fail validating value checking the time', () => { const maxValueFromActivitiInput = '31-3-2018 12:00 AM'; - const maxValueSavedInForm = format(parse(maxValueFromActivitiInput, 'dd-MM-yyyy hh:mm a', new Date()), "yyyy-MM-dd'T'HH:mm:ssXXX"); + const maxValueSavedInForm = format(parse(maxValueFromActivitiInput, 'dd-MM-yyyy hh:mm a', new Date()), `yyyy-MM-dd'T'HH:mm:ssXXX`); const localValidValue = '2018-3-30 11:59 PM'; @@ -729,7 +729,7 @@ describe('FormFieldValidator', () => { it('should take into account that max value is in UTC and fail validating value checking the time', () => { const maxValueFromActivitiInput = '31-3-2018 12:00 AM'; - const maxValueSavedInForm = format(parse(maxValueFromActivitiInput, 'd-M-yyyy hh:mm a', new Date()), "yyyy-MM-dd'T'HH:mm:ssxxx"); + const maxValueSavedInForm = format(parse(maxValueFromActivitiInput, 'd-M-yyyy hh:mm a', new Date()), `yyyy-MM-dd'T'HH:mm:ssxxx`); const localInvalidValue = '2018-3-31 12:01 AM'; @@ -840,7 +840,7 @@ describe('FormFieldValidator', () => { it('should take into account that min value is in UTC and NOT fail validating value checking the time', () => { const minValueFromActivitiInput = '02-3-2018 06:00 AM'; - const minValueSavedInForm = format(parse(minValueFromActivitiInput, 'dd-MM-yyyy hh:mm a', new Date()), "yyyy-MM-dd'T'HH:mm:ssXXX"); + const minValueSavedInForm = format(parse(minValueFromActivitiInput, 'dd-MM-yyyy hh:mm a', new Date()), `yyyy-MM-dd'T'HH:mm:ssXXX`); const localValidValue = '2018-3-02 06:01 AM'; @@ -855,7 +855,7 @@ describe('FormFieldValidator', () => { it('should take into account that min value is in UTC and fail validating value checking the time', () => { const minValueFromActivitiInput = '02-3-2018 06:00 AM'; - const minValueSavedInForm = format(parse(minValueFromActivitiInput, 'dd-MM-yyyy hh:mm a', new Date()), "yyyy-MM-dd'T'HH:mm:ssXXX"); + const minValueSavedInForm = format(parse(minValueFromActivitiInput, 'dd-MM-yyyy hh:mm a', new Date()), `yyyy-MM-dd'T'HH:mm:ssXXX`); const localInvalidValue = '2018-3-02 05:59 AM'; @@ -1114,7 +1114,7 @@ describe('FormFieldValidator', () => { const field = new FormFieldModel(new FormModel(), { type: FormFieldTypes.DATETIME, value: '2021-06-09 02:10 PM', - dateDisplayFormat: 'yyyy-MM-dd hh:mm a', + dateDisplayFormat: 'yyyy-MM-dd hh:mm a' }); expect(validator.validate(field)).toBeTruthy(); diff --git a/lib/core/src/lib/form/components/widgets/core/form-field-validator.ts b/lib/core/src/lib/form/components/widgets/core/form-field-validator.ts index ccf93065b2..551577fdaa 100644 --- a/lib/core/src/lib/form/components/widgets/core/form-field-validator.ts +++ b/lib/core/src/lib/form/components/widgets/core/form-field-validator.ts @@ -212,18 +212,18 @@ export abstract class BoundaryDateFieldValidator implements FormFieldValidator { ]; validate(field: FormFieldModel): boolean { - let isValid = true; + let isFieldValid = true; if (this.isSupported(field) && field.value && field.isVisible) { const dateFormat = field.dateDisplayFormat; if (!DateFieldValidator.isValidDate(field.value, dateFormat)) { field.validationSummary.message = 'FORM.FIELD.VALIDATOR.INVALID_DATE'; - isValid = false; + isFieldValid = false; } else { - isValid = this.checkDate(field, dateFormat); + isFieldValid = this.checkDate(field, dateFormat); } } - return isValid; + return isFieldValid; } extractDateFormat(date: string): string { @@ -240,7 +240,7 @@ export class MinDateFieldValidator extends BoundaryDateFieldValidator { checkDate(field: FormFieldModel, dateFormat: string): boolean { - let isValid = true; + let isFieldValid = true; // remove time and timezone info let fieldValueData; if (typeof field.value === 'string') { @@ -255,9 +255,9 @@ export class MinDateFieldValidator extends BoundaryDateFieldValidator { if (isBefore(fieldValueData, min)) { field.validationSummary.message = `FORM.FIELD.VALIDATOR.NOT_LESS_THAN`; field.validationSummary.attributes.set('minValue', format(min, field.dateDisplayFormat).toLocaleUpperCase()); - isValid = false; + isFieldValid = false; } - return isValid; + return isFieldValid; } isSupported(field: FormFieldModel): boolean { @@ -270,7 +270,7 @@ export class MaxDateFieldValidator extends BoundaryDateFieldValidator { checkDate(field: FormFieldModel, dateFormat: string): boolean { - let isValid = true; + let isFieldValid = true; // remove time and timezone info let fieldValueData; if (typeof field.value === 'string') { @@ -285,9 +285,9 @@ export class MaxDateFieldValidator extends BoundaryDateFieldValidator { if (isAfter(fieldValueData, max)) { field.validationSummary.message = `FORM.FIELD.VALIDATOR.NOT_GREATER_THAN`; field.validationSummary.attributes.set('maxValue', format(max, field.dateDisplayFormat).toLocaleUpperCase()); - isValid = false; + isFieldValid = false; } - return isValid; + return isFieldValid; } isSupported(field: FormFieldModel): boolean { @@ -309,22 +309,22 @@ export class MinDateTimeFieldValidator implements FormFieldValidator { } validate(field: FormFieldModel): boolean { - let isValid = true; + let isFieldValid = true; if (this.isSupported(field) && field.value && field.isVisible) { const dateFormat = field.dateDisplayFormat; if (!DateFieldValidator.isValidDate(field.value, dateFormat)) { field.validationSummary.message = 'FORM.FIELD.VALIDATOR.INVALID_DATE'; - isValid = false; + isFieldValid = false; } else { - isValid = this.checkDateTime(field, dateFormat); + isFieldValid = this.checkDateTime(field, dateFormat); } } - return isValid; + return isFieldValid; } private checkDateTime(field: FormFieldModel, dateFormat: string): boolean { - let isValid = true; + let isFieldValid = true; let fieldValueDate; if (typeof field.value === 'string') { fieldValueDate = parse(field.value, dateFormat, new Date()); @@ -336,9 +336,9 @@ export class MinDateTimeFieldValidator implements FormFieldValidator { if (isBefore(fieldValueDate, new Date(min))) { field.validationSummary.message = `FORM.FIELD.VALIDATOR.NOT_LESS_THAN`; field.validationSummary.attributes.set('minValue', format(new Date(min), field.dateDisplayFormat).replace(':', '-')); - isValid = false; + isFieldValid = false; } - return isValid; + return isFieldValid; } } @@ -355,22 +355,22 @@ export class MaxDateTimeFieldValidator implements FormFieldValidator { } validate(field: FormFieldModel): boolean { - let isValid = true; + let isFieldValid = true; if (this.isSupported(field) && field.value && field.isVisible) { const dateFormat = field.dateDisplayFormat; if (!DateFieldValidator.isValidDate(field.value, dateFormat)) { field.validationSummary.message = 'FORM.FIELD.VALIDATOR.INVALID_DATE'; - isValid = false; + isFieldValid = false; } else { - isValid = this.checkDateTime(field, dateFormat); + isFieldValid = this.checkDateTime(field, dateFormat); } } - return isValid; + return isFieldValid; } private checkDateTime(field: FormFieldModel, dateFormat: string): boolean { - let isValid = true; + let isFieldValid = true; let fieldValueDate; if (typeof field.value === 'string') { @@ -383,9 +383,9 @@ export class MaxDateTimeFieldValidator implements FormFieldValidator { if (isAfter(fieldValueDate, new Date(max))) { field.validationSummary.message = `FORM.FIELD.VALIDATOR.NOT_GREATER_THAN`; field.validationSummary.attributes.set('maxValue', format(new Date(max), field.dateDisplayFormat).replace(':', '-')); - isValid = false; + isFieldValid = false; } - return isValid; + return isFieldValid; } } diff --git a/lib/core/src/lib/form/components/widgets/core/form-field.model.spec.ts b/lib/core/src/lib/form/components/widgets/core/form-field.model.spec.ts index 419615e1cc..5ab4b1926b 100644 --- a/lib/core/src/lib/form/components/widgets/core/form-field.model.spec.ts +++ b/lib/core/src/lib/form/components/widgets/core/form-field.model.spec.ts @@ -306,7 +306,7 @@ describe('FormFieldModel', () => { const currentDateTime = new Date(); const expectedDateTime = format(currentDateTime, 'yyyy-MM-dd hh:mm'); - const expectedDateTimeFormat = `${format(currentDateTime, "yyyy-MM-dd'T'hh:mm")}:00.000Z`; + const expectedDateTimeFormat = `${format(currentDateTime, `yyyy-MM-dd'T'hh:mm`)}:00.000Z`; expect(field.value).toBe(expectedDateTime); expect(form.values['datetime']).toEqual(expectedDateTimeFormat); diff --git a/lib/core/src/lib/form/components/widgets/core/form-field.model.ts b/lib/core/src/lib/form/components/widgets/core/form-field.model.ts index dd820c12c8..d37d063340 100644 --- a/lib/core/src/lib/form/components/widgets/core/form-field.model.ts +++ b/lib/core/src/lib/form/components/widgets/core/form-field.model.ts @@ -434,7 +434,7 @@ export class FormFieldModel extends FormWidgetModel { } const dateTimeValue = parse(this.value, this.dateDisplayFormat, new Date()); - + if (isValid(dateTimeValue)) { this.form.values[this.id] = `${format(dateTimeValue, 'yyyy-MM-dd\'T\'HH:mm:ss')}.000Z`; } else { diff --git a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts index 7c5e5268bd..d259964a9e 100644 --- a/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts +++ b/lib/core/src/lib/form/components/widgets/date-time/date-time.widget.spec.ts @@ -102,7 +102,7 @@ describe('DateTimeWidgetComponent', () => { }); widget.field = field; - const mockDate = format(new Date('1982-03-13 10:00 AM'), "yyyy-MM-dd'T'hh:mm:ssxxx"); + const mockDate = format(new Date('1982-03-13 10:00 AM'), `yyyy-MM-dd'T'hh:mm:ssxxx`); widget.onDateChanged(mockDate); expect(widget.onFieldChanged).toHaveBeenCalledWith(field); diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts index 3b615c2670..4962beac72 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts @@ -1186,7 +1186,7 @@ describe('Multilingual Form', () => { expect(getLabelValue('textField')).toEqual('Champ de texte'); expect(getLabelValue('fildUploadField')).toEqual('Téléchargement de fichiers'); - expect(getLabelValue('dateField')).toEqual('Champ de date (D-M-YYYY)'); + expect(getLabelValue('dateField')).toEqual('Champ de date (d-M-yyyy)'); expect(getLabelValue('amountField')).toEqual('Champ Montant'); await translateService.use('en').toPromise(); @@ -1196,7 +1196,7 @@ describe('Multilingual Form', () => { expect(getLabelValue('textField')).toEqual('Text field'); expect(getLabelValue('fildUploadField')).toEqual('File Upload'); - expect(getLabelValue('dateField')).toEqual('Date field (D-M-YYYY)'); + expect(getLabelValue('dateField')).toEqual('Date field (d-M-yyyy)'); expect(getLabelValue('amountField')).toEqual('Amount field'); }); diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.spec.ts b/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.spec.ts index 02a6ef51d4..44a259d81e 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/date/date-cloud.widget.spec.ts @@ -191,7 +191,7 @@ describe('DateWidgetComponent', () => { readOnly: 'false' }); field.isVisible = true; - field.dateDisplayFormat = 'MM-DD-YYYY'; + field.dateDisplayFormat = 'MM-dd-yyyy'; widget.field = field; widget.ngOnInit(); fixture.detectChanges(); diff --git a/lib/process-services-cloud/src/lib/form/mocks/cloud-form.mock.ts b/lib/process-services-cloud/src/lib/form/mocks/cloud-form.mock.ts index 35de61179f..17f6eea052 100644 --- a/lib/process-services-cloud/src/lib/form/mocks/cloud-form.mock.ts +++ b/lib/process-services-cloud/src/lib/form/mocks/cloud-form.mock.ts @@ -372,7 +372,7 @@ export const cloudFormMock = { existingColspan: 1, maxColspan: 2 }, - dateDisplayFormat: 'D-M-YYYY' + dateDisplayFormat: 'd-M-yyyy' } ], 2: [ @@ -393,7 +393,7 @@ export const cloudFormMock = { existingColspan: 1, maxColspan: 2 }, - dateDisplayFormat: 'D-M-YYYY' + dateDisplayFormat: 'd-M-yyyy' } ] } @@ -1037,7 +1037,7 @@ export const multilingualForm: any = { existingColspan: 1, maxColspan: 2 }, - dateDisplayFormat: 'D-M-YYYY' + dateDisplayFormat: 'd-M-yyyy' } ], 2: [] diff --git a/lib/process-services/src/lib/form/start-form.component.spec.ts b/lib/process-services/src/lib/form/start-form.component.spec.ts index de00ae8d9b..badf08e2a6 100644 --- a/lib/process-services/src/lib/form/start-form.component.spec.ts +++ b/lib/process-services/src/lib/form/start-form.component.spec.ts @@ -271,7 +271,7 @@ describe('StartFormComponent', () => { expect(dateWidget).toBeTruthy(); expect(labelField.type).toBe('date'); - expect(dateLabelElement.innerText).toBe('date (D-M-YYYY)'); + expect(dateLabelElement.innerText).toBe('date (d-M-yyyy)'); }); it('should fetch and define form fields with proper type', () => { @@ -312,7 +312,7 @@ describe('StartFormComponent', () => { expect(selectElement).toBeDefined(); expect(translate.instant(inputLabelElement.textContent)).toBe('ClientName*'); - expect(translate.instant(dateLabelElement.innerText)).toBe('BillDate (D-M-YYYY)'); + expect(translate.instant(dateLabelElement.innerText)).toBe('BillDate (d-M-yyyy)'); expect(translate.instant(selectLabelElement.innerText)).toBe('ClaimType'); });