Merge branch 'v4'

ajv-validator · Apr 28, 2017 · 3aa523e · 3aa523e
2 parents 9802e23 + de9fad5
commit 3aa523e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/dot/validate.jst b/lib/dot/validate.jst
@@ -189,7 +189,7 @@
         {{?}}
       {{? $rulesGroup.type }}
         }
-        {{? $typeSchema && $typeSchema === $rulesGroup.type }}
+        {{? $typeSchema && $typeSchema === $rulesGroup.type && !$coerceToTypes }}
           {{ var $typeChecked = true; }}
           else {
             {{
@@ -209,7 +209,7 @@
   {{~}}
 {{?}}
 
-{{? $typeSchema && !$typeChecked && !(it.opts.coerceTypes && $coerceToTypes) }}
+{{? $typeSchema && !$typeChecked && !$coerceToTypes }}
   {{# def.checkType }}
     {{# def.error:'type' }}
   }

diff --git a/spec/coercion.spec.js b/spec/coercion.spec.js
@@ -397,6 +397,25 @@ describe('Type coercion', function () {
   });
 
 
+  it('should generate one error for type with coerceTypes option (issue #469)', function() {
+    var schema = {
+      "type": "number",
+      "minimum": 10
+    };
+
+    instances.forEach(function (_ajv) {
+      var validate = _ajv.compile(schema);
+      validate(9). should.equal(false);
+      validate.errors.length .should.equal(1);
+
+      validate(11). should.equal(true);
+
+      validate('foo'). should.equal(false);
+      validate.errors.length .should.equal(1);
+    });
+  });
+
+
   function testRules(rules, cb) {
     for (var toType in rules) {
       for (var fromType in rules[toType]) {