X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Fattributes.js;h=3326dfe890c8c6e4cfab1bae5b7dbd6269cd5d5d;hb=97d468fbf0f840f52c91855b0bc8db0ed6ac403c;hp=8ce1c73a6dbf3c3d4ae4d337244cc1a21512a0f7;hpb=1bdcffba8ed6777ffc451523a34ade142715fd94;p=jquery.git
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 8ce1c73..3326dfe 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -30,7 +30,8 @@ test("attr(String)", function() {
equals( jQuery('#foo').attr('nodeName').toUpperCase(), 'DIV', 'Check for nodeName attribute' );
equals( jQuery('#foo').attr('tagName').toUpperCase(), 'DIV', 'Check for tagName attribute' );
- jQuery('').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path
+ // using innerHTML in IE causes href attribute to be serialized to the full path
+ jQuery('').attr({ 'id': 'tAnchor5', 'href': '#5' }).appendTo('#main');
equals( jQuery('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' );
equals( jQuery("").attr("selected"), false, "Check selected attribute on disconnected element." );
@@ -301,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" );
@@ -328,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("").appendTo("#form");
same( checks.serialize(), "", "Get unchecked values." );
@@ -350,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" );
@@ -472,7 +487,7 @@ test("addClass(Function)", function() {
});
test("addClass(Function) with incoming value", function() {
- expect(39);
+ expect(41);
var div = jQuery("div"), old = div.map(function(){
return jQuery(this).attr("class");
@@ -545,7 +560,7 @@ test("removeClass(Function) - simple", function() {
});
test("removeClass(Function) with incoming value", function() {
- expect(39);
+ expect(41);
var $divs = jQuery('div').addClass("test"), old = $divs.map(function(){
return jQuery(this).attr("class");