Skip to content

Commit

Permalink
feat: Save nested error messages in correct order
Browse files Browse the repository at this point in the history 
ref: flatiron/revalidator#98
  • Loading branch information
Andreas Krummsdorf committed Feb 27, 2015
1 parent 6ffd99a commit 058dad7
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions lib/revalidator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@

});

nestedErrors.unshift(0, 0);
nestedErrors.unshift(errors.length, 0);
Array.prototype.splice.apply(errors, nestedErrors);
}

Expand Down Expand Up @@ -641,7 +641,7 @@
nestedErrors.forEach(function (e) {
e.property = property + '.' + e.property;
});
nestedErrors.unshift(0, 0);
nestedErrors.unshift(errors.length, 0);
Array.prototype.splice.apply(errors, nestedErrors);
}
break;
Expand Down
44 changes: 22 additions & 22 deletions test/tests.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ describe('Validator', function () {
expected: 'string',
actual: 'number',
message: 'must be of string type',
property: 'arr.2'
property: 'arr.0'
},
{
attribute: 'type',
Expand All @@ -402,7 +402,7 @@ describe('Validator', function () {
expected: 'string',
actual: 'number',
message: 'must be of string type',
property: 'arr.0'
property: 'arr.2'
}
]);

Expand Down Expand Up @@ -477,7 +477,7 @@ describe('Validator', function () {
expect(result.errors).toEqual([
{
attribute: 'type',
property: '2',
property: '0',
expected: 'string',
actual: 'number',
message: 'must be of string type'
Expand All @@ -491,7 +491,7 @@ describe('Validator', function () {
},
{
attribute: 'type',
property: '0',
property: '2',
expected: 'string',
actual: 'number',
message: 'must be of string type'
Expand All @@ -514,8 +514,8 @@ describe('Validator', function () {
var result = val.validate({arr: ['2', 1, '3', 4, '5']}, schema);
expect(result.valid).toBeFalsy();
expect(result.errors.length).toBe(2);
expect(result.errors[0].property).toBe('arr.3');
expect(result.errors[1].property).toBe('arr.1');
expect(result.errors[0].property).toBe('arr.1');
expect(result.errors[1].property).toBe('arr.3');
});

it('should return the array index in the error message when array in array', function () {
Expand All @@ -536,8 +536,8 @@ describe('Validator', function () {
var result = val.validate({arr: [['2', 1, '3'], [4, '5']]}, schema);
expect(result.valid).toBeFalsy();
expect(result.errors.length).toBe(2);
expect(result.errors[0].property).toBe('arr.1.0');
expect(result.errors[1].property).toBe('arr.0.1');
expect(result.errors[0].property).toBe('arr.0.1');
expect(result.errors[1].property).toBe('arr.1.0');
});

it('should return the array index in the error message when object in array', function () {
Expand Down Expand Up @@ -684,13 +684,13 @@ describe('Validator', function () {
}
}, schema);
expect(result.valid).toBeFalsy();
expect(result.errors[1].property).toBe('person.addresses.1.street');
expect(result.errors[0].property).toBe('person.addresses.2.users.1');
expect(result.errors[0].property).toBe('person.addresses.1.street');
expect(result.errors[1].property).toBe('person.addresses.2.users.1');

result = val.validate({arrayWithArrays: [[1, 2, 3], [4, '5', 6], ['7', 8, 9]]}, schema);
expect(result.valid).toBeFalsy();
expect(result.errors[0].property).toBe('arrayWithArrays.2.0');
expect(result.errors[1].property).toBe('arrayWithArrays.1.1');
expect(result.errors[0].property).toBe('arrayWithArrays.1.1');
expect(result.errors[1].property).toBe('arrayWithArrays.2.0');

});

Expand Down Expand Up @@ -761,8 +761,8 @@ describe('Validator', function () {
codes: [1, 2, 3]
}, {name: 'wayne', codes: [1, 2, '3', 4]}], schema);
expect(result.valid).toBeFalsy();
expect(result.errors[1].property).toBe('0.codes.1');
expect(result.errors[0].property).toBe('2.codes.2');
expect(result.errors[0].property).toBe('0.codes.1');
expect(result.errors[1].property).toBe('2.codes.2');

result = val.validate([{
name: 'wayne',
Expand All @@ -778,14 +778,14 @@ describe('Validator', function () {
}
], schema);
expect(result.valid).toBeFalsy();
expect(result.errors[1].property).toBe('0.addresses.1.street');
expect(result.errors[0].property).toBe('0.addresses.2.users.1');
expect(result.errors[0].property).toBe('0.addresses.1.street');
expect(result.errors[1].property).toBe('0.addresses.2.users.1');

result = val.validate([{arrayWithArrays: [[1, 2, 3], [4, '5', 6], ['7', 8, 9]]}, {arrayWithArrays: [[1, 2, 3], [4, 5, 6], ['7', 8, 9]]}], schema);
expect(result.valid).toBeFalsy();
expect(result.errors[0].property).toBe('0.arrayWithArrays.1.1');
expect(result.errors[1].property).toBe('0.arrayWithArrays.2.0');
expect(result.errors[2].property).toBe('0.arrayWithArrays.1.1');
expect(result.errors[0].property).toBe('1.arrayWithArrays.2.0');
expect(result.errors[2].property).toBe('1.arrayWithArrays.2.0');

});

Expand All @@ -802,8 +802,8 @@ describe('Validator', function () {
var result = val.validate([['2', 1, '3'], [4, '5']], schema);
expect(result.valid).toBeFalsy();
expect(result.errors.length).toBe(2);
expect(result.errors[1].property).toBe('0.1');
expect(result.errors[0].property).toBe('1.0');
expect(result.errors[0].property).toBe('0.1');
expect(result.errors[1].property).toBe('1.0');
});
});

Expand Down Expand Up @@ -1129,9 +1129,9 @@ describe('Validator', function () {
result = val.validate(data, schema, {strictRequired: true});

expect(result.valid).toBeFalsy();
expect(result.errors[0].property).toBe('names.3');
expect(result.errors[0].property).toBe('name');
expect(result.errors[0].message).toBe('is required');
expect(result.errors[1].property).toBe('name');
expect(result.errors[1].property).toBe('names.3');
expect(result.errors[1].message).toBe('is required');
});

Expand Down

0 comments on commit 058dad7

Please sign in to comment.