X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdata.js;h=315043ca17c35bd53d95084562cf1b96fd139796;hb=50170e618059d10132a5319c64660a631b095f44;hp=b0c9f3f82b018920fc1941a4fe1675ad68fca577;hpb=e1b940d74824282fd3466d39a8ab574da4ef6fc5;p=jquery.git

diff --git a/test/unit/data.js b/test/unit/data.js
index b0c9f3f..315043c 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -184,14 +184,18 @@ test(".data(String) and .data(String, Object)", function() {
 });
 
 test("data-* attributes", function() {
-	expect(27);
+	expect(37);
 	var div = jQuery("<div>"),
-		child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\"></div>");
+		child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\" data-other='test'></div>"),
+		dummy = jQuery("<div data-myobj='old data' data-ignored=\"DOM\" data-other='test'></div>");
 		
 	equals( div.data("attr"), undefined, "Check for non-existing data-attr attribute" );
 
 	div.attr("data-attr", "exists");
 	equals( div.data("attr"), "exists", "Check for existing data-attr attribute" );
+
+	div.attr("data-attr", "exists2");
+	equals( div.data("attr"), "exists", "Check that updates to data- don't update .data()" );
 		
 	div.data("attr", "internal").attr("data-attr", "external");
 	equals( div.data("attr"), "internal", "Check for .data('attr') precedence (internal > external data-* attribute)" );
@@ -205,6 +209,29 @@ test("data-* attributes", function() {
 	child.data("ignored", "cache");
 	equals( child.data("ignored"), "cache", "Cached data used before DOM data-* fallback");
 
+	var obj = child.data(), obj2 = dummy.data(), check = [ "myobj", "ignored", "other" ], num = 0, num2 = 0;
+
+	for ( var i = 0, l = check.length; i < l; i++ ) {
+		ok( obj[ check[i] ], "Make sure data- property exists when calling data-." );
+		ok( obj2[ check[i] ], "Make sure data- property exists when calling data-." );
+	}
+
+	for ( var prop in obj ) {
+		num++;
+	}
+
+	equals( num, check.length, "Make sure that the right number of properties came through." );
+
+	for ( var prop in obj2 ) {
+		num2++;
+	}
+
+	equals( num2, check.length, "Make sure that the right number of properties came through." );
+
+	child.attr("data-other", "newvalue");
+
+	equals( child.data("other"), "test", "Make sure value was pulled in properly from a .data()." );
+
 	child
 		.attr("data-true", "true")
 		.attr("data-false", "false")