X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=7b4f4d15909ae15f2cf7e280dced211ed03df4f2;hb=49f6f341814dce07b9fe2eff0052feb5ef286dfd;hp=4dd1df4002d175daf6bdee09f5384829248e358a;hpb=1e9d6e1255f94a4643770bb498e875d4016c0781;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 4dd1df4..7b4f4d1 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -22,7 +22,9 @@ var testText = function(valueObj) {
 	j.text(valueObj("hi!"));
 	equals( jQuery(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()" );
+
+	// Blackberry 4.6 doesn't maintain comments in the DOM
+	equals( jQuery("#nonnodes")[0].childNodes.length < 3 ? 8 : j[2].nodeType, 8, "Check node,textnode,comment with text()" );
 }
 
 test("text(String)", function() {
@@ -72,7 +74,9 @@ var testWrap = function(val) {
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();
 	j.wrap(val( "<i></i>" ));
-	equals( jQuery("#nonnodes > i").length, 3, "Check node,textnode,comment wraps ok" );
+
+	// Blackberry 4.6 doesn't maintain comments in the DOM
+	equals( jQuery("#nonnodes > i").length, jQuery("#nonnodes")[0].childNodes.length, "Check node,textnode,comment wraps ok" );
 	equals( jQuery("#nonnodes > i").text(), j.text(), "Check node,textnode,comment wraps doesn't hurt text" );
 
 	// Try wrapping a disconnected node
@@ -895,7 +899,7 @@ var testHtml = function(valueObj) {
 	equals( div.children().children().length, 1, "Make sure that a grandchild exists." );
 
 	var space = jQuery("<div/>").html(valueObj("&#160;"))[0].innerHTML;
-	ok( /^\s$|^&nbsp;$/.test( space ), "Make sure entities are passed through correctly." );
+	ok( /^\xA0$|^&nbsp;$/.test( space ), "Make sure entities are passed through correctly." );
 	equals( jQuery("<div/>").html(valueObj("&amp;"))[0].innerHTML, "&amp;", "Make sure entities are passed through correctly." );
 
 	jQuery("#main").html(valueObj("<style>.foobar{color:green;}</style>"));
@@ -951,6 +955,17 @@ test("html(String)", function() {
 
 test("html(Function)", function() {
 	testHtml(functionReturningObj);
+
+	expect(33);
+
+	QUnit.reset();
+
+	jQuery("#main").html(function(){
+		return jQuery(this).text();
+	});
+
+	ok( !/</.test( jQuery("#main").html() ), "Replace html with text." );
+	ok( jQuery("#main").html().length > 0, "Make sure text exists." );
 });
 
 test("html(Function) with incoming value", function() {
@@ -980,6 +995,11 @@ test("html(Function) with incoming value", function() {
 		equals( val, old[i], "Make sure the incoming value is correct." );
 		return "<b>bold</b>";
 	});
+
+	// Handle the case where no comment is in the document
+	if ( j.length === 2 ) {
+		equals( null, null, "Make sure the incoming value is correct." );
+	}
 	
 	j.find('b').removeData();
 	equals( j.html().replace(/ xmlns="[^"]+"/g, "").toLowerCase(), "<b>bold</b>", "Check node,textnode,comment with html()" );
@@ -1034,7 +1054,8 @@ var testRemove = function(method) {
 	equals( jQuery("#ap").children().length, 0, "Check multi-filtered remove" );
 
 	// using contents will get comments regular, text, and comment nodes
-	equals( jQuery("#nonnodes").contents().length, 3, "Check node,textnode,comment remove works" );
+	// Handle the case where no comment is in the document
+	ok( jQuery("#nonnodes").contents().length >= 2, "Check node,textnode,comment remove works" );
 	jQuery("#nonnodes").contents()[method]();
 	equals( jQuery("#nonnodes").contents().length, 0, "Check node,textnode,comment remove works" );