X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=168c17c94b166435cf7ea6833d69691347a5ea56;hb=0252b78201f817f87d10f14c85d0f37e4c50ce22;hp=b0a1c71af2f4067e5823a46db8f5bf33a7198a6c;hpb=bed759c95ca6d796125653b540e8611dc63b38bb;p=jquery.git
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index b0a1c71..168c17c 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);
@@ -714,6 +720,16 @@ test("replaceWith(String|Element|Array<Element>|jQuery)", function() {
test("replaceWith(Function)", function() {
testReplaceWith(functionReturningObj);
+
+ expect(16);
+
+ var y = jQuery("#yahoo")[0];
+
+ jQuery(y).replaceWith(function(){
+ equals( this, y, "Make sure the context is coming in correctly." );
+ });
+
+ reset();
})
test("replaceAll(String|Element|Array<Element>|jQuery)", function() {