Merge pull request #1722 from kingsquare/master

Implemented checkRequired for SchemaType Mixed

Author: aheckmann

lib/schema/mixed.js

@@ -47,7 +47,7 @@ Mixed.prototype.__proto__ = SchemaType.prototype;
  */
 
 Mixed.prototype.checkRequired = function (val) {
-  return true;
+  return (val !== undefined) && (val !== null);
 };
 
 /**

test/schema.validation.test.js

@@ -283,6 +283,31 @@ describe('schema', function(){
         });
         done();
       });
+
+      it('mixed required', function(done){
+          var Animal = new Schema({
+            characteristics: { type: Mixed, required: true }
+          });
+
+          Animal.path('characteristics').doValidate(null, function(err){
+            assert.ok(err instanceof ValidatorError);
+          });
+
+          Animal.path('characteristics').doValidate(undefined, function(err){
+            assert.ok(err instanceof ValidatorError);
+          });
+
+          Animal.path('characteristics').doValidate({
+            aggresive: true
+          }, function(err){
+            assert.ifError(err);
+          });
+
+          Animal.path('characteristics').doValidate('none available', function(err){
+            assert.ifError(err);
+          });
+          done();
+      })
     })
 
     describe('async', function(){
@@ -332,8 +357,8 @@ describe('schema', function(){
               {
                 'validator': validator,
                 'msg': 'validator2'
-              },
-            ],
+              }
+            ]
           }
         });