From: jeresig Date: Thu, 7 Jan 2010 18:34:16 +0000 (-0500) Subject: Added manipulation tests for setter function args. X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;ds=sidebyside;h=22ff8e9ea46be4b145aa4963083d7c2d99ce9b0c;p=jquery.git Added manipulation tests for setter function args. --- diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js index 35b24af..a7e1f7e 100644 --- a/test/unit/manipulation.js +++ b/test/unit/manipulation.js @@ -288,7 +288,68 @@ test("append(String|Element|Array<Element>|jQuery)", function() { test("append(Function)", function() { testAppend(functionReturningObj); -}) +}); + +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(12); @@ -362,7 +423,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 +431,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); @@ -714,6 +826,66 @@ test("html(Function)", function() { testHtml(functionReturningObj); }); +test("html(Function) with incoming value", function() { + expect(20); + + var div = jQuery("#main > div"), old = div.map(function(){ return jQuery(this).html() }); + + div.html(function(i, val) { + equals( val, old[i], "Make sure the incoming value is correct." ); + return "test"; + }); + + var pass = true; + div.each(function(){ + if ( this.childNodes.length !== 1 ) { + pass = false; + } + }) + ok( pass, "Set HTML" ); + + reset(); + // using contents will get comments regular, text, and comment nodes + var j = jQuery("#nonnodes").contents(); + old = j.map(function(){ return jQuery(this).html(); }); + + j.html(function(i, val) { + equals( val, old[i], "Make sure the incoming value is correct." ); + return "bold"; + }); + + j.find('b').removeData(); + equals( j.html().replace(/ xmlns="[^"]+"/g, "").toLowerCase(), "bold", "Check node,textnode,comment with html()" ); + + var $div = jQuery('
'); + + equals( $div.html(function(i, val) { + equals( val, "", "Make sure the incoming value is correct." ); + return 5; + }).html(), '5', 'Setting a number as html' ); + + equals( $div.html(function(i, val) { + equals( val, "5", "Make sure the incoming value is correct." ); + return 0; + }).html(), '0', 'Setting a zero as html' ); + + var $div2 = jQuery('
'), insert = "<div>hello1</div>"; + equals( $div2.html(function(i, val) { + equals( val, "", "Make sure the incoming value is correct." ); + return insert; + }).html(), insert, "Verify escaped insertion." ); + + equals( $div2.html(function(i, val) { + equals( val, insert, "Make sure the incoming value is correct." ); + return "x" + insert; + }).html(), "x" + insert, "Verify escaped insertion." ); + + equals( $div2.html(function(i, val) { + equals( val, "x" + insert, "Make sure the incoming value is correct." ); + return " " + insert; + }).html(), " " + insert, "Verify escaped insertion." ); +}); + var testRemove = function(method) { expect(9);