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

fix: error messages for exclusiveMaximum/Minimum wint $data, closes #722

master
Evgeny Poberezkin 2018-03-03 13:41:50 +00:00
parent 8bbc1a2107
commit db56b51fff
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/dot/_limit.jst
View File

@ -50,6 +50,14 @@
)
|| {{=$data}} !== {{=$data}}) {
var op{{=$lvl}} = {{=$exclusive}} ? '{{=$op}}' : '{{=$op}}=';
{{
if ($schema === undefined) {
$errorKeyword = $exclusiveKeyword;
$errSchemaPath = it.errSchemaPath + '/' + $exclusiveKeyword;
$schemaValue = $schemaValueExcl;
$isData = $isDataExcl;
}
}}
{{??}}
{{
var $exclIsNumber = typeof $schemaExcl == 'number'

36
spec/errors.spec.js
View File

@ -711,6 +711,42 @@ describe('Validation errors', function () {
}
});
});
it('should include limits in error message with $data', function() {
var schema = {
"properties": {
"smaller": {
"type": "number",
"exclusiveMaximum": { "$data": "1/larger" }
},
"larger": { "type": "number" }
}
};
ajv = new Ajv({$data: true});
fullAjv = new Ajv({$data: true, allErrors: true, verbose: true, jsonPointers: true});
[ajv, fullAjv].forEach(function (_ajv) {
var validate = _ajv.compile(schema);
shouldBeValid(validate, {smaller: 2, larger: 4});
shouldBeValid(validate, {smaller: 3, larger: 4});
shouldBeInvalid(validate, {smaller: 4, larger: 4});
testError();
shouldBeInvalid(validate, {smaller: 5, larger: 4});
testError();
function testError() {
var err = validate.errors[0];
shouldBeError(err, 'exclusiveMaximum',
'#/properties/smaller/exclusiveMaximum',
_ajv._opts.jsonPointers ? '/smaller' : '.smaller',
'should be < 4',
{comparison: '<', limit: 4, exclusive: true});
}
});
});
});