X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=d88400d1fd459b9212850d38530f6e886431c8c6;hb=7d5da0ee030b1962ff1ff57b0221a02dfdc2886a;hp=3eef1221cdf2df0d907c944c123ea675045d51e7;hpb=3e9ef6f5c08e63a90ef2dfd3bdc833994e7a0ac8;p=jquery.git
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 3eef122..d88400d 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -139,35 +139,41 @@ 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(11);
var num = jQuery("#first").children().length;
- var result = jQuery('#first').wrapInner('
');
+ var result = jQuery('#first').wrapInner(val(''));
+ 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("footest
test2
").children().length;
+ var result = jQuery('#first').wrapInner(val(''));
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.wrapInner(val(""));
+ 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() {
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);
@@ -197,7 +203,7 @@ test("unwrap()", function() {
});
var testAppend = function(valueObj) {
- expect(22);
+ expect(37);
var defaultText = 'Try them out:'
var result = jQuery('#first').append(valueObj('buga'));
equals( result.text(), defaultText + 'buga', 'Check if text appending works' );
@@ -230,6 +236,24 @@ var testAppend = function(valueObj) {
ok( jQuery("#sap").append(valueObj( [] )), "Check for appending an empty array." );
ok( jQuery("#sap").append(valueObj( "" )), "Check for appending an empty string." );
ok( jQuery("#sap").append(valueObj( document.getElementsByTagName("foo") )), "Check for appending an empty nodelist." );
+
+ reset();
+ jQuery("form").append(valueObj(''));
+ jQuery("form input[name=radiotest]").each(function(){
+ ok( jQuery(this).is(':checked'), "Append checked radio");
+ }).remove();
+
+ reset();
+ jQuery("form").append(valueObj(''));
+ jQuery("form input[name=radiotest]").each(function(){
+ ok( jQuery(this).is(':checked'), "Append alternately formated checked radio");
+ }).remove();
+
+ reset();
+ jQuery("form").append(valueObj(''));
+ jQuery("form input[name=radiotest]").each(function(){
+ ok( jQuery(this).is(':checked'), "Append HTML5-formated checked radio");
+ }).remove();
reset();
jQuery("#sap").append(valueObj( document.getElementById('form') ));
@@ -352,7 +376,8 @@ test("append(Function) with incoming value", function() {
});
test("appendTo(String|Element|Array<Element>|jQuery)", function() {
- expect(12);
+ expect(14);
+
var defaultText = 'Try them out:'
jQuery('buga').appendTo('#first');
equals( jQuery("#first").text(), defaultText + 'buga', 'Check if text appending works' );
@@ -400,6 +425,20 @@ test("appendTo(String|Element|Array<Element>|jQuery)", function() {
ok( jQuery("#moretests div:last").hasClass("test"), "appendTo element was modified after the insertion" );
reset();
+
+ div = jQuery("");
+ jQuery("ab").filter("span").appendTo( div );
+
+ equals( div.children().length, 1, "Make sure the right number of children were inserted." );
+
+ div = jQuery("#moretests div");
+
+ var num = jQuery("#main div").length;
+ div.remove().appendTo("#main");
+
+ equals( jQuery("#main div").length, num, "Make sure all the removed divs were inserted." );
+
+ reset();
});
var testPrepend = function(val) {
@@ -626,7 +665,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() {
});
var testReplaceWith = function(val) {
- expect(16);
+ expect(17);
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' );
@@ -637,6 +676,12 @@ var testReplaceWith = function(val) {
ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after element' );
reset();
+ jQuery("#main").append('');
+ jQuery('#baz').replaceWith("Baz");
+ equals( jQuery("#bar").text(),"Baz", 'Replace element with text' );
+ ok( !jQuery("#baz")[0], 'Verify that original element is gone, after element' );
+
+ reset();
jQuery('#yahoo').replaceWith(val( [document.getElementById('first'), document.getElementById('mark')] ));
ok( jQuery("#first")[0], 'Replace element with array of elements' );
ok( jQuery("#mark")[0], 'Replace element with array of elements' );
@@ -650,9 +695,8 @@ 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; });
- var child2 = y.append("test").find("u").click(function(){ ok(true, "Child 2 bound click run." ); return false; });
y.replaceWith( tmp );
@@ -660,15 +704,22 @@ var testReplaceWith = function(val) {
y.click(); // Shouldn't be run
child.click(); // Shouldn't be run
+ tmp.remove();
+ y.remove();
+ child.remove();
+
reset();
- y = jQuery('#yahoo').click(function(){ ok(true, "Previously bound click run." ); });
+ 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();
var set = jQuery("").replaceWith(val("test"));
@@ -676,9 +727,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();
}
@@ -689,7 +741,27 @@ test("replaceWith(String|Element|Array<Element>|jQuery)", function() {
test("replaceWith(Function)", function() {
testReplaceWith(functionReturningObj);
-})
+
+ expect(18);
+
+ var y = jQuery("#yahoo")[0];
+
+ jQuery(y).replaceWith(function(){
+ equals( this, y, "Make sure the context is coming in correctly." );
+ });
+
+ reset();
+});
+
+test("replaceWith(string) for more than one element", function(){
+ expect(3);
+
+ equals(jQuery('#foo p').length, 3, 'ensuring that test data has not changed');
+
+ jQuery('#foo p').replaceWith('bar');
+ equals(jQuery('#foo span').length, 3, 'verify that all the three original element have been replaced');
+ equals(jQuery('#foo p').length, 0, 'verify that all the three original element have been replaced');
+});
test("replaceAll(String|Element|Array<Element>|jQuery)", function() {
expect(10);
@@ -716,7 +788,7 @@ test("replaceAll(String|Element|Array<Element>|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' );
@@ -766,6 +838,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) {
@@ -786,7 +866,7 @@ test("clone() on XML nodes", function() {
}
var testHtml = function(valueObj) {
- expect(22);
+ expect(31);
jQuery.scriptorder = 0;
@@ -798,6 +878,20 @@ var testHtml = function(valueObj) {
}
ok( pass, "Set HTML" );
+ div = jQuery("").html( valueObj('') );
+
+ equals( div.children().length, 2, "Make sure two child nodes exist." );
+ equals( div.children().children().length, 1, "Make sure that a grandchild exists." );
+
+ var space = jQuery("").html(valueObj(" "))[0].innerHTML;
+ ok( /^\s$|^ $/.test( space ), "Make sure entities are passed through correctly." );
+ equals( jQuery("").html(valueObj("&"))[0].innerHTML, "&", "Make sure entities are passed through correctly." );
+
+ jQuery("#main").html(valueObj(""));
+
+ equals( jQuery("#main").children().length, 1, "Make sure there is a child element." );
+ equals( jQuery("#main").children()[0].nodeName.toUpperCase(), "STYLE", "And that a style element was inserted." );
+
reset();
// using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
@@ -816,9 +910,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(""));
@@ -829,16 +923,15 @@ var testHtml = function(valueObj) {
jQuery("#main").html(valueObj(''));
- stop();
+ jQuery("#main").html(valueObj(""));
+ jQuery("#main").html(valueObj(""));
+ jQuery("#main").html(valueObj(""));
jQuery("#main").html(valueObj(''));
jQuery("#main").html(valueObj('foo '));
- // 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
jQuery("#main").html(valueObj("