X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fattributes.js;h=7887790b759a465c8a2b2fcf473f06fd0fa96bf8;hb=2a268f5f4b5b1d870d5af580de4c768e0121e5b5;hp=63e587a410dd48a63702799db1f3270f59d6743e;hpb=e45b41602ff483ebed67b5b73008aff5ceb1fe6f;p=jquery.git

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 63e587a..7887790 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -68,16 +68,19 @@ test("attr(String, Function)", function() {
 });
 
 test("attr(Hash)", function() {
-	expect(1);
+	expect(3);
 	var pass = true;
 	jQuery("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
 		if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
 	});
 	ok( pass, "Set Multiple Attributes" );
+       equals( jQuery('#text1').attr({'value': function() { return this.id; }})[0].value, "text1", "Set attribute to computed value #1" );
+       equals( jQuery('#text1').attr({'title': function(i) { return i; }}).attr('title'), "0", "Set attribute to computed value #2");
+
 });
 
 test("attr(String, Object)", function() {
-	expect(21);
+	expect(24);
 	var div = jQuery("div").attr("foo", "bar"),
 		fail = false;
 	for ( var i = 0; i < div.size(); i++ ) {
@@ -105,6 +108,15 @@ test("attr(String, Object)", function() {
 	jQuery("#name").attr('maxLength', '10');
 	equals( document.getElementById('name').maxLength, '10', 'Set maxlength attribute' );
 
+	var table = jQuery('#table').append("<tr><td>cell</td></tr><tr><td>cell</td><td>cell</td></tr><tr><td>cell</td><td>cell</td></tr>"),
+		td = table.find('td:first');
+	td.attr("rowspan", "2");
+	equals( td[0].rowSpan, 2, "Check rowspan is correctly set" );
+	td.attr("colspan", "2");
+	equals( td[0].colSpan, 2, "Check colspan is correctly set" );
+	table.attr("cellspacing", "2");
+	equals( table[0].cellSpacing, 2, "Check cellspacing is correctly set" );
+
 	// for #1070
 	jQuery("#name").attr('someAttr', '0');
 	equals( jQuery("#name").attr('someAttr'), '0', 'Set attribute to a string of "0"' );
@@ -325,8 +337,8 @@ test("toggleClass(String|boolean|undefined[, boolean])", function() {
 	e.toggleClass(false);
 	e.toggleClass();
 	ok( e.is(".testD.testE"), "Assert class present (restored from data)" );
-	
-	
+
+
 
 	// Cleanup
 	e.removeClass("testD");