X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=4e774857853490b82400ba5c29b69ed96fc04a93;hb=279f77e9609fba62c11a06f8c65221b16f7bc7d4;hp=f77d1f8970106160bf1f0153ef59ddf59f578626;hpb=ed7608d8eedc0cd9082b5246581c0fc4ccb392db;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index f77d1f8..4e77485 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -12,14 +12,19 @@ test("Basic requirements", function() {
 });
 
 test("$()", function() {
-	expect(5);
+	expect(4);
 	
 	var main = $("#main");
 	isSet( $("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" );
 	
+/*
+	// disabled since this test was doing nothing. i tried to fix it but i'm not sure
+	// what the expected behavior should even be. FF returns "\n" for the text node
 	// make sure this is handled
-	$('<p>\r\n</p>');
-	ok( true, "Check for \\r and \\n in jQuery()" );
+	var crlfContainer = $('<p>\r\n</p>');
+	var x = crlfContainer.contents().get(0).nodeValue;
+	equals( x, what???, "Check for \\r and \\n in jQuery()" );
+*/
 	
 	/* // Disabled until we add this functionality in
 	var pass = true;
@@ -136,19 +141,19 @@ test("isFunction", function() {
 
 		ok( jQuery.isFunction(fn), "Recursive Function Call" );
 
-    	fn({ some: "data" });
+		fn({ some: "data" });
 	};
 
 	callme(function(){
-    	callme(function(){});
+		callme(function(){});
 	});
 });
 
 var foo = false;
 
 test("$('html')", function() {
-	expect(4);
-	
+	expect(5);
+
 	reset();
 	foo = false;
 	var s = $("<script>var foo='test';</script>")[0];
@@ -161,6 +166,29 @@ test("$('html')", function() {
 	ok( $("<link rel='stylesheet'/>")[0], "Creating a link" );
 	
 	reset();
+
+	var j = $("<span>hi</span> there <!-- mon ami -->");
+	ok( j.length >= 2, "Check node,textnode,comment creation (some browsers delete comments)" );
+});
+
+test("$('html', context)", function() {
+	expect(1);
+
+	var $div = $("<div/>");
+	var $span = $("<span/>", $div);
+	equals($span.length, 1, "Verify a span created with a div context works, #1763");
+});
+
+test("$(selector, xml).text(str) - Loaded via XML document", function() {
+	expect(2);
+	stop();
+	$.get('data/dashboard.xml', function(xml) { 
+		// tests for #1419 where IE was a problem
+		equals( $("tab:first", xml).text(), "blabla", "Verify initial text correct" );
+		$("tab:first", xml).text("newtext");
+		equals( $("tab:first", xml).text(), "newtext", "Verify new text correct" );
+		start();
+	});
 });
 
 test("length", function() {
@@ -183,8 +211,8 @@ test("get(Number)", function() {
 	ok( $("p").get(0) == document.getElementById("firstp"), "Get A Single Element" );
 });
 
-test("add(String|Element|Array)", function() {
-	expect(7);
+test("add(String|Element|Array|undefined)", function() {
+	expect(8);
 	isSet( $("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" );
 	isSet( $("#sndp").add( $("#en")[0] ).add( $("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" );
 	ok( $([]).add($("#form")[0].elements).length >= 13, "Check elements from array" );
@@ -196,6 +224,9 @@ test("add(String|Element|Array)", function() {
 	var x = $([]).add("<p id='x1'>xxx</p>").add("<p id='x2'>xxx</p>");
 	ok( x[0].id == "x1", "Check on-the-fly element1" );
 	ok( x[1].id == "x2", "Check on-the-fly element2" );
+	
+	var notDefined;
+	equals( $([]).add(notDefined).length, 0, "Check that undefined adds nothing." );
 });
 
 test("each(Function)", function() {
@@ -204,7 +235,7 @@ test("each(Function)", function() {
 	div.each(function(){this.foo = 'zoo';});
 	var pass = true;
 	for ( var i = 0; i < div.size(); i++ ) {
-	  if ( div.get(i).foo != "zoo" ) pass = false;
+		if ( div.get(i).foo != "zoo" ) pass = false;
 	}
 	ok( pass, "Execute a function, Relative" );
 });
@@ -249,15 +280,15 @@ test("attr(String)", function() {
 });
 
 if ( !isLocal ) {
-    test("attr(String) in XML Files", function() {
-        expect(2);
-        stop();
-        $.get("data/dashboard.xml", function(xml) {
-            ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" );
-            ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" );
-            start();
-        });
-    });
+	test("attr(String) in XML Files", function() {
+		expect(2);
+		stop();
+		$.get("data/dashboard.xml", function(xml) {
+			ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" );
+			ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" );
+			start();
+		});
+	});
 }
 
 test("attr(String, Function)", function() {
@@ -270,18 +301,18 @@ test("attr(Hash)", function() {
 	expect(1);
 	var pass = true;
 	$("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
-	  if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
+		if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
 	});
 	ok( pass, "Set Multiple Attributes" );
 });
 
 test("attr(String, Object)", function() {
-	expect(16);
+	expect(17);
 	var div = $("div");
 	div.attr("foo", "bar");
 	var pass = true;
 	for ( var i = 0; i < div.size(); i++ ) {
-	  if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
+		if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
 	}
 	ok( pass, "Set Attribute" );
 
@@ -310,6 +341,13 @@ test("attr(String, Object)", function() {
 	$("#name").attr('someAttr', 1);
 	equals( $("#name").attr('someAttr'), 1, 'Set attribute to the number 1' );
 
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+
+	j.attr("name", "attrvalue");
+	equals( j.attr("name"), "attrvalue", "Check node,textnode,comment for attr" );
+	j.removeAttr("name")
+
 	reset();
 
 	var type = $("#check2").attr('type');
@@ -334,19 +372,19 @@ test("attr(String, Object)", function() {
 });
 
 if ( !isLocal ) {
-    test("attr(String, Object) - Loaded via XML document", function() {
-        expect(2);
-        stop();
-        $.get('data/dashboard.xml', function(xml) { 
-              var titles = [];
-              $('tab', xml).each(function() {
-                    titles.push($(this).attr('title'));
-              });
-              ok( titles[0] == 'Location', 'attr() in XML context: Check first title' );
-              ok( titles[1] == 'Users', 'attr() in XML context: Check second title' );
-              start();
-        });
-    });
+	test("attr(String, Object) - Loaded via XML document", function() {
+		expect(2);
+		stop();
+		$.get('data/dashboard.xml', function(xml) { 
+			var titles = [];
+			$('tab', xml).each(function() {
+				titles.push($(this).attr('title'));
+			});
+			equals( titles[0], 'Location', 'attr() in XML context: Check first title' );
+			equals( titles[1], 'Users', 'attr() in XML context: Check second title' );
+			start();
+		});
+	});
 }
 
 test("css(String|Hash)", function() {
@@ -380,7 +418,7 @@ test("css(String|Hash)", function() {
 });
 
 test("css(String, Object)", function() {
-	expect(18);
+	expect(20);
 	ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
 	$('#foo').css('display', 'none');
 	ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
@@ -404,6 +442,16 @@ test("css(String, Object)", function() {
 	});
 	$('#foo').css('opacity', '');
 	ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" );
+	// for #1438, IE throws JS error when filter exists but doesn't have opacity in it
+	if (jQuery.browser.msie) {
+		$('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');");
+	}
+	equals( $('#foo').css('opacity'), '1', "Assert opacity is 1 when a different filter is set in IE, #1438" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.css("padding-left", "1px");
+	equals( j.css("padding-left"), "1px", "Check node,textnode,comment css works" );
 });
 
 test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
@@ -434,7 +482,7 @@ test("text()", function() {
 });
 
 test("wrap(String|Element)", function() {
-	expect(6);
+	expect(8);
 	var defaultText = 'Try them out:'
 	var result = $('#first').wrap('<div class="red"><span></span></div>').text();
 	ok( defaultText == result, 'Check for wrapping of on-the-fly html' );
@@ -453,6 +501,12 @@ test("wrap(String|Element)", function() {
 		$(checkbox).wrap( '<div id="c1" style="display:none;"></div>' );
 		ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" );
 	}).click();
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.wrap("<i></i>");
+	equals( $("#nonnodes > i").length, 3, "Check node,textnode,comment wraps ok" );
+	equals( $("#nonnodes > i").text(), j.text() + j[1].nodeValue, "Check node,textnode,comment wraps doesn't hurt text" );
 });
 
 test("wrapAll(String|Element)", function() {
@@ -492,7 +546,7 @@ test("wrapInner(String|Element)", function() {
 });
 
 test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-	expect(18);
+	expect(21);
 	var defaultText = 'Try them out:'
 	var result = $('#first').append('<b>buga</b>');
 	ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
@@ -528,12 +582,12 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	
 	reset();
 	$("#sap").append(document.getElementById('form'));
-	ok( $("#sap>form").size() == 1, "Check for appending a form" );  // Bug #910
+	ok( $("#sap>form").size() == 1, "Check for appending a form" ); // Bug #910
 
 	reset();
 	var pass = true;
 	try {
-		$( $("iframe")[0].contentWindow.document.body ).append("<div>test</div>");
+		$( $("#iframe")[0].contentWindow.document.body ).append("<div>test</div>");
 	} catch(e) {
 		pass = false;
 	}
@@ -564,6 +618,15 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 		.append('<select id="appendSelect2"><option>Test</option></select>');
 	
 	t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	var d = $("<div/>").appendTo("#nonnodes").append(j);
+	equals( $("#nonnodes").length, 1, "Check node,textnode,comment append moved leaving just the div" );
+	ok( d.contents().length >= 2, "Check node,textnode,comment append works" );
+	d.contents().appendTo("#nonnodes");
+	d.remove();
+	ok( $("#nonnodes").contents().length >= 2, "Check node,textnode,comment append cleanup worked" );
 });
 
 test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -792,16 +855,33 @@ test("end()", function() {
 });
 
 test("find(String)", function() {
-	expect(1);
+	expect(2);
 	ok( 'Yahoo' == $('#foo').find('.blogTest').text(), 'Check for find' );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	equals( j.find("div").length, 0, "Check node,textnode,comment to find zero divs" );
 });
 
 test("clone()", function() {
-	expect(3);
+	expect(6);
 	ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Assert text for #en' );
 	var clone = $('#yahoo').clone();
 	ok( 'Try them out:Yahoo' == $('#first').append(clone).text(), 'Check for clone' );
 	ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Reassert text for #en' );
+	// using contents will get comments regular, text, and comment nodes
+	var cl = $("#nonnodes").contents().clone();
+	ok( cl.length >= 2, "Check node,textnode,comment clone works (some browsers delete comments on clone)" );
+
+	stop();
+	$.get("data/dashboard.xml", function (xml) {
+		var root = $(xml.documentElement).clone();
+		$("tab:first", xml).text("origval");
+		$("tab:first", root).text("cloneval");
+		equals($("tab:first", xml).text(), "origval", "Check original XML node was correctly set");
+		equals($("tab:first", root).text(), "cloneval", "Check cloned XML node was correctly set");
+		start();
+	});
 });
 
 test("is(String)", function() {
@@ -837,10 +917,10 @@ test("is(String)", function() {
 });
 
 test("$.extend(Object, Object)", function() {
-	expect(14);
+	expect(17);
 
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-		options =     { xnumber2: 1, xstring2: "x", xxx: "newstring" },
+		options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
 		optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
 		merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
 		deep1 = { foo: { bar: true } },
@@ -873,11 +953,22 @@ test("$.extend(Object, Object)", function() {
 	var ret = jQuery.extend(true, { foo: "1,2,3" }, { foo: [1, 2, 3] } );
 	ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
 
+	var ret = jQuery.extend(true, { foo:"bar" }, { foo:null } );
+	ok( typeof ret.foo !== 'undefined', "Make sure a null value doesn't crash with deep extend, for #1908" );
+
+	var obj = { foo:null };
+	jQuery.extend(true, obj, { foo:"notnull" } );
+	equals( obj.foo, "notnull", "Make sure a null value can be overwritten" );
+
+	function func() {}
+	jQuery.extend(func, { key: "value" } );
+	equals( func.key, "value", "Verify a function can be extended" );
+
 	var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
 		defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
-		options1 =     { xnumber2: 1, xstring2: "x" },
+		options1 = { xnumber2: 1, xstring2: "x" },
 		options1Copy = { xnumber2: 1, xstring2: "x" },
-		options2 =     { xstring2: "xx", xxx: "newstringx" },
+		options2 = { xstring2: "xx", xxx: "newstringx" },
 		options2Copy = { xstring2: "xx", xxx: "newstringx" },
 		merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
 
@@ -897,7 +988,7 @@ test("val()", function() {
 });
 
 test("val(String)", function() {
-	expect(3);
+	expect(4);
 	document.getElementById('text1').value = "bla";
 	ok( $("#text1").val() == "bla", "Check for modified value of input element" );
 	$("#text1").val('test');
@@ -905,12 +996,18 @@ test("val(String)", function() {
 	
 	$("#select1").val("3");
 	ok( $("#select1").val() == "3", "Check for modified (via val(String)) value of select element" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.val("asdf");
+	equals( j.val(), "asdf", "Check node,textnode,comment with val()" );
+	j.removeAttr("value");
 });
 
 var scriptorder = 0;
 
 test("html(String)", function() {
-	expect(10);
+	expect(11);
 	var div = $("#main > div");
 	div.html("<b>test</b>");
 	var pass = true;
@@ -919,6 +1016,12 @@ test("html(String)", function() {
 	}
 	ok( pass, "Set HTML" );
 
+	reset();
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.html("<b>bold</b>");
+	equals( j.html().toLowerCase(), "<b>bold</b>", "Check node,textnode,comment with html()" );
+
 	$("#main").html("<select/>");
 	$("#main select").html("<option>O1</option><option selected='selected'>O2</option><option>O3</option>");
 	equals( $("#main select").val(), "O2", "Selected option correct" );
@@ -929,17 +1032,23 @@ test("html(String)", function() {
 
 	$("#main").html('foo <form><script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script></form>');
 
-	$("#main").html("<script>ok(scriptorder++ == 0, 'Script is executed in order');ok($('#scriptorder').length == 0,'Execute before html')<\/script><span id='scriptorder'><script>ok(scriptorder++ == 1, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script></span><script>ok(scriptorder++ == 2, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script>");
+	// it was decided that waiting to execute ALL scripts makes sense since nested ones have to wait anyway so this test case is changed, see #1959
+	$("#main").html("<script>ok(scriptorder++ == 0, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html (even though appears before)')<\/script><span id='scriptorder'><script>ok(scriptorder++ == 1, 'Script (nested) is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script></span><script>ok(scriptorder++ == 2, 'Script (unnested) is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script>");
 
 	setTimeout( start, 100 );
 });
 
 test("filter()", function() {
-	expect(4);
+	expect(6);
 	isSet( $("#form input").filter(":checked").get(), q("radio2", "check1"), "filter(String)" );
 	isSet( $("p").filter("#ap, #sndp").get(), q("ap", "sndp"), "filter('String, String')" );
 	isSet( $("p").filter("#ap,#sndp").get(), q("ap", "sndp"), "filter('String,String')" );
 	isSet( $("p").filter(function() { return !$("a", this).length }).get(), q("sndp", "first"), "filter(Function)" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	equals( j.filter("span").length, 1, "Check node,textnode,comment to filter the one span" );
+	equals( j.filter("[name]").length, 0, "Check node,textnode,comment to filter the one span" );
 });
 
 test("not()", function() {
@@ -1008,16 +1117,39 @@ test("prev([String])", function() {
 });
 
 test("show()", function() {
-	expect(1);
+	expect(15);
 	var pass = true, div = $("div");
 	div.show().each(function(){
-	  if ( this.style.display == "none" ) pass = false;
+		if ( this.style.display == "none" ) pass = false;
 	});
 	ok( pass, "Show" );
+	
+	$("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');
+	var test = {
+		"div"      : "block",
+		"p"        : "block",
+		"a"        : "inline",
+		"code"     : "inline",
+		"pre"      : "block",
+		"span"     : "inline",
+		"table"    : $.browser.msie ? "block" : "table",
+		"thead"    : $.browser.msie ? "block" : "table-header-group",
+		"tbody"    : $.browser.msie ? "block" : "table-row-group",
+		"tr"       : $.browser.msie ? "block" : "table-row",
+		"th"       : $.browser.msie ? "block" : "table-cell",
+		"td"       : $.browser.msie ? "block" : "table-cell",
+		"ul"       : "block",
+		"li"       : $.browser.msie ? "block" : "list-item"
+	};
+	
+	$.each(test, function(selector, expected) {
+		var elem = $(selector, "#show-tests").show();
+		equals( elem.css("display"), expected, "Show using correct display type for " + selector );
+	});
 });
 
 test("addClass(String)", function() {
-	expect(1);
+	expect(2);
 	var div = $("div");
 	div.addClass("test");
 	var pass = true;
@@ -1025,10 +1157,15 @@ test("addClass(String)", function() {
 	 if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
 	}
 	ok( pass, "Add Class" );
+
+	// using contents will get regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.addClass("asdf");
+	ok( j.hasClass("asdf"), "Check node,textnode,comment for addClass" );
 });
 
 test("removeClass(String) - simple", function() {
-	expect(3);
+	expect(4);
 	var div = $("div").addClass("test").removeClass("test"),
 		pass = true;
 	for ( var i = 0; i < div.size(); i++ ) {
@@ -1049,6 +1186,10 @@ test("removeClass(String) - simple", function() {
 	var div = $("div:eq(0)").addClass("test").removeClass("");
 	ok( div.is('.test'), "Empty string passed to removeClass" );
 	
+	// using contents will get regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.removeClass("asdf");
+	ok( !j.hasClass("asdf"), "Check node,textnode,comment for removeClass" );
 });
 
 test("toggleClass(String)", function() {
@@ -1067,8 +1208,15 @@ test("removeAttr(String", function() {
 });
 
 test("text(String)", function() {
-	expect(1);
+	expect(4);
 	ok( $("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML == "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "Check escaped text" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.text("hi!");
+	equals( $(j[0]).text(), "hi!", "Check node,textnode,comment with text()" );
+	equals( j[1].nodeValue, " there ", "Check node,textnode,comment with text()" );
+	equals( j[2].nodeType, 8, "Check node,textnode,comment with text()" );
 });
 
 test("$.each(Object,Function)", function() {
@@ -1111,7 +1259,7 @@ test("$.className", function() {
 });
 
 test("remove()", function() {
-	expect(4);
+	expect(6);
 	$("#ap").children().remove();
 	ok( $("#ap").text().length > 10, "Check text is not removed" );
 	ok( $("#ap").children().length == 0, "Check remove" );
@@ -1120,12 +1268,22 @@ test("remove()", function() {
 	$("#ap").children().remove("a");
 	ok( $("#ap").text().length > 10, "Check text is not removed" );
 	ok( $("#ap").children().length == 1, "Check filtered remove" );
+
+	// using contents will get comments regular, text, and comment nodes
+	equals( $("#nonnodes").contents().length, 3, "Check node,textnode,comment remove works" );
+	$("#nonnodes").contents().remove();
+	equals( $("#nonnodes").contents().length, 0, "Check node,textnode,comment remove works" );
 });
 
 test("empty()", function() {
-	expect(2);
+	expect(3);
 	ok( $("#ap").children().empty().text().length == 0, "Check text is removed" );
 	ok( $("#ap").children().length == 4, "Check elements are not removed" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = $("#nonnodes").contents();
+	j.empty();
+	equals( j.html(), "", "Check node,textnode,comment empty works" );
 });
 
 test("slice()", function() {
@@ -1159,9 +1317,33 @@ test("map()", function() {
 });
 
 test("contents()", function() {
-	expect(2);
+	expect(12);
 	equals( $("#ap").contents().length, 9, "Check element contents" );
 	ok( $("#iframe").contents()[0], "Check existance of IFrame document" );
-	// Disabled, randomly fails
-	//ok( $("#iframe").contents()[0].body, "Check existance of IFrame body" );
+	var ibody = $("#loadediframe").contents()[0].body;
+	ok( ibody, "Check existance of IFrame body" );
+
+	equals( $("span", ibody).text(), "span text", "Find span in IFrame and check its text" );
+
+	$(ibody).append("<div>init text</div>");
+	equals( $("div", ibody).length, 2, "Check the original div and the new div are in IFrame" );
+
+	equals( $("div:last", ibody).text(), "init text", "Add text to div in IFrame" );
+
+	$("div:last", ibody).text("div text");
+	equals( $("div:last", ibody).text(), "div text", "Add text to div in IFrame" );
+
+	$("div:last", ibody).remove();
+	equals( $("div", ibody).length, 1, "Delete the div and check only one div left in IFrame" );
+
+	equals( $("div", ibody).text(), "span text", "Make sure the correct div is still left after deletion in IFrame" );
+
+	$("<table/>", ibody).append("<tr><td>cell</td></tr>").appendTo(ibody);
+	$("table", ibody).remove();
+	equals( $("div", ibody).length, 1, "Check for JS error on add and delete of a table in IFrame" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var c = $("#nonnodes").contents().contents();
+	equals( c.length, 1, "Check node,textnode,comment contents is just one" );
+	equals( c[0].nodeValue, "hi", "Check node,textnode,comment contents is just the one from span" );
 });