vitalif-js
/
ajv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #674 from lehni/fix/additional-properties-message 

Fix additionalProperties error with errorDataPath
master
Evgeny Poberezkin 2018-01-26 18:23:17 +00:00 committed by GitHub
parent 2726d298e8 4a12ca3b92
commit 1f75c5115c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/dot/errors.def
View File

@ -94,7 +94,7 @@
'false schema': "'boolean schema is false'",
$ref: "'can\\\'t resolve reference {{=it.util.escapeQuotes($schema)}}'",
additionalItems: "'should NOT have more than {{=$schema.length}} items'",
additionalProperties: "'should NOT have additional properties'",
additionalProperties: "'{{? it.opts._errorDataPathProperty }}is an invalid additional property{{??}}should NOT have additional properties{{?}}'",
anyOf: "'should match some schema in anyOf'",
const: "'should be equal to constant'",
contains: "'should contain a valid item'",

21
spec/errors.spec.js
View File

@ -64,22 +64,23 @@ describe('Validation errors', function () {
, invalidData = { foo: 1, bar: 2, baz: 3, quux: 4 };
var path = pathFunc(errorDataPath);
var msg = additionalFunc(errorDataPath);
var validate = ajv.compile(schema);
shouldBeValid(validate, data);
shouldBeInvalid(validate, invalidData);
shouldBeError(validate.errors[0], 'additionalProperties', '#/additionalProperties', path("['baz']"), undefined, { additionalProperty: 'baz' });
shouldBeError(validate.errors[0], 'additionalProperties', '#/additionalProperties', path("['baz']"), msg, { additionalProperty: 'baz' });
var validateJP = ajvJP.compile(schema);
shouldBeValid(validateJP, data);
shouldBeInvalid(validateJP, invalidData);
shouldBeError(validateJP.errors[0], 'additionalProperties', '#/additionalProperties', path("/baz"), undefined, { additionalProperty: 'baz' });
shouldBeError(validateJP.errors[0], 'additionalProperties', '#/additionalProperties', path("/baz"), msg, { additionalProperty: 'baz' });
var fullValidate = fullAjv.compile(schema);
shouldBeValid(fullValidate, data);
shouldBeInvalid(fullValidate, invalidData, 2);
shouldBeError(fullValidate.errors[0], 'additionalProperties', '#/additionalProperties', path('/baz'), undefined, { additionalProperty: 'baz' });
shouldBeError(fullValidate.errors[1], 'additionalProperties', '#/additionalProperties', path('/quux'), undefined, { additionalProperty: 'quux' });
shouldBeError(fullValidate.errors[0], 'additionalProperties', '#/additionalProperties', path('/baz'), msg, { additionalProperty: 'baz' });
shouldBeError(fullValidate.errors[1], 'additionalProperties', '#/additionalProperties', path('/quux'), msg, { additionalProperty: 'quux' });
if (errorDataPath == 'property') {
fullValidate.errors
@ -184,7 +185,7 @@ describe('Validation errors', function () {
delete invalidData2[98];
var path = pathFunc(errorDataPath);
var msg = msgFunc(errorDataPath);
var msg = requiredFunc(errorDataPath);
test();
@ -368,7 +369,7 @@ describe('Validation errors', function () {
, invalidData2 = { bar: 2 };
var path = pathFunc(errorDataPath);
var msg = msgFunc(errorDataPath);
var msg = requiredFunc(errorDataPath);
var validate = ajv.compile(schema);
shouldBeValid(validate, data);
@ -399,7 +400,7 @@ describe('Validation errors', function () {
};
}
function msgFunc(errorDataPath) {
function requiredFunc(errorDataPath) {
return function (prop) {
return errorDataPath == 'property'
? 'is a required property'
@ -407,6 +408,12 @@ describe('Validation errors', function () {
};
}
function additionalFunc(errorDataPath) {
return errorDataPath == 'property'
? 'is an invalid additional property'
: 'should NOT have additional properties';
}
it('"items" errors should include item index without quotes in dataPath (#48)', function() {
var schema1 = {