[changed] null is not considered an empty value for isValid

iryonetwork · Mar 29, 2016 · 3ae5fdc · 3ae5fdc
1 parent f848e74
commit 3ae5fdc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/mixed.js b/src/mixed.js
@@ -327,7 +327,7 @@ SchemaType.prototype = {
       name: 'oneOf',
       test(value) {
         let valids = this.schema._whitelist
-        if (valids.length && !(valids.has(value) || isAbsent(value)))
+        if (valids.length && !(value === undefined || valids.has(value)))
           return this.createError({
             params: {
               values: valids.values().join(', ')

diff --git a/test/mixed.js b/test/mixed.js
@@ -71,21 +71,27 @@ describe( 'Mixed Types ', function(){
   })
 
   it('should ignore absent values', function(){
-    return  Promise.all([
+    return Promise.all([
       mixed()
         .oneOf(['hello'])
         .isValid(undefined)
         .should.eventually.equal(true),
       mixed()
+        .nullable()
         .oneOf(['hello'])
-        .required()
         .isValid(null)
         .should.eventually.equal(false),
-      string()
+      mixed()
+        .oneOf(['hello'])
+        .required()
+        .isValid(undefined)
+        .should.eventually.equal(false),
+      mixed()
         .nullable()
         .oneOf(['hello'])
+        .required()
         .isValid(null)
-        .should.eventually.equal(true)
+        .should.eventually.equal(false)
     ])
   })