X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=168c17c94b166435cf7ea6833d69691347a5ea56;hb=0252b78201f817f87d10f14c85d0f37e4c50ce22;hp=a0239a405b66dee384fc3f72d4b8e3c08cd0f488;hpb=23d600c66d8e1f7298dcb46eedba862279cd251d;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index a0239a4..168c17c 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -139,28 +139,30 @@ test("wrapAll(String|Element)", function() {
 	testWrapAll(bareObj);
 });
 
-// TODO: Figure out why each(wrapAll) is not equivalent to wrapAll
-// test("wrapAll(Function)", function() {
-//	testWrapAll(functionReturningObj);
-// })
-
 var testWrapInner = function(val) {
-	expect(8);
+	expect(11);
 	var num = jQuery("#first").children().length;
-	var result = jQuery('#first').wrapInner('<div class="red"><div id="tmp"></div></div>');
+	var result = jQuery('#first').wrapInner(val('<div class="red"><div id="tmp"></div></div>'));
+	equals( jQuery("#first").children().length, 1, "Only one child" );
+	ok( jQuery("#first").children().is(".red"), "Verify Right Element" );
+	equals( jQuery("#first").children().children().children().length, num, "Verify Elements Intact" );
+
+	reset();
+	var num = jQuery("#first").html("foo<div>test</div><div>test2</div>").children().length;
+	var result = jQuery('#first').wrapInner(val('<div class="red"><div id="tmp"></div></div>'));
 	equals( jQuery("#first").children().length, 1, "Only one child" );
 	ok( jQuery("#first").children().is(".red"), "Verify Right Element" );
 	equals( jQuery("#first").children().children().children().length, num, "Verify Elements Intact" );
 
 	reset();
 	var num = jQuery("#first").children().length;
-	var result = jQuery('#first').wrapInner(document.getElementById('empty'));
+	var result = jQuery('#first').wrapInner(val(document.getElementById('empty')));
 	equals( jQuery("#first").children().length, 1, "Only one child" );
 	ok( jQuery("#first").children().is("#empty"), "Verify Right Element" );
 	equals( jQuery("#first").children().children().length, num, "Verify Elements Intact" );
 
 	var div = jQuery("<div/>");
-	div.wrapInner("<span></span>");
+	div.wrapInner(val("<span></span>"));
 	equals(div.children().length, 1, "The contents were wrapped.");
 	equals(div.children()[0].nodeName.toLowerCase(), "span", "A span was inserted.");
 }
@@ -169,10 +171,9 @@ test("wrapInner(String|Element)", function() {
 	testWrapInner(bareObj);
 });
 
