X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Fattributes.js;h=986623b427c276e6c1a35d4b60de25d1f0917797;hb=2c4b20809e5d32e916c479c9b63a6b7528c880ce;hp=21d3d94bcb96a23cc5ad952820537223ad89fdfc;hpb=b3ccf2f2881d9ad988aba1cf3ccffb810063ab29;p=jquery.git
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 21d3d94..986623b 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." );
@@ -150,7 +151,7 @@ test("attr(String, Object)", function() {
equals( j.attr("name"), "attrvalue", "Check node,textnode,comment for attr" );
j.removeAttr("name");
- reset();
+ QUnit.reset();
var type = jQuery("#check2").attr('type');
var thrown = false;
@@ -301,12 +302,12 @@ 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" );
- reset();
+ QUnit.reset();
equals( jQuery("#text1").val(), "Test", "Check for value of input element" );
// ticket #1714 this caused a JS error in IE
@@ -328,10 +329,15 @@ test("val()", function() {
jQuery('#select3').val("");
same( jQuery('#select3').val(), [''], 'Call val() on a multiple="multiple" select' );
- var checks = jQuery("").appendTo("#form")
- .add( jQuery("").appendTo("#form") )
- .add( jQuery("").appendTo("#form") )
- .add( jQuery("").appendTo("#form") );
+ 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." );
@@ -475,7 +481,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");
@@ -504,7 +510,7 @@ var testRemoveClass = function(valueObj) {
ok( !$divs.is('.test'), "Remove Class" );
- reset();
+ QUnit.reset();
$divs = jQuery('div');
$divs.addClass("test").addClass("foo").addClass("bar");
@@ -512,7 +518,7 @@ var testRemoveClass = function(valueObj) {
ok( !$divs.is('.test,.bar,.foo'), "Remove multiple classes" );
- reset();
+ QUnit.reset();
$divs = jQuery('div');
// Make sure that a null value doesn't cause problems
@@ -548,7 +554,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");
@@ -563,7 +569,7 @@ test("removeClass(Function) with incoming value", function() {
ok( !$divs.is('.test'), "Remove Class" );
- reset();
+ QUnit.reset();
});
var testToggleClass = function(valueObj) {