[changed] oneOf doesn't include empty values

iryonetwork · Feb 1, 2016 · f7f631d · f7f631d
1 parent c014a2a
commit f7f631d
Show file tree

Hide file tree

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

diff --git a/test/mixed.js b/test/mixed.js
@@ -70,6 +70,20 @@ describe( 'Mixed Types ', function(){
     ])
   })
 
+  it('should ignore absent values', function(){
+    return  Promise.all([
+      mixed()
+        .oneOf(['hello'])
+        .isValid(undefined)
+        .should.eventually.equal(true),
+      string()
+        .nullable()
+        .oneOf(['hello'])
+        .isValid(null)
+        .should.eventually.equal(true)
+    ])
+  })
+
   it('should exclude values', function(){
     var inst = mixed().notOneOf(['hello', 5])