X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=test%2Funit%2Fmanipulation.js;h=082c4e9d62eecae6a10feeb8d7dfb0b06eae7d8a;hb=a6f3757d50f8be021505f4f7fa7201199e8b7f2d;hp=b0a1c71af2f4067e5823a46db8f5bf33a7198a6c;hpb=bed759c95ca6d796125653b540e8611dc63b38bb;p=jquery.git
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index b0a1c71..082c4e9 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -140,22 +140,29 @@ test("wrapAll(String|Element)", function() {
});
var testWrapInner = function(val) {
- expect(8);
+ 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("");
+ div.wrapInner(val(""));
equals(div.children().length, 1, "The contents were wrapped.");
equals(div.children()[0].nodeName.toLowerCase(), "span", "A span was inserted.");
}
@@ -164,10 +171,9 @@ 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);
@@ -370,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' );
@@ -418,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) {
@@ -644,7 +665,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() {
});
var testReplaceWith = function(val) {
- expect(15);
+ 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' );
@@ -655,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' );
@@ -714,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);
@@ -741,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' );
@@ -791,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) {
@@ -811,7 +866,7 @@ test("clone() on XML nodes", function() {
}
var testHtml = function(valueObj) {
- expect(24);
+ expect(31);
jQuery.scriptorder = 0;
@@ -828,6 +883,14 @@ var testHtml = function(valueObj) {
equals( div.children().length, 2, "Make sure two child nodes exist." );
equals( div.children().children().length, 1, "Make sure that a grandchild exists." );
+ equals( jQuery("").html(valueObj(" "))[0].innerHTML, " ", "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();
@@ -859,16 +922,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("