-// TODO: wrapInner uses wrapAll -- get wrapAll working with Function
-// test("wrapInner(Function)", function() {
-//	testWrapInner(functionReturningObj)
-// })
+test("wrapInner(Function)", function() {
+	testWrapInner(functionReturningObj)
+});
 
 test("unwrap()", function() {
 	expect(9);
@@ -202,7 +203,7 @@ test("unwrap()", function() {
 });
 
 var testAppend = function(valueObj) {
-	expect(22);
+	expect(37);
 	var defaultText = 'Try them out:'
 	var result = jQuery('#first').append(valueObj('<b>buga</b>'));
 	equals( result.text(), defaultText + 'buga', 'Check if text appending works' );
@@ -235,6 +236,24 @@ var testAppend = function(valueObj) {
 	ok( jQuery("#sap").append(valueObj( [] )), "Check for appending an empty array." );
 	ok( jQuery("#sap").append(valueObj( "" )), "Check for appending an empty string." );
 	ok( jQuery("#sap").append(valueObj( document.getElementsByTagName("foo") )), "Check for appending an empty nodelist." );
+	
+	reset();
+	jQuery("form").append(valueObj('<input name="radiotest" type="radio" checked="checked" />'));
+	jQuery("form input[name=radiotest]").each(function(){
+		ok( jQuery(this).is(':checked'), "Append checked radio");
+	}).remove();
+
+	reset();
+	jQuery("form").append(valueObj('<input name="radiotest" type="radio" checked    =   \'checked\' />'));
+	jQuery("form input[name=radiotest]").each(function(){
+		ok( jQuery(this).is(':checked'), "Append alternately formated checked radio");
+	}).remove();
+
+	reset();
+	jQuery("form").append(valueObj('<input name="radiotest" type="radio" checked />'));
+	jQuery("form input[name=radiotest]").each(function(){
+		ok( jQuery(this).is(':checked'), "Append HTML5-formated checked radio");
+	}).remove();
 
 	reset();
 	jQuery("#sap").append(valueObj( document.getElementById('form') ));
@@ -631,7 +650,7 @@ test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-	expect(16);
+	expect(15);
 	jQuery('#yahoo').replaceWith(val( '<b id="replace">buga</b>' ));
 	ok( jQuery("#replace")[0], 'Replace element with string' );
 	ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after string' );
@@ -655,9 +674,8 @@ var testReplaceWith = function(val) {
 
 	reset();
 	var tmp = jQuery("<div/>").appendTo("body").click(function(){ ok(true, "Newly bound click run." ); });
-	var y = jQuery('#yahoo').click(function(){ ok(true, "Previously bound click run." ); });
+	var y = jQuery('<div/>').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); });
 	var child = y.append("<b>test</b>").find("b").click(function(){ ok(true, "Child bound click run." ); return false; });
-	var child2 = y.append("<u>test</u>").find("u").click(function(){ ok(true, "Child 2 bound click run." ); return false; });
 
 	y.replaceWith( tmp );
 
@@ -665,15 +683,22 @@ var testReplaceWith = function(val) {
 	y.click(); // Shouldn't be run
 	child.click(); // Shouldn't be run
 
+	tmp.remove();
+	y.remove();
+	child.remove();
+
 	reset();
 
-	y = jQuery('#yahoo').click(function(){ ok(true, "Previously bound click run." ); });
+	y = jQuery('<div/>').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); });
 	var child2 = y.append("<u>test</u>").find("u").click(function(){ ok(true, "Child 2 bound click run." ); return false; });
 
 	y.replaceWith( child2 );
 
 	child2.click();
 
+	y.remove();
+	child2.remove();
+
 	reset();
 
 	var set = jQuery("<div/>").replaceWith(val("<span>test</span>"));
@@ -681,9 +706,10 @@ var testReplaceWith = function(val) {
 	equals( set.length, 1, "Replace the disconnected node." );
 
 	var $div = jQuery("<div class='replacewith'></div>").appendTo("body");
-	$div.replaceWith("<div class='replacewith'></div><script>" +
-		"equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');" +
-		"</script>");
+	// TODO: Work on jQuery(...) inline script execution
+	//$div.replaceWith("<div class='replacewith'></div><script>" +
+		//"equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');" +
+		//"</script>");
 	equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');
 	jQuery('.replacewith').remove();
 }
