X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=d88400d1fd459b9212850d38530f6e886431c8c6;hb=7f5179b65431b77e89fa32623a5000e3630c191c;hp=35b24af90444d766b69efb7c362ebc99b3510378;hpb=cc1a34852f02a9304c555fefba470b28f0a6f8b2;p=jquery.git diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js index 35b24af..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("foo
test
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') )); @@ -288,10 +312,72 @@ test("append(String|Element|Array<Element>|jQuery)", function() { test("append(Function)", function() { testAppend(functionReturningObj); -}) +}); -test("appendTo(String|Element|Array<Element>|jQuery)", function() { +test("append(Function) with incoming value", function() { expect(12); + + var defaultText = 'Try them out:', old = jQuery("#first").html(); + + var result = jQuery('#first').append(function(i, val){ + equals( val, old, "Make sure the incoming value is correct." ); + return 'buga'; + }); + equals( result.text(), defaultText + 'buga', 'Check if text appending works' ); + + var select = jQuery('#select3'); + old = select.html(); + + equals( select.append(function(i, val){ + equals( val, old, "Make sure the incoming value is correct." ); + return ''; + }).find('option:last-child').attr('value'), 'appendTest', 'Appending html options to select element'); + + reset(); + var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:"; + old = jQuery("#sap").html(); + + jQuery('#sap').append(function(i, val){ + equals( val, old, "Make sure the incoming value is correct." ); + return document.getElementById('first'); + }); + equals( expected, jQuery('#sap').text(), "Check for appending of element" ); + + reset(); + expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo"; + old = jQuery("#sap").html(); + + jQuery('#sap').append(function(i, val){ + equals( val, old, "Make sure the incoming value is correct." ); + return [document.getElementById('first'), document.getElementById('yahoo')]; + }); + equals( expected, jQuery('#sap').text(), "Check for appending of array of elements" ); + + reset(); + expected = "This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:"; + old = jQuery("#sap").html(); + + jQuery('#sap').append(function(i, val){ + equals( val, old, "Make sure the incoming value is correct." ); + return jQuery("#first, #yahoo"); + }); + equals( expected, jQuery('#sap').text(), "Check for appending of jQuery object" ); + + reset(); + old = jQuery("#sap").html(); + + jQuery("#sap").append(function(i, val){ + equals( val, old, "Make sure the incoming value is correct." ); + return 5; + }); + ok( jQuery("#sap")[0].innerHTML.match( /5$/ ), "Check for appending a number" ); + + reset(); +}); + +test("appendTo(String|Element|Array<Element>|jQuery)", function() { + expect(14); + var defaultText = 'Try them out:' jQuery('buga').appendTo('#first'); equals( jQuery("#first").text(), defaultText + 'buga', 'Check if text appending works' ); @@ -339,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) { @@ -362,7 +462,7 @@ var testPrepend = function(val) { expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog"; jQuery('#sap').prepend(val( jQuery("#first, #yahoo") )); equals( expected, jQuery('#sap').text(), "Check for prepending of jQuery object" ); -} +}; test("prepend(String|Element|Array<Element>|jQuery)", function() { testPrepend(bareObj); @@ -370,7 +470,58 @@ test("prepend(String|Element|Array<Element>|jQuery)", function() { test("prepend(Function)", function() { testPrepend(functionReturningObj); -}) +}); + +test("prepend(Function) with incoming value", function() { + expect(10); + + var defaultText = 'Try them out:', old = jQuery('#first').html(); + var result = jQuery('#first').prepend(function(i, val) { + equals( val, old, "Make sure the incoming value is correct." ); + return 'buga'; + }); + equals( result.text(), 'buga' + defaultText, 'Check if text prepending works' ); + + old = jQuery("#select3").html(); + + equals( jQuery('#select3').prepend(function(i, val) { + equals( val, old, "Make sure the incoming value is correct." ); + return ''; + }).find('option:first-child').attr('value'), 'prependTest', 'Prepending html options to select element'); + + reset(); + var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog"; + old = jQuery('#sap').html(); + + jQuery('#sap').prepend(function(i, val) { + equals( val, old, "Make sure the incoming value is correct." ); + return document.getElementById('first'); + }); + + equals( expected, jQuery('#sap').text(), "Check for prepending of element" ); + + reset(); + expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog"; + old = jQuery('#sap').html(); + + jQuery('#sap').prepend(function(i, val) { + equals( val, old, "Make sure the incoming value is correct." ); + return [document.getElementById('first'), document.getElementById('yahoo')]; + }); + + equals( expected, jQuery('#sap').text(), "Check for prepending of array of elements" ); + + reset(); + expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog"; + old = jQuery('#sap').html(); + + jQuery('#sap').prepend(function(i, val) { + equals( val, old, "Make sure the incoming value is correct." ); + return jQuery("#first, #yahoo"); + }); + + equals( expected, jQuery('#sap').text(), "Check for prepending of jQuery object" ); +}); test("prependTo(String|Element|Array<Element>|jQuery)", function() { expect(6); @@ -514,7 +665,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() { }); var testReplaceWith = function(val) { - expect(14); + 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' ); @@ -525,6 +676,12 @@ var testReplaceWith = function(val) { ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after element' ); reset(); + jQuery("#main").append('
Foo
'); + 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' ); @@ -536,14 +693,44 @@ var testReplaceWith = function(val) { ok( jQuery("#mark")[0], 'Replace element with set of elements' ); ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after set of elements' ); + reset(); + var tmp = jQuery("
").appendTo("body").click(function(){ ok(true, "Newly 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(); // 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(); + var set = jQuery("
").replaceWith(val("test")); equals( set[0].nodeName.toLowerCase(), "span", "Replace the disconnected node." ); 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(); } @@ -554,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); @@ -581,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' ); @@ -631,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) { @@ -651,7 +866,7 @@ test("clone() on XML nodes", function() { } var testHtml = function(valueObj) { - expect(22); + expect(31); jQuery.scriptorder = 0; @@ -663,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(); @@ -681,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("jQuery")); @@ -694,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("