ignore and if not required

metakeule · Apr 3, 2012 · 3db6933 · 3db6933
1 parent 9c6b948
commit 3db6933
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/lib/and.coffee b/lib/and.coffee
@@ -31,8 +31,9 @@ class type._and extends type.Base
 
   afterValue: ->
     @validate()
-    for sc in @_valid_schemas
-      @_value = sc.val(@_value).val()
+    if @_valid_schemas
+      for sc in @_valid_schemas
+        @_value = sc.val(@_value).val()
     @
 
   validateChild: (err, callback) ->

diff --git a/lib/and.js b/lib/and.js
diff --git a/test/and.test.js b/test/and.test.js
@@ -20,6 +20,30 @@ describe("type", function() {
 			ok( !schema.validate() );
 		});
 
+		it("should validate required if required and embedded in object", function() {
+			var schema = type.object( { test: type.and(
+					[ type.string().len(5), type.string().email()]  
+			).required() } );
+
+			var errs = schema.val( { test2: ["a"] }).validate( function(errs) {
+				ok( errs );
+				equal( errs.messages().length, 1 );
+			} );
+			ok( errs );
+			equal( errs.messages().length, 1 );
+		});
+
+		it("should not validate required if not required and embedded in object", function() {
+			var schema = type.object( { test: type.and(
+					[ type.string().len(5), type.string().email()]  
+			) } );
+
+			var errs = schema.val( { test2: ["a"] }).validate( function(errs) {
+				ok( !errs );
+			} );
+			ok( !errs );
+		});
+
 		it("should process values for clones", function() {
 			var sc = schema.clone();
 			var val = sc.val(" Test@g.com ").val();