Skip to content

Switch parameters order in validation functions #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brauliodiez merged 2 commits into from
Mar 7, 2017
Merged

Switch parameters order in validation functions #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d290fa8
Switched pameters for validation functions in ValidationEngine and Va…
crsanti Mar 7, 2017
5a62215
Updated samples
crsanti Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ lib/README.md
lib/ReadmeResources/
lib/coverage/
yarn.lock
.vscode/
8 changes: 4 additions & 4 deletions lib/src/spec/validationEngine.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ describe('lcFormValidation', () => {
'when passing a key equals "test1" and validationsPerField equals ["test2": validationFn]', () => {
//Arrange
let key = "test1";
let validationFn = (vm, value) => {
let validationFn = (value, vm) => {
let fieldValidationResult = new FieldValidationResult();
return Promise.resolve(fieldValidationResult);
};
Expand All @@ -138,7 +138,7 @@ describe('lcFormValidation', () => {
'when passing a key equals "test" and validationsPerField equals ["test": validationFn]', () => {
//Arrange
let key = "test";
let validationFn = (vm, value) => {
let validationFn = (value, vm) => {
let fieldValidationResult = new FieldValidationResult();
return Promise.resolve(fieldValidationResult);
}
Expand All @@ -155,7 +155,7 @@ describe('lcFormValidation', () => {
it('should return itself after adding a validation rule using addFieldValidation method', () => {
// Arrange
const key = 'test1';
const validationFn = (vm, value) => {
const validationFn = (value, vm) => {
return new FieldValidationResult();
};
const validationEngine = new ValidationEngine();
Expand All @@ -171,7 +171,7 @@ describe('lcFormValidation', () => {
it('should return itself after adding a validation rule using addFieldValidationAsync method', () => {
// Arrange
const key = 'test1';
const validationFn = (vm, value) => {
const validationFn = (value, vm) => {
return Promise.resolve(new FieldValidationResult());
};
const validationEngine = new ValidationEngine();
Expand Down
52 changes: 26 additions & 26 deletions lib/src/spec/validationEngineValidateForm.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ describe('ValidationEngine Validate Form', () => {
describe('Group #1 => When calling validateFullForm and addFieldValidationAsync', () => {
it('Spec #1 => should return a failed FormValidationResult with one fieldErrors equals ' +
'{ succeeded: false, key: "fullname", type: "REQUIRED", errorMessage: "Mandatory Field" } ' +
'When passing one validation rule with key equals "fullname" and viewModel equals { id: "1", fullname: "" }', (done) => {
' when passing one validation rule with key equals "fullname" and viewModel equals { id: "1", fullname: "" }', (done) => {
// Arrange
const validationEngine = new ValidationEngine();
const viewModel = { id: '1', fullname: '' };

// Act
validationEngine.addFieldValidationAsync('fullname',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand Down Expand Up @@ -57,7 +57,7 @@ describe('ValidationEngine Validate Form', () => {

// Act
validationEngine.addFieldValidationAsync('fullname',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand Down Expand Up @@ -98,7 +98,7 @@ describe('ValidationEngine Validate Form', () => {
// Act
// name mandatory
validationEngine.addFieldValidationAsync('fullname',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand All @@ -117,7 +117,7 @@ describe('ValidationEngine Validate Form', () => {

// password mandatory and min length 3
validationEngine.addFieldValidationAsync('password',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// Required field
// in this case no async stuff
Expand All @@ -136,7 +136,7 @@ describe('ValidationEngine Validate Form', () => {
);

validationEngine.addFieldValidationAsync('password',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// minLenght
// in this case no async stuff
Expand Down Expand Up @@ -188,7 +188,7 @@ describe('ValidationEngine Validate Form', () => {
// Act
// name mandatory
validationEngine.addFieldValidationAsync('fullname',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand All @@ -207,7 +207,7 @@ describe('ValidationEngine Validate Form', () => {

// password mandatory and min length 3
validationEngine.addFieldValidationAsync('password',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// Required field
// in this case no async stuff
Expand All @@ -226,7 +226,7 @@ describe('ValidationEngine Validate Form', () => {
);

validationEngine.addFieldValidationAsync('password',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// minLenght
// in this case no async stuff
Expand Down Expand Up @@ -278,7 +278,7 @@ describe('ValidationEngine Validate Form', () => {
// Act
// name mandatory
validationEngine.addFieldValidationAsync('fullname',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand All @@ -297,7 +297,7 @@ describe('ValidationEngine Validate Form', () => {

// password mandatory and min length 3
validationEngine.addFieldValidationAsync('password',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// Required field
// in this case no async stuff
Expand All @@ -316,7 +316,7 @@ describe('ValidationEngine Validate Form', () => {
);

validationEngine.addFieldValidationAsync('password',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// minLenght
// in this case no async stuff
Expand Down Expand Up @@ -368,7 +368,7 @@ describe('ValidationEngine Validate Form', () => {
// Act
// name mandatory
validationEngine.addFieldValidationAsync('fullname',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand All @@ -387,7 +387,7 @@ describe('ValidationEngine Validate Form', () => {

// password mandatory and min length 3
validationEngine.addFieldValidationAsync('password',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// Required field
// in this case no async stuff
Expand All @@ -406,7 +406,7 @@ describe('ValidationEngine Validate Form', () => {
);

validationEngine.addFieldValidationAsync('password',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// minLenght
// in this case no async stuff
Expand Down Expand Up @@ -453,7 +453,7 @@ describe('ValidationEngine Validate Form', () => {

// Act
validationEngine.addFieldValidationAsync('fullname',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
let error: boolean = true;
if (error) {
throw "Intentionally uncontrolled exception, single field validation testing fullform validations"
Expand Down Expand Up @@ -741,7 +741,7 @@ describe('ValidationEngine Validate Form', () => {

// Act
validationEngine.addFieldValidationAsync('address',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// Required field
// in this case no async stuff
Expand Down Expand Up @@ -803,7 +803,7 @@ describe('ValidationEngine Validate Form', () => {

// Act
validationEngine.addFieldValidationAsync('address',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// Required field
// in this case no async stuff
Expand Down Expand Up @@ -865,7 +865,7 @@ describe('ValidationEngine Validate Form', () => {

// Act
validationEngine.addFieldValidationAsync('address',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// Required field
// in this case no async stuff
Expand Down Expand Up @@ -927,7 +927,7 @@ describe('ValidationEngine Validate Form', () => {

// Act
validationEngine.addFieldValidationAsync('address',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
// We will isolate this into common functions
// Required field
// in this case no async stuff
Expand Down Expand Up @@ -1020,7 +1020,7 @@ describe('ValidationEngine Validate Form', () => {

// Act
validationEngine.addFieldValidation('fullname',
(vm, value): FieldValidationResult => {
(value, vm): FieldValidationResult => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand Down Expand Up @@ -1060,7 +1060,7 @@ describe('ValidationEngine Validate Form', () => {

// Act
validationEngine.addFieldValidation('fullname',
(vm, value): FieldValidationResult => {
(value, vm): FieldValidationResult => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand Down Expand Up @@ -1101,7 +1101,7 @@ describe('ValidationEngine Validate Form', () => {

// Act
validationEngine.addFieldValidation('fullname',
(vm, value): FieldValidationResult => {
(value, vm): FieldValidationResult => {
let isFieldInformed: boolean = (value != null && value.length > 0);
let errorInfo: string = (isFieldInformed) ? "" : "Mandatory field";

Expand All @@ -1115,7 +1115,7 @@ describe('ValidationEngine Validate Form', () => {
);

validationEngine.addFieldValidationAsync('password',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
let isFieldInformed: boolean = (value != null && value.length > 0);
let errorInfo: string = (isFieldInformed) ? "" : "Mandatory field";

Expand Down Expand Up @@ -1160,7 +1160,7 @@ describe('ValidationEngine Validate Form', () => {
// Act
// name mandatory
validationEngine.addFieldValidation('fullname',
(vm, value): FieldValidationResult => {
(value, vm): FieldValidationResult => {
let isFieldInformed: boolean = (value != null && value.length > 0);
let errorInfo: string = (isFieldInformed) ? "" : "Mandatory field";

Expand All @@ -1175,7 +1175,7 @@ describe('ValidationEngine Validate Form', () => {

// password mandatory and min length 3
validationEngine.addFieldValidationAsync('password',
(vm, value): Promise<FieldValidationResult> => {
(value, vm): Promise<FieldValidationResult> => {
let isFieldInformed: boolean = (value != null && value.length > 0);
let errorInfo: string = (isFieldInformed) ? "" : "Mandatory field";

Expand Down
28 changes: 14 additions & 14 deletions lib/src/spec/validationEngineValidateSingleField.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ describe('lcFormValidation simple form', () => {
const viewModel = { id: '1', fullname: 'john' };

// Act
formValidationBase.addFieldValidationAsync('nameId',
(vm, value): Promise<FieldValidationResult> => {
formValidationBase.addFieldValidationAsync('fullname',
(value, vm): Promise<FieldValidationResult> => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand All @@ -35,7 +35,7 @@ describe('lcFormValidation simple form', () => {
)

formValidationBase
.triggerFieldValidation(viewModel, 'nameId', 'newContent')
.triggerFieldValidation(viewModel, 'fullname', 'newContent')
.then((errors) => {
// Assert
expect(formValidationBase.isValidationInProgress()).to.be.false;
Expand All @@ -54,8 +54,8 @@ describe('lcFormValidation simple form', () => {
const viewModel = { id: '1', fullname: 'john' };

// Act
formValidationBase.addFieldValidationAsync('nameId',
(vm, value): Promise<FieldValidationResult> => {
formValidationBase.addFieldValidationAsync('fullname',
(value, vm): Promise<FieldValidationResult> => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand All @@ -73,10 +73,10 @@ describe('lcFormValidation simple form', () => {
);

formValidationBase
.triggerFieldValidation(viewModel, 'nameId', '')
.triggerFieldValidation(viewModel, 'fullname', '')
.then((fieldValidationResult: FieldValidationResult) => {
// Assert
expect(fieldValidationResult.key).to.be.equal('nameId');
expect(fieldValidationResult.key).to.be.equal('fullname');
expect(fieldValidationResult.type).to.equal('REQUIRED');
expect(fieldValidationResult.succeeded).to.be.false;
expect(fieldValidationResult.errorMessage).to.equal("Mandatory field");
Expand All @@ -91,8 +91,8 @@ describe('lcFormValidation simple form', () => {
const viewModel = { id: '1', fullname: 'john' };

// Act
formValidationBase.addFieldValidationAsync('nameId',
(vm, value): Promise<FieldValidationResult> => {
formValidationBase.addFieldValidationAsync('fullname',
(value, vm): Promise<FieldValidationResult> => {
// Required field
// in this case no async stuff
// we can directly resolve the promise
Expand All @@ -109,11 +109,11 @@ describe('lcFormValidation simple form', () => {
}
);
formValidationBase
.triggerFieldValidation(viewModel, 'nameId', 'john')
.triggerFieldValidation(viewModel, 'fullname', 'john')
.then((fieldValidationResult: FieldValidationResult) => {

// Assert
expect(fieldValidationResult.key).to.be.equal('nameId');
expect(fieldValidationResult.key).to.be.equal('fullname');
expect(fieldValidationResult.type).to.equal('REQUIRED');
expect(fieldValidationResult.succeeded).to.be.true;
expect(fieldValidationResult.errorMessage).to.be.empty;
Expand All @@ -128,8 +128,8 @@ describe('lcFormValidation simple form', () => {
const viewModel = { id: '1', fullname: 'john' };

// Act
formValidationBase.addFieldValidationAsync('nameId',
(vm, value): Promise<FieldValidationResult> => {
formValidationBase.addFieldValidationAsync('fullname',
(value, vm): Promise<FieldValidationResult> => {
let error = true;

if (error == true) {
Expand All @@ -149,7 +149,7 @@ describe('lcFormValidation simple form', () => {
);

const promise = formValidationBase
.triggerFieldValidation(viewModel, 'nameId', '');
.triggerFieldValidation(viewModel, 'fullname', '');

//Assert
expect(promise).to.eventually.be.rejected.notify(done);
Expand Down
Loading