X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2FcoreTest.js;h=928f07e5cc1bea328e79a1f1cc74adc8998b0be5;hb=e3263063e4ef3d2e0ee6b74b9da573bf40e87668;hp=d673711aa8a209baace6a5567f690ee2b453d045;hpb=85afa7c1ba32e2e867b89e4222a4d27ea97dd20d;p=jquery.git

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index d673711..928f07e 100644
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -348,20 +348,50 @@ test("wrap(String|Element)", function() {
 	ok( result.text() == defaultText, 'Check for element wrapping' );
 	
 	reset();
-	//stop();
 	$('#check1').click(function() {		
 		var checkbox = this;		
 		ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
 		$(checkbox).wrap( '<div id="c1" style="display:none;"></div>' );
 		ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
-		// use a fade in to check state after this event handler has finished
-		/*setTimeout(function() {
-			ok( !checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
-			start();
-		}, 100);*/
 	}).click();
 });
 
+test("wrapAll(String|Element)", function() {
+	expect(8);
+	var prev = $("#first")[0].previousSibling;
+	var p = $("#first")[0].parentNode;
+	var result = $('#first,#firstp').wrapAll('<div class="red"><div id="tmp"></div></div>');
+	equals( result.parent().length, 1, 'Check for wrapping of on-the-fly html' );
+	ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
+	ok( $('#firstp').parent().parent().is('.red'), 'Check if wrapper has class "red"' );
+	equals( $("#first").parent().parent()[0].previousSibling, prev, "Correct Previous Sibling" );
+	equals( $("#first").parent().parent()[0].parentNode, p, "Correct Parent" );
+
+	reset();
+	var prev = $("#first")[0].previousSibling;
+	var p = $("#first")[0].parentNode;
+	var result = $('#first,#firstp').wrapAll(document.getElementById('empty'));
+	equals( $("#first").parent()[0], $("#firstp").parent()[0], "Same Parent" );
+	equals( $("#first").parent()[0].previousSibling, prev, "Correct Previous Sibling" );
+	equals( $("#first").parent()[0].parentNode, p, "Correct Parent" );
+});
+
+test("wrapInner(String|Element)", function() {
+	expect(6);
+	var num = $("#first").children().length;
+	var result = $('#first').wrapInner('<div class="red"><div id="tmp"></div></div>');
+	equals( $("#first").children().length, 1, "Only one child" );
+	ok( $("#first").children().is(".red"), "Verify Right Element" );
+	equals( $("#first").children().children().children().length, num, "Verify Elements Intact" );
+
+	reset();
+	var num = $("#first").children().length;
+	var result = $('#first').wrapInner(document.getElementById('empty'));
+	equals( $("#first").children().length, 1, "Only one child" );
+	ok( $("#first").children().is("#empty"), "Verify Right Element" );
+	equals( $("#first").children().children().length, num, "Verify Elements Intact" );
+});
+
 test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	expect(18);
 	var defaultText = 'Try them out:'