Only try to get data attributes for a jQuery-wrapped object if it is actually an...

[jquery.git] / test / unit / data.js

diff --git a/test/unit/data.js b/test/unit/data.js
index 2efa984..1a0f84c 100644 (file)
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -38,7 +38,7 @@ test("jQuery.acceptData", function() {
 });
 
 test("jQuery.data", function() {
-       expect(12);
+       expect(15);
        var div = document.createElement("div");
 
        ok( jQuery.data(div, "test") === undefined, "Check for no data exists" );
@@ -71,10 +71,15 @@ test("jQuery.data", function() {
 
        ok( obj.prop, "Data is being stored on the object" );
        equals( jQuery.data( obj, "prop" ), true, "Make sure the right value is retrieved" );
+
+       jQuery.data( window, "BAD", true );
+       ok( !window[ jQuery.expando ], "Make sure there is no expando on the window object." );
+       ok( !window.BAD, "And make sure that the property wasn't set directly on the window." );
+       ok( jQuery.data( window, "BAD" ), "Make sure that the value was set." );
 });
 
 test(".data()", function() {
-       expect(4);
+       expect(5);
 
        var div = jQuery("#foo");
        strictEqual( div.data("foo"), undefined, "Make sure that missing result is undefined" );
@@ -85,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() {
@@ -179,14 +187,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)" );
@@ -200,6 +212,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")
@@ -279,11 +314,16 @@ test(".data(Object)", function() {
 });
 
 test("jQuery.removeData", function() {
-       expect(4);
+       expect(7);
        var div = jQuery("#foo")[0];
        jQuery.data(div, "test", "testing");
        jQuery.removeData(div, "test");
        equals( jQuery.data(div, "test"), undefined, "Check removal of data" );
+
+       jQuery.data(div, "test2", "testing");
+       jQuery.removeData( div );
+       ok( !jQuery.data(div, "test2"), "Make sure that the data property no longer exists." );
+       ok( !div[ jQuery.expando ], "Make sure the expando no longer exists, as well." );
        
        var obj = {};
        jQuery.data(obj, "test", "testing");
@@ -291,6 +331,10 @@ test("jQuery.removeData", function() {
        jQuery.removeData(obj, "test");
        equals( jQuery.data(obj, "test"), undefined, "Check removal of data on plain object" );
        equals( obj.test, undefined, "Check removal of data directly from plain object" );      
+
+       jQuery.data( window, "BAD", true );
+       jQuery.removeData( window, "BAD" );
+       ok( !jQuery.data( window, "BAD" ), "Make sure that the value was not still set." );
 });
 
 test(".removeData()", function() {