X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdata.js;h=1a0f84c1f7087a48814c5eacb705eed776f53097;hb=9b9d270e3d697d8129147d03807c4e37b23120b7;hp=c867fb5465d473b4a08f93981ffab453a9119fe0;hpb=8a5df39045292397a06d08b4fab2ad29819b5d44;p=jquery.git
diff --git a/test/unit/data.js b/test/unit/data.js
index c867fb5..1a0f84c 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -79,7 +79,7 @@ test("jQuery.data", function() {
});
test(".data()", function() {
- expect(4);
+ expect(5);
var div = jQuery("#foo");
strictEqual( div.data("foo"), undefined, "Make sure that missing result is undefined" );
@@ -90,6 +90,9 @@ test(".data()", function() {
var nodiv = jQuery("#unfound");
equals( nodiv.data(), null, "data() on empty set returns null" );
+
+ var obj = { foo: "bar" };
+ equals( jQuery(obj).data(), obj, "Retrieve data object from a wrapped JS object (#7524)" );
})
test(".data(String) and .data(String, Object)", function() {
@@ -184,9 +187,10 @@ test(".data(String) and .data(String, Object)", function() {
});
test("data-* attributes", function() {
- expect(33);
+ expect(37);
var div = jQuery("
"),
- child = jQuery("
");
+ child = jQuery("
"),
+ dummy = jQuery("
");
equals( div.data("attr"), undefined, "Check for non-existing data-attr attribute" );
@@ -208,10 +212,11 @@ test("data-* attributes", function() {
child.data("ignored", "cache");
equals( child.data("ignored"), "cache", "Cached data used before DOM data-* fallback");
- var obj = child.data(), check = [ "myobj", "ignored", "other" ], num = 0;
+ 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 ) {
@@ -220,6 +225,12 @@ test("data-* attributes", function() {
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()." );