fix: allow type "null" in combination with proprtty "enum"

Author: Andreas Krummsdorf

lib/revalidator.js

@@ -556,19 +556,22 @@
             }
         }
 
+        /* jshint ignore:start */
         if (schema['enum']) {
-            if (schema['type'] === 'array' && isArray(value)) {
+            if (value === null && isArray(schema.type) && schema.type.indexOf('null') > -1) {
+                // is allowed
+            } else if (schema['type'] === 'array' && isArray(value)) {
                 for (i = 0; i < value.length; i++) {
                     if (schema['enum'].indexOf(value[i]) === -1) {
                         error('enum', property, value, schema, errors);
                         break;
                     }
                 }
-            }
-            else if (schema['enum'].indexOf(value) === -1) {
+            } else if (schema['enum'].indexOf(value) === -1) {
                 error('enum', property, value, schema, errors);
             }
         }
+        /* jshint ignore:end */
 
         // Dependencies (see 5.8)
         if (typeof schema.dependencies === 'string' &&

test/tests.spec.js

@@ -1549,5 +1549,21 @@ describe('Validator', function () {
             expect(val.validate({test: 3}, schema).valid).toBeFalsy();
             expect(val.validate({test: 3}, schema).errors[0].expected).toBe('String');
         });
+
+        it('should handle types ["null", "string"] in combination with property "enum"', function () {
+            var schema = {
+                properties: {
+                    test: {
+                        type: ['null', 'string'],
+                        enum: ['a', 'b', 'c']
+                    }
+                }
+            };
+
+            expect(val.validate({}, schema).valid).toBeTruthy();
+            expect(val.validate({test: 'a'}, schema).valid).toBeTruthy();
+            expect(val.validate({test: 'r'}, schema).valid).toBeFalsy();
+            expect(val.validate({test: null}, schema).valid).toBeTruthy();
+        });
     });
 });