X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=inline;f=test%2Funit%2Fmanipulation.js;h=35b24af90444d766b69efb7c362ebc99b3510378;hb=8fa9e9d6d0307a5af8d7478d6e030af5afabba9e;hp=6de3e14eb2db2ef407f33450985b63d5c27b5ceb;hpb=4b70f006f579fba24a882d80ca67f1971dbb4922;p=jquery.git
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 6de3e14..35b24af 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -12,6 +12,42 @@ test("text()", function() {
equals( jQuery(document.createTextNode("foo")).text(), "foo", "Text node was retreived from .text()." );
});
+var testText = function(valueObj) {
+ expect(4);
+ var val = valueObj("
Hello cruel world!
");
+ equals( jQuery("#foo").text(val)[0].innerHTML.replace(/>/g, ">"), "<div><b>Hello</b> cruel world!</div>", "Check escaped text" );
+
+ // using contents will get comments regular, text, and comment nodes
+ var j = jQuery("#nonnodes").contents();
+ j.text(valueObj("hi!"));
+ equals( jQuery(j[0]).text(), "hi!", "Check node,textnode,comment with text()" );
+ equals( j[1].nodeValue, " there ", "Check node,textnode,comment with text()" );
+ equals( j[2].nodeType, 8, "Check node,textnode,comment with text()" );
+}
+
+test("text(String)", function() {
+ testText(bareObj)
+});
+
+test("text(Function)", function() {
+ testText(functionReturningObj);
+});
+
+test("text(Function) with incoming value", function() {
+ expect(2);
+
+ var old = "This link has class=\"blog\": Simon Willison's Weblog";
+
+ jQuery('#sap').text(function(i, val) {
+ equals( val, old, "Make sure the incoming value is correct." );
+ return "foobar";
+ });
+
+ equals( jQuery("#sap").text(), "foobar", 'Check for merged text of more then one element.' );
+
+ reset();
+});
+
var testWrap = function(val) {
expect(18);
var defaultText = 'Try them out:'
@@ -105,7 +141,7 @@ test("wrapAll(String|Element)", function() {
// TODO: Figure out why each(wrapAll) is not equivalent to wrapAll
// test("wrapAll(Function)", function() {
-// testWrapAll(functionReturningObj);
+// testWrapAll(functionReturningObj);
// })
var testWrapInner = function(val) {
@@ -130,10 +166,10 @@ test("wrapInner(String|Element)", function() {
// TODO: wrapInner uses wrapAll -- get wrapAll working with Function
// test("wrapInner(Function)", function() {
-// testWrapInner(functionReturningObj)
+// testWrapInner(functionReturningObj)
// })
-var testUnwrap = function() {
+test("unwrap()", function() {
expect(9);
jQuery("body").append(' ');
@@ -158,10 +194,6 @@ var testUnwrap = function() {
same( jQuery('body > span.unwrap').get(), abcdef, 'body contains 6 .unwrap child spans' );
jQuery('body > span.unwrap').remove();
-}
-
-test("unwrap()", function() {
- testUnwrap();
});
var testAppend = function(valueObj) {
@@ -251,7 +283,7 @@ var testAppend = function(valueObj) {
}
test("append(String|Element|Array<Element>|jQuery)", function() {
- testAppend(bareObj);
+ testAppend(bareObj);
});
test("append(Function)", function() {
@@ -618,65 +650,6 @@ test("clone() on XML nodes", function() {
});
}
-test("val()", function() {
- expect(9);
-
- document.getElementById('text1').value = "bla";
- equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
-
- reset();
-
- equals( jQuery("#text1").val(), "Test", "Check for value of input element" );
- // ticket #1714 this caused a JS error in IE
- equals( jQuery("#first").val(), "", "Check a paragraph element to see if it has a value" );
- ok( jQuery([]).val() === undefined, "Check an empty jQuery object will return undefined from val" );
-
- equals( jQuery('#select2').val(), '3', 'Call val() on a single="single" select' );
-
- same( jQuery('#select3').val(), ['1', '2'], 'Call val() on a multiple="multiple" select' );
-
- equals( jQuery('#option3c').val(), '2', 'Call val() on a option element with value' );
-
- equals( jQuery('#option3a').val(), '', 'Call val() on a option element with empty value' );
-
- equals( jQuery('#option3e').val(), 'no value', 'Call val() on a option element with no value attribute' );
-
-});
-
-var testVal = function(valueObj) {
- expect(6);
-
- jQuery("#text1").val(valueObj( 'test' ));
- equals( document.getElementById('text1').value, "test", "Check for modified (via val(String)) value of input element" );
-
- jQuery("#text1").val(valueObj( 67 ));
- equals( document.getElementById('text1').value, "67", "Check for modified (via val(Number)) value of input element" );
-
- jQuery("#select1").val(valueObj( "3" ));
- equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" );
-
- jQuery("#select1").val(valueObj( 2 ));
- equals( jQuery("#select1").val(), "2", "Check for modified (via val(Number)) value of select element" );
-
- jQuery("#select1").append("");
- jQuery("#select1").val(valueObj( 4 ));
- equals( jQuery("#select1").val(), "4", "Should be possible to set the val() to a newly created option" );
-
- // using contents will get comments regular, text, and comment nodes
- var j = jQuery("#nonnodes").contents();
- j.val(valueObj( "asdf" ));
- equals( j.val(), "asdf", "Check node,textnode,comment with val()" );
- j.removeAttr("value");
-}
-
-test("val(String/Number)", function() {
- testVal(bareObj);
-});
-
-test("val(Function)", function() {
- testVal(functionReturningObj);
-})
-
var testHtml = function(valueObj) {
expect(22);
@@ -739,28 +712,8 @@ test("html(String)", function() {
test("html(Function)", function() {
testHtml(functionReturningObj);
-})
-
-var testText = function(valueObj) {
- expect(4);
- equals( jQuery("#foo").text("Hello cruel world!
")[0].innerHTML.replace(/>/g, ">"), "<div><b>Hello</b> cruel world!</div>", "Check escaped text" );
-
- // using contents will get comments regular, text, and comment nodes
- var j = jQuery("#nonnodes").contents();
- j.text("hi!");
- equals( jQuery(j[0]).text(), "hi!", "Check node,textnode,comment with text()" );
- equals( j[1].nodeValue, " there ", "Check node,textnode,comment with text()" );
- equals( j[2].nodeType, 8, "Check node,textnode,comment with text()" );
-}
-
-test("text(String)", function() {
- testText(bareObj)
});
-test("text(Function)", function() {
- testText(functionReturningObj);
-})
-
var testRemove = function(method) {
expect(9);