Make .val(undefined) == .val("") and chainable; fixes #4130.

[jquery.git] / test / unit / attributes.js

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 0372721..3326dfe 100644 (file)
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -302,7 +302,7 @@ test("removeAttr(String)", function() {
 });
 
 test("val()", function() {
-       expect(17);
+       expect(20);
 
        document.getElementById('text1').value = "bla";
        equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
@@ -329,6 +329,14 @@ test("val()", function() {
        jQuery('#select3').val("");
        same( jQuery('#select3').val(), [''], 'Call val() on a multiple="multiple" select' );
 
+       same( jQuery('#select4').val(), [], 'Call val() on multiple="multiple" select with all disabled options' );
+
+       jQuery('#select4 optgroup').add('#select4 > [disabled]').attr('disabled', false);
+       same( jQuery('#select4').val(), ['2', '3'], 'Call val() on multiple="multiple" select with some disabled options' );
+
+       jQuery('#select4').attr('disabled', true);
+       same( jQuery('#select4').val(), ['2', '3'], 'Call val() on disabled multiple="multiple" select' );
+
        var checks = jQuery("<input type='checkbox' name='test' value='1'/><input type='checkbox' name='test' value='2'/><input type='checkbox' name='test' value=''/><input type='checkbox' name='test'/>").appendTo("#form");
 
        same( checks.serialize(), "", "Get unchecked values." );
@@ -351,14 +359,20 @@ test("val()", function() {
 });
 
 var testVal = function(valueObj) {
-       expect(6);
+       expect(8);
 
        jQuery("#text1").val(valueObj( 'test' ));
        equals( document.getElementById('text1').value, "test", "Check for modified (via val(String)) value of input element" );
 
+       jQuery("#text1").val(valueObj( undefined ));
+       equals( document.getElementById('text1').value, "", "Check for modified (via val(undefined)) value of input element" );
+
        jQuery("#text1").val(valueObj( 67 ));
        equals( document.getElementById('text1').value, "67", "Check for modified (via val(Number)) value of input element" );
 
+       jQuery("#text1").val(valueObj( null ));
+       equals( document.getElementById('text1').value, "", "Check for modified (via val(null)) value of input element" );
+
        jQuery("#select1").val(valueObj( "3" ));
        equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" );