Added checkbox test to require_from_group and changed require_from_group to use elementValue. Fixes jquery-validation#359

mlynch · jzaefferer · commit c3ce5b456988 · 2012-05-04T11:20:17.000+02:00
diff --git a/additional-methods.js b/additional-methods.js
@@ -336,9 +336,10 @@ jQuery.validator.addMethod("pattern", function(value, element, param) {
  *
  */
 jQuery.validator.addMethod("require_from_group", function(value, element, options) {
+	var validator = this;
 	var selector = options[1];
 	var validOrNot = $(selector, element.form).filter(function() {
-		return $(this).val();
+		return validator.elementValue(this);
 	}).length >= options[0];
 
 	if(!$(element).data('being_validated')) {
@@ -369,10 +370,12 @@ jQuery.validator.addMethod("require_from_group", function(value, element, option
  *
  */
 jQuery.validator.addMethod("skip_or_fill_minimum", function(value, element, options) {
+	var validator = this;
+
 	numberRequired = options[0];
 	selector = options[1];
 	var numberFilled = $(selector, element.form).filter(function() {
-		return $(this).val();
+		return validator.elementValue(this);
 	}).length;
 	var valid = numberFilled >= numberRequired || numberFilled === 0;
 
diff --git a/test/index.html b/test/index.html
@@ -286,6 +286,7 @@ <h3></h3>
 			<input class="productInfo" name="partnumber">
 			<input class="productInfo" name="description">
 			<input class="productInfo" name="color">
+			<input class="productInfo" type="checkbox" name="discount" />
 		</form>
 
 	</div>
diff --git a/test/methods.js b/test/methods.js
@@ -700,14 +700,19 @@ test('require_from_group', function() {
 	$("#productInfo").validate({
 		rules: {
 			partnumber:  {require_from_group: [2,".productInfo"]},
-			description: {require_from_group: [2,".productInfo"]}
+			description: {require_from_group: [2,".productInfo"]},
+			discount: {require_from_group: [2,".productInfo"]}
 		}
 	});
 
 	fillFormWithValuesAndExpect('#productInfo', [], false);
 	fillFormWithValuesAndExpect('#productInfo', [123], false);
+	$('#productInfo input[type="checkbox"]').attr('checked', 'checked');
+	fillFormWithValuesAndExpect('#productInfo', [123], true);
+	$('#productInfo input[type="checkbox"]').removeAttr('checked');
 	fillFormWithValuesAndExpect('#productInfo', [123, 'widget'], true);
 	fillFormWithValuesAndExpect('#productInfo', [123, 'widget', 'red'], true);
+	fillFormWithValuesAndExpect('#productInfo', [123, 'widget', 'red'], true);
 });
 
 test('skip_or_fill_minimum', function() {
