X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdata.js;h=03d38c9cf9dd2ace1790f0daea17689d5c8a64f6;hb=9ad7c21e701f827e108de038ff704f1e9b7022da;hp=d5eb73b080ce31aa6c18e1faaeb009fadd3d4f7d;hpb=2e10af143b7eafb7142524f6534a62aee1910bd1;p=jquery.git

diff --git a/test/unit/data.js b/test/unit/data.js
index d5eb73b..03d38c9 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -1,13 +1,14 @@
 module("data");
 
 test("expando", function(){
-	expect(6);
+	expect(7);
 	
 	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" );
 
 	obj = {};	
 	jQuery.data(obj, 'test');
@@ -17,7 +18,7 @@ test("expando", function(){
 	jQuery.data(obj, "foo", "bar");
 	equals( jQuery.expando in obj, true, "jQuery.data added an expando to the object" );
 	
-	var id = obj[jQuery.expando];
+	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" );
@@ -54,7 +55,7 @@ test("jQuery.data", function() {
 	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[ jQuery.expando ]().prop, "Data is being stored on the object." );
 
 	equals( jQuery.data( obj, "prop" ), true, "Make sure the right value is retrieved." );
 });
@@ -69,7 +70,13 @@ test(".data()", function() {
 
 test(".data(String) and .data(String, Object)", function() {
 	expect(27);
-	var div = jQuery("<div/>");
+	var parent = jQuery("<div><div></div></div>"),
+		div = parent.children();
+
+	parent
+		.bind("getData", function(){ ok( false, "getData bubbled." ) })
+		.bind("setData", function(){ ok( false, "setData bubbled." ) })
+		.bind("changeData", function(){ ok( false, "changeData bubbled." ) });
 
 	ok( div.data("test") === undefined, "Check for no data exists" );
 
@@ -150,6 +157,90 @@ test(".data(String) and .data(String, Object)", function() {
 	$elem.removeData();
 });
 
+test("data-* attributes", function() {
+	expect(27);
+	var div = jQuery("<div>"),
+		child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\"></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.data("attr", "internal").attr("data-attr", "external");
+	equals( div.data("attr"), "internal", "Check for .data('attr') precedence (internal > external data-* attribute)" );
+	
+	child.appendTo('#main');
+	equals( child.data("myobj"), "old data", "Value accessed from data-* attribute");
+
+	child.data("myobj", "replaced");
+	equals( child.data("myobj"), "replaced", "Original data overwritten");
+
+	child.data("ignored", "cache");
+	equals( child.data("ignored"), "cache", "Cached data used before DOM data-* fallback");
+
+	child
+		.attr("data-true", "true")
+		.attr("data-false", "false")
+		.attr("data-five", "5")
+		.attr("data-point", "5.5")
+		.attr("data-pointe", "5.5E3")
+		.attr("data-pointbad", "5..5")
+		.attr("data-pointbad2", "-.")
+		.attr("data-badjson", "{123}")
+		.attr("data-badjson2", "[abc]")
+		.attr("data-empty", "")
+		.attr("data-space", " ")
+		.attr("data-null", "null")
+		.attr("data-string", "test");
+	
+	strictEqual( child.data('true'), true, "Primitive true read from attribute");
+	strictEqual( child.data('false'), false, "Primitive false read from attribute");
+	strictEqual( child.data('five'), 5, "Primitive number read from attribute");
+	strictEqual( child.data('point'), 5.5, "Primitive number read from attribute");
+	strictEqual( child.data('pointe'), 5500, "Primitive number read from attribute");
+	strictEqual( child.data('pointbad'), "5..5", "Bad number read from attribute");
+	strictEqual( child.data('pointbad2'), "-.", "Bad number read from attribute");
+	strictEqual( child.data('badjson'), "{123}", "Bad number read from attribute");
+	strictEqual( child.data('badjson2'), "[abc]", "Bad number read from attribute");
+	strictEqual( child.data('empty'), "", "Empty string read from attribute");
+	strictEqual( child.data('space'), " ", "Empty string read from attribute");
+	strictEqual( child.data('null'), null, "Primitive null read from attribute");
+	strictEqual( child.data('string'), "test", "Typical string read from attribute");
+
+	child.remove();
+	
+	// tests from metadata plugin
+	function testData(index, elem) {
+		switch (index) {
+		case 0:
+			equals(jQuery(elem).data("foo"), "bar", "Check foo property");
+			equals(jQuery(elem).data("bar"), "baz", "Check baz property");
+			break;
+		case 1:
+			equals(jQuery(elem).data("test"), "bar", "Check test property");
+			equals(jQuery(elem).data("bar"), "baz", "Check bar property");
+			break;
+		case 2:
+			equals(jQuery(elem).data("zoooo"), "bar", "Check zoooo property");
+			same(jQuery(elem).data("bar"), {"test":"baz"}, "Check bar property");
+			break;
+		case 3:
+			equals(jQuery(elem).data("number"), true, "Check number property");
+			same(jQuery(elem).data("stuff"), [2,8], "Check stuff property");
+			break;
+		default:
+			ok(false, ["Assertion failed on index ", index, ", with data ", data].join(''));
+		}
+	}
+	
+	var metadata = '<ol><li class="test test2" data-foo="bar" data-bar="baz" data-arr="[1,2]">Some stuff</li><li class="test test2" data-test="bar" data-bar="baz">Some stuff</li><li class="test test2" data-zoooo="bar" data-bar=\'{"test":"baz"}\'>Some stuff</li><li class="test test2" data-number=true data-stuff="[2,8]">Some stuff</li></ol>',
+		elem = jQuery(metadata).appendTo('#main');
+	
+	elem.find("li").each(testData);
+	elem.remove();
+});
+
 test(".data(Object)", function() {
 	expect(2);