X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdata.js;h=81f5e61fae77720d768f524adda156710d00dd84;hb=25828768d7bc2d76438244e69d6eeb69c36227e6;hp=77ee0997944a8b986f1d9b21c0a829f904cfd3f9;hpb=515efbdc7119aa79de710144effe18413d4cb14a;p=jquery.git diff --git a/test/unit/data.js b/test/unit/data.js index 77ee099..81f5e61 100644 --- a/test/unit/data.js +++ b/test/unit/data.js @@ -1,27 +1,22 @@ module("data"); test("expando", function(){ - expect(7); + expect(6); equals("expando" in jQuery, true, "jQuery is exposing the expando"); var obj = {}; - jQuery.data(obj); - equals( jQuery.expando in obj, true, "jQuery.data adds an expando to the object" ); - equals( typeof obj[jQuery.expando], "function", "jQuery.data adds an expando to the object as a function" ); + equals( jQuery.data(obj), obj, "jQuery.data(obj) returns the object"); + equals( jQuery.expando in obj, false, "jQuery.data(obj) did not add an expando to the object" ); obj = {}; jQuery.data(obj, 'test'); - equals( jQuery.expando in obj, false, "jQuery.data did not add an expando to the object" ); + equals( jQuery.expando in obj, false, "jQuery.data(obj,key) did not add an expando to the object" ); obj = {}; jQuery.data(obj, "foo", "bar"); - equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" ); - - var id = obj[jQuery.expando](); - equals( id in jQuery.cache, false, "jQuery.data did not add an entry to jQuery.cache" ); - - equals( id.foo, "bar", "jQuery.data worked correctly" ); + equals( jQuery.expando in obj, false, "jQuery.data(obj,key,value) did not add an expando to the object" ); + equals( obj.foo, "bar", "jQuery.data(obj,key,value) sets fields directly on the object." ); }); test("jQuery.acceptData", function() { @@ -43,7 +38,7 @@ test("jQuery.acceptData", function() { }); test("jQuery.data", function() { - expect(13); + expect(15); var div = document.createElement("div"); ok( jQuery.data(div, "test") === undefined, "Check for no data exists" ); @@ -67,17 +62,20 @@ test("jQuery.data", function() { jQuery.data(div, "test3", "orig"); jQuery.data(div, { "test": "in", "test2": "in2" }); - equals( jQuery.data(div, "test"), "in", "Verify setting an object in data." ); - equals( jQuery.data(div, "test2"), "in2", "Verify setting an object in data." ); - equals( jQuery.data(div, "test3"), "orig", "Verify original not overwritten." ); + equals( jQuery.data(div, "test"), "in", "Verify setting an object in data" ); + equals( jQuery.data(div, "test2"), "in2", "Verify setting an object in data" ); + equals( jQuery.data(div, "test3"), "orig", "Verify original not overwritten" ); var obj = {}; jQuery.data( obj, "prop", true ); - ok( obj[ jQuery.expando ], "Data is being stored on the object." ); - ok( obj[ jQuery.expando ]().prop, "Data is being stored on the object." ); + ok( obj.prop, "Data is being stored on the object" ); + equals( jQuery.data( obj, "prop" ), true, "Make sure the right value is retrieved" ); - 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() { @@ -95,7 +93,7 @@ test(".data()", function() { }) test(".data(String) and .data(String, Object)", function() { - expect(27); + expect(29); var parent = jQuery("