X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fattributes.js;h=3326dfe890c8c6e4cfab1bae5b7dbd6269cd5d5d;hb=97d468fbf0f840f52c91855b0bc8db0ed6ac403c;hp=21d3d94bcb96a23cc5ad952820537223ad89fdfc;hpb=8effe3a7dee91c833cc1774646da9d743600c64c;p=jquery.git

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 21d3d94..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('<a id="tAnchor5"></a>').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('<a/>').attr({ 'id': 'tAnchor5', 'href': '#5' }).appendTo('#main');
 	equals( jQuery('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' );
 
 	equals( jQuery("<option/>").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("<input type='checkbox' name='test' value='1'/>").appendTo("#form")
-		.add( jQuery("<input type='checkbox' name='test' value='2'/>").appendTo("#form") )
-		.add( jQuery("<input type='checkbox' name='test' value=''/>").appendTo("#form") )
-		.add( jQuery("<input type='checkbox' name='test'/>").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("<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." );
 
@@ -353,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" );
 
@@ -475,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");
@@ -504,7 +516,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 +524,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 +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");
@@ -563,7 +575,7 @@ test("removeClass(Function) with incoming value", function() {
 
 	ok( !$divs.is('.test'), "Remove Class" );
 
-	reset();	
+	QUnit.reset();	
 });
 
 var testToggleClass = function(valueObj) {