X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Fmanipulation.js;h=e387d640eba82b04fb7cf6270c67a92e1b2148a3;hb=3e286440d55749382a644ea97b4f0b2587779d65;hp=046d363ebb324a758272fca8084837e07e73d08f;hpb=cb4880ee8353b5fc1a8a509cb0caf3a82818da0a;p=jquery.git
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 046d363..e387d64 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -139,13 +139,8 @@ test("wrapAll(String|Element)", function() {
testWrapAll(bareObj);
});
-// TODO: Figure out why each(wrapAll) is not equivalent to wrapAll
-// test("wrapAll(Function)", function() {
-// testWrapAll(functionReturningObj);
-// })
-
var testWrapInner = function(val) {
- expect(6);
+ expect(8);
var num = jQuery("#first").children().length;
var result = jQuery('#first').wrapInner('
');
equals( jQuery("#first").children().length, 1, "Only one child" );
@@ -158,6 +153,11 @@ var testWrapInner = function(val) {
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.wrapInner("");
+ equals(div.children().length, 1, "The contents were wrapped.");
+ equals(div.children()[0].nodeName.toLowerCase(), "span", "A span was inserted.");
}
test("wrapInner(String|Element)", function() {
@@ -626,7 +626,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() {
});
var testReplaceWith = function(val) {
- expect(17);
+ expect(15);
jQuery('#yahoo').replaceWith(val( 'buga' ));
ok( jQuery("#replace")[0], 'Replace element with string' );
ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after string' );
@@ -650,14 +650,30 @@ var testReplaceWith = function(val) {
reset();
var tmp = jQuery("").appendTo("body").click(function(){ ok(true, "Newly bound click run." ); });
- var y = jQuery('#yahoo').click(function(){ ok(true, "Previously bound click run." ); });
+ var y = jQuery('').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); });
var child = y.append("test").find("b").click(function(){ ok(true, "Child bound click run." ); return false; });
y.replaceWith( tmp );
tmp.click();
- y.click();
- child.click();
+ y.click(); // Shouldn't be run
+ child.click(); // Shouldn't be run
+
+ tmp.remove();
+ y.remove();
+ child.remove();
+
+ reset();
+
+ y = jQuery('').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); });
+ var child2 = y.append("test").find("u").click(function(){ ok(true, "Child 2 bound click run." ); return false; });
+
+ y.replaceWith( child2 );
+
+ child2.click();
+
+ y.remove();
+ child2.remove();
reset();
@@ -666,9 +682,10 @@ var testReplaceWith = function(val) {
equals( set.length, 1, "Replace the disconnected node." );
var $div = jQuery("").appendTo("body");
- $div.replaceWith("");
+ // TODO: Work on jQuery(...) inline script execution
+ //$div.replaceWith("");
equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');
jQuery('.replacewith').remove();
}
@@ -806,9 +823,9 @@ var testHtml = function(valueObj) {
equals( $div.html(valueObj( 0 )).html(), '0', 'Setting a zero as html' );
var $div2 = jQuery(''), insert = "<div>hello1</div>";
- equals( $div2.html(insert).html(), insert, "Verify escaped insertion." );
- equals( $div2.html("x" + insert).html(), "x" + insert, "Verify escaped insertion." );
- equals( $div2.html(" " + insert).html(), " " + insert, "Verify escaped insertion." );
+ equals( $div2.html(insert).html().replace(/>/g, ">"), insert, "Verify escaped insertion." );
+ equals( $div2.html("x" + insert).html().replace(/>/g, ">"), "x" + insert, "Verify escaped insertion." );
+ equals( $div2.html(" " + insert).html().replace(/>/g, ">"), " " + insert, "Verify escaped insertion." );
var map = jQuery("").html(valueObj(""));
@@ -886,17 +903,17 @@ test("html(Function) with incoming value", function() {
equals( $div2.html(function(i, val) {
equals( val, "", "Make sure the incoming value is correct." );
return insert;
- }).html(), insert, "Verify escaped insertion." );
+ }).html().replace(/>/g, ">"), insert, "Verify escaped insertion." );
equals( $div2.html(function(i, val) {
- equals( val, insert, "Make sure the incoming value is correct." );
+ equals( val.replace(/>/g, ">"), insert, "Make sure the incoming value is correct." );
return "x" + insert;
- }).html(), "x" + insert, "Verify escaped insertion." );
+ }).html().replace(/>/g, ">"), "x" + insert, "Verify escaped insertion." );
equals( $div2.html(function(i, val) {
- equals( val, "x" + insert, "Make sure the incoming value is correct." );
+ equals( val.replace(/>/g, ">"), "x" + insert, "Make sure the incoming value is correct." );
return " " + insert;
- }).html(), " " + insert, "Verify escaped insertion." );
+ }).html().replace(/>/g, ">"), " " + insert, "Verify escaped insertion." );
});
var testRemove = function(method) {