X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=f921ea190518a5780bffb1f2c3829adda22dfcfa;hb=f95147f465932cb91e1a6aace50c556820ca4074;hp=b0a1c71af2f4067e5823a46db8f5bf33a7198a6c;hpb=bed759c95ca6d796125653b540e8611dc63b38bb;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index b0a1c71..f921ea1 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);
@@ -714,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() {
@@ -741,7 +757,7 @@ test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 test("clone()", function() {
-	expect(30);
+	expect(31);
 	equals( 'This is a normal link: Yahoo', jQuery('#en').text(), 'Assert text for #en' );
 	var clone = jQuery('#yahoo').clone();
 	equals( 'Try them out:Yahoo', jQuery('#first').append(clone).text(), 'Check for clone' );
@@ -791,6 +807,14 @@ test("clone()", function() {
 	div = div.clone(true);
 	equals( div.data("a"), true, "Data cloned." );
 	equals( div.data("b"), true, "Data cloned." );
+
+	var form = document.createElement("form");
+	form.action = "/test/";
+	var div = document.createElement("div");
+	div.appendChild( document.createTextNode("test") );
+	form.appendChild( div );
+
+	equals( jQuery(form).clone().children().length, 1, "Make sure we just get the form back." );
 });
 
 if (!isLocal) {