X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Fattributes.js;h=06920762b7244539c45e376ea15ee5a905b20f44;hb=1d2b1a57dae0b73b3d99197f73f4edb623b5574a;hp=cb489804dda9b20db1eda52534c9f8c1ce30be74;hpb=aa81bb5e458efd25981933c339ac1a0090e6eb0f;p=jquery.git

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index cb48980..0692076 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -5,7 +5,7 @@ var functionReturningObj = function(value) { return (function() { return value;
 
 test("attr(String)", function() {
 	expect(28);
-	
+
 	// This one sometimes fails randomly ?!
 	equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
 	
@@ -21,7 +21,8 @@ test("attr(String)", function() {
 	equals( jQuery('#name').attr('name'), "name", 'Check for name attribute' );
 	equals( jQuery('#text1').attr('name'), "action", 'Check for name attribute' );
 	ok( jQuery('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
-	ok( jQuery('#form').attr('action','newformaction').attr('action').indexOf("newformaction") >= 0, 'Check that action attribute was changed' );
+	// Temporarily disabled. See: #4299
+	// ok( jQuery('#form').attr('action','newformaction').attr('action').indexOf("newformaction") >= 0, 'Check that action attribute was changed' );
 	equals( jQuery('#text1').attr('maxlength'), '30', 'Check for maxlength attribute' );
 	equals( jQuery('#text1').attr('maxLength'), '30', 'Check for maxLength attribute' );
 	equals( jQuery('#area1').attr('maxLength'), '30', 'Check for maxLength attribute' );
@@ -54,6 +55,12 @@ test("attr(String)", function() {
 	ok( $body.attr('foo') === undefined, 'Make sure the expando is preferred over the dom attribute, even if undefined' );
 
 	body.removeAttribute('foo'); // Cleanup
+
+	var select = document.createElement("select"), optgroup = document.createElement("optgroup"), option = document.createElement("option");
+	optgroup.appendChild( option );
+	select.appendChild( optgroup );
+
+	equals( jQuery(option).attr("selected"), true, "Make sure that a single option is selected, even when in an optgroup." );
 });
 
 if ( !isLocal ) {
@@ -190,16 +197,16 @@ test("attr(jquery_method)", function(){
 		elem = $elem[0];
 	
 	// one at a time	
-	$elem.attr('html', 'foo');
+	$elem.attr({'html': 'foo'}, true);
 	equals( elem.innerHTML, 'foo', 'attr(html)');
 	
-	$elem.attr('text', 'bar');
+	$elem.attr({'text': 'bar'}, true);
 	equals( elem.innerHTML, 'bar', 'attr(text)');
 	
-	$elem.attr('css', {color:'red'});
+	$elem.attr({'css': {color:'red'}}, true);
 	ok( /^(#ff0000|red)$/i.test(elem.style.color), 'attr(css)');
 	
-	$elem.attr('height', 10);
+	$elem.attr({'height': 10}, true);
 	equals( elem.style.height, '10px', 'attr(height)');
 	
 	// Multiple attributes
@@ -207,7 +214,7 @@ test("attr(jquery_method)", function(){
 	$elem.attr({
 		width:10,
 		css:{ paddingLeft:1, paddingRight:1 }
-	});
+	}, true);
 	
 	equals( elem.style.width, '10px', 'attr({...})');
 	equals( elem.style.paddingLeft, '1px', 'attr({...})');