@@ -694,6 +720,16 @@ test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 
 test("replaceWith(Function)", function() {
 	testReplaceWith(functionReturningObj);
+
+	expect(16);
+
+	var y = jQuery("#yahoo")[0];
+
+	jQuery(y).replaceWith(function(){
+		equals( this, y, "Make sure the context is coming in correctly." );
+	});
+
+	reset();
 })
 
 test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -791,7 +827,7 @@ test("clone() on XML nodes", function() {
 }
 
 var testHtml = function(valueObj) {
-	expect(22);
+	expect(24);
 
 	jQuery.scriptorder = 0;
 
@@ -803,6 +839,11 @@ var testHtml = function(valueObj) {
 	}
 	ok( pass, "Set HTML" );
 
+	div = jQuery("<div/>").html( valueObj('<div id="parent_1"><div id="child_1"/></div><div id="parent_2"/>') );
+
+	equals( div.children().length, 2, "Make sure two child nodes exist." );
+	equals( div.children().children().length, 1, "Make sure that a grandchild exists." );
+
 	reset();
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();
@@ -821,9 +862,9 @@ var testHtml = function(valueObj) {
 	equals( $div.html(valueObj( 0 )).html(), '0', 'Setting a zero as html' );
 
 	var $div2 = jQuery('<div/>'), insert = "&lt;div&gt;hello1&lt;/div&gt;";
-	equals( $div2.html(insert).html(), insert, "Verify escaped insertion." );
-	equals( $div2.html("x" + insert).html(), "x" + insert, "Verify escaped insertion." );
-	equals( $div2.html(" " + insert).html(), " " + insert, "Verify escaped insertion." );
+	equals( $div2.html(insert).html().replace(/>/g, "&gt;"), insert, "Verify escaped insertion." );
+	equals( $div2.html("x" + insert).html().replace(/>/g, "&gt;"), "x" + insert, "Verify escaped insertion." );
+	equals( $div2.html(" " + insert).html().replace(/>/g, "&gt;"), " " + insert, "Verify escaped insertion." );
 
 	var map = jQuery("<map/>").html(valueObj("<area id='map01' shape='rect' coords='50,50,150,150' href='http://www.jquery.com/' alt='jQuery'>"));
 
@@ -901,17 +942,17 @@ test("html(Function) with incoming value", function() {
 	equals( $div2.html(function(i, val) {
 		equals( val, "", "Make sure the incoming value is correct." );
 		return insert;
-	}).html(), insert, "Verify escaped insertion." );
+	}).html().replace(/>/g, "&gt;"), insert, "Verify escaped insertion." );
 	
 	equals( $div2.html(function(i, val) {
-		equals( val, insert, "Make sure the incoming value is correct." );
+		equals( val.replace(/>/g, "&gt;"), insert, "Make sure the incoming value is correct." );
 		return "x" + insert;
-	}).html(), "x" + insert, "Verify escaped insertion." );
+	}).html().replace(/>/g, "&gt;"), "x" + insert, "Verify escaped insertion." );
 	
 	equals( $div2.html(function(i, val) {
-		equals( val, "x" + insert, "Make sure the incoming value is correct." );
+		equals( val.replace(/>/g, "&gt;"), "x" + insert, "Make sure the incoming value is correct." );
 		return " " + insert;
-	}).html(), " " + insert, "Verify escaped insertion." );	
+	}).html().replace(/>/g, "&gt;"), " " + insert, "Verify escaped insertion." );	
 });
 
 var testRemove = function(method) {
@@ -969,3 +1010,79 @@ test("empty()", function() {
 	equals( j.html(), "", "Check node,textnode,comment empty works" );
 });
 
+test("jQuery.cleanData", function() {
+	expect(14);
+	
+	var type, pos, div, child;
+	
+	type = "remove";
+	
+	// Should trigger 4 remove event
+	div = getDiv().remove();
+	
+	// Should both do nothing
+	pos = "Outer";
+	div.trigger("click");
+	
+	pos = "Inner";
+	div.children().trigger("click");
+	
+	type = "empty";
+	div = getDiv();
+	child = div.children();
+	
+	// Should trigger 2 remove event
+	div.empty();
+	
+	// Should trigger 1
+	pos = "Outer";
+	div.trigger("click");
+	
+	// Should do nothing
+	pos = "Inner";
+	child.trigger("click");
+
+	// Should trigger 2
+	div.remove();
+	
+	type = "html";
+	
+	div = getDiv();
+	child = div.children();
+	
+	// Should trigger 2 remove event
+	div.html("<div></div>");
+	
+	// Should trigger 1
+	pos = "Outer";
+	div.trigger("click");
+	
+	// Should do nothing
+	pos = "Inner";
+	child.trigger("click");
+
+	// Should trigger 2
+	div.remove();
+	
+	function getDiv() {
+		var div = jQuery("<div class='outer'><div class='inner'></div></div>").click(function(){
+			ok( true, type + " " + pos + " Click event fired." );
+		}).focus(function(){
+			ok( true, type + " " + pos + " Focus event fired." );
+		}).find("div").click(function(){
+			ok( false, type + " " + pos + " Click event fired." );
+		}).focus(function(){
+			ok( false, type + " " + pos + " Focus event fired." );
+		}).end().appendTo("body");
+		
+		div[0].detachEvent = div[0].removeEventListener = function(t){
+			ok( true, type + " Outer " + t + " event unbound" );
+		};
+		
+		div[0].firstChild.detachEvent = div[0].firstChild.removeEventListener = function(t){
+			ok( true, type + " Inner " + t + " event unbound" );
+		};
+		
+		return div;
+	}
+});