Fix exception when type is ['object', 'null'] and required is present…

…. See acornejo#57
PerformanceIMMO · Nov 24, 2016 · 9c722bf · 9c722bf
1 parent 525475c
commit 9c722bf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/lib/jjv.js b/lib/jjv.js
@@ -500,7 +500,9 @@
         }
     }
 
-    if (!Array.isArray(prop)) {
+    if (!prop) {
+      //skip
+    } else if (!Array.isArray(prop)) {
       props = [];
       objerrs = {};
       for (p in prop)

diff --git a/test/test-mini.js b/test/test-mini.js
@@ -223,7 +223,6 @@ describe("basic functinal test", function () {
     });
   });
 
-
   describe("nested objects", function () {
     user_schema.definitions = {
       location: {
@@ -308,6 +307,24 @@ describe("basic functinal test", function () {
     expect(jjv.validate(selfReferentialSchema, manifest)).to.be.null;
   });
 
+  describe("null objects", function() {
+    user_schema.properties.personal = {
+      type: ['object', 'null'],
+      properties: {
+        gender: {
+          type: 'string'
+        }
+      },
+      required: ['gender']
+    };
+
+    it("null", function () {
+      user_object.personal = null;
+      expect(jjv.validate('user', user_object)).to.be.null;
+    });
+
+  });
+
   describe("useDefault", function() {
     it("should clone default values", function() {
       var defaults_schema = {