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

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 16992ae..168c17c 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -140,22 +140,29 @@ test("wrapAll(String|Element)", function() {
 });
 
 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.");
 }
@@ -164,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);
@@ -197,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' );
@@ -230,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') ));
@@ -696,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() {
@@ -977,7 +1011,7 @@ test("empty()", function() {
 });
 
 test("jQuery.cleanData", function() {
-	expect(10);
+	expect(14);
 	
 	var type, pos, div, child;
 	
@@ -1007,6 +1041,9 @@ test("jQuery.cleanData", function() {
 	// Should do nothing
 	pos = "Inner";
 	child.trigger("click");
+
+	// Should trigger 2
+	div.remove();
 	
 	type = "html";
 	
@@ -1023,6 +1060,9 @@ test("jQuery.cleanData", function() {
 	// 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(){