Skip to content

Commit 44a12ef

Browse files
committed
Changed method names in validationEngine
1 parent 8757b61 commit 44a12ef

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

lib/src/baseFormValidation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export class BaseFormValidation implements FormValidation {
7373
}
7474

7575
validateField(vm: any, key: string, value: any, eventsFilter?: ValidationEventsFilter): Promise<FieldValidationResult> {
76-
return this.validationEngine.triggerFieldValidation(vm, key, value, eventsFilter);
76+
return this.validationEngine.validateField(vm, key, value, eventsFilter);
7777
}
7878

7979
validateForm(vm: any): Promise<FormValidationResult> {

lib/src/spec/baseFormValidation.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ describe('formValidation tests', () => {
3434
expect(isFormDirty.calledOnce).to.be.true;
3535
}));
3636

37-
it('Spec#3 => should have an exposed method "validateField" that calls ValidationEngine.validateSingleField', sinon.test(function () {
37+
it('Spec#3 => should have an exposed method "validateField" that calls ValidationEngine.fireFieldValidations', sinon.test(function () {
3838
// Arrange
3939
const sinon: sinon.SinonStatic = this;
40-
const validateSingleField = sinon.stub(ValidationEngine.prototype, 'validateSingleField', () => { });
40+
const fireFieldValidations = sinon.stub(ValidationEngine.prototype, 'fireFieldValidations', () => { });
4141
const validationConstraints = {};
4242
const viewModel = {};
4343
const key = 'fullname';
@@ -49,7 +49,7 @@ describe('formValidation tests', () => {
4949
formValidation.validateField(viewModel, key, value, eventsFilter);
5050

5151
// Assert
52-
expect(validateSingleField.calledOnce).to.be.true;
52+
expect(fireFieldValidations.calledOnce).to.be.true;
5353
}));
5454

5555
it('Spec#4 => should have an exposed method "validateForm" that calls ValidationEngine.validateForm', sinon.test(function () {

lib/src/spec/validationEngine.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('ValidationEngine tests', () => {
1717
const viewModel = [{ formFieldName: 'nameId', vmFieldName: 'name' }];
1818

1919
formValidationBase
20-
.triggerFieldValidation(viewModel, 'nameId', 'newContent')
20+
.validateField(viewModel, 'nameId', 'newContent')
2121
.then((errors) => {
2222
// Assert
2323
expect(formValidationBase.isFormPristine()).to.be.false;
@@ -39,7 +39,7 @@ describe('ValidationEngine tests', () => {
3939
const viewModel = [{ formFieldName: 'nameId', vmFieldName: 'name' }];
4040

4141
formValidationBase
42-
.triggerFieldValidation(viewModel, 'nameId', 'newContent')
42+
.validateField(viewModel, 'nameId', 'newContent')
4343
.then((errors) => {
4444
// Assert
4545
expect(formValidationBase.isFormDirty()).to.be.true;
@@ -62,7 +62,7 @@ describe('ValidationEngine tests', () => {
6262

6363
// Act
6464
formValidationBase
65-
.triggerFieldValidation(viewModel, 'nameId', 'newContent')
65+
.validateField(viewModel, 'nameId', 'newContent')
6666
.then((errors) => {
6767
// Assert
6868
expect(formValidationBase.isValidationInProgress()).to.be.false;

lib/src/spec/validationEngineValidateSingleField.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('lcFormValidation simple form', () => {
2828
);
2929

3030
formValidationBase
31-
.triggerFieldValidation(viewModel, 'fullname', 'newContent')
31+
.validateField(viewModel, 'fullname', 'newContent')
3232
.then((errors) => {
3333
// Assert
3434
expect(formValidationBase.isValidationInProgress()).to.be.false;
@@ -66,7 +66,7 @@ describe('lcFormValidation simple form', () => {
6666
);
6767

6868
formValidationBase
69-
.triggerFieldValidation(viewModel, 'fullname', '')
69+
.validateField(viewModel, 'fullname', '')
7070
.then((fieldValidationResult: FieldValidationResult) => {
7171
// Assert
7272
expect(fieldValidationResult.key).to.be.equal('fullname');
@@ -103,7 +103,7 @@ describe('lcFormValidation simple form', () => {
103103
);
104104

105105
formValidationBase
106-
.triggerFieldValidation(viewModel, 'fullname', 'john')
106+
.validateField(viewModel, 'fullname', 'john')
107107
.then((fieldValidationResult: FieldValidationResult) => {
108108

109109
// Assert
@@ -128,7 +128,7 @@ describe('lcFormValidation simple form', () => {
128128
}
129129
);
130130

131-
const promise = formValidationBase.triggerFieldValidation(viewModel, 'fullname', '');
131+
const promise = formValidationBase.validateField(viewModel, 'fullname', '');
132132

133133
//Assert
134134
expect(promise).to.eventually.be.rejected.and.notify(done);

lib/src/validationEngine.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface IValidationEngine {
1717
isFormPristine(): boolean;
1818
isValidationInProgress(): boolean;
1919
validateForm(vm: any): Promise<FormValidationResult>;
20-
triggerFieldValidation(vm: any, key: string, value: any, eventsFilter?: ValidationEventsFilter): Promise<FieldValidationResult>;
20+
validateField(vm: any, key: string, value: any, eventsFilter?: ValidationEventsFilter): Promise<FieldValidationResult>;
2121
// TODO: Implement Issue #15
2222
addFieldValidation(key: string, validation: FieldValidationFunction, eventsFilter?: ValidationEventsFilter): void;
2323
addFormValidation(validation: FormValidationFunction): void;
@@ -53,7 +53,7 @@ export class ValidationEngine implements IValidationEngine {
5353
let fieldValidationResults: ValidationResult[] = validationsDispatcher.fireAllFieldsValidations(
5454
viewModel,
5555
Object.keys(this.validationsPerField),
56-
this.validateSingleField.bind(this)
56+
this.fireFieldValidations.bind(this)
5757
);
5858

5959
// Let's add GlobalFormValidations
@@ -97,14 +97,14 @@ export class ValidationEngine implements IValidationEngine {
9797
return globalFieldResultValidations;
9898
}
9999

100-
triggerFieldValidation(vm: any, key: string, value: any, filters: ValidationEventsFilter = consts.defaultFilter): Promise<FieldValidationResult> {
100+
validateField(vm: any, key: string, value: any, filters: ValidationEventsFilter = consts.defaultFilter): Promise<FieldValidationResult> {
101101
// updated dirty flag and perform validation
102102
this.isFormChanged = false;
103-
return this.validateSingleField(vm, key, value, filters);
103+
return this.fireFieldValidations(vm, key, value, filters);
104104
}
105105

106106
// if filter is null all validations are returned (fullform validation case)
107-
private validateSingleField(vm: any, key: string, value: any, filters: ValidationEventsFilter = null): Promise<FieldValidationResult> {
107+
private fireFieldValidations(vm: any, key: string, value: any, filters: ValidationEventsFilter = null): Promise<FieldValidationResult> {
108108
this.asyncValidationInProgressCount++;
109109

110110
const fieldValidationResultPromise = new Promise((resolve, reject) => {

0 commit comments

Comments
 (0)