X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=test%2Funit%2Fmanipulation.js;h=168c17c94b166435cf7ea6833d69691347a5ea56;hb=98c7248518f9a2082ccf50240b5ab44bf98d7b5e;hp=7db8d5bae0a2800fad2edbec77e91460ad485988;hpb=f06e0e5575bc8f82d0fcbd5880bb9d8ccf361bfa;p=jquery.git
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 7db8d5b..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);
@@ -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') ));
@@ -696,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() {
@@ -793,7 +827,7 @@ test("clone() on XML nodes", function() {
}
var testHtml = function(valueObj) {
- expect(22);
+ expect(24);
jQuery.scriptorder = 0;
@@ -805,6 +839,11 @@ 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." );
+
reset();
// using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
@@ -972,7 +1011,7 @@ test("empty()", function() {
});
test("jQuery.cleanData", function() {
- expect(10);
+ expect(14);
var type, pos, div, child;
@@ -1002,6 +1041,9 @@ test("jQuery.cleanData", function() {
// Should do nothing
pos = "Inner";
child.trigger("click");
+
+ // Should trigger 2
+ div.remove();
type = "html";
@@ -1018,6 +1060,9 @@ test("jQuery.cleanData", function() {
// Should do nothing
pos = "Inner";
child.trigger("click");
+
+ // Should trigger 2
+ div.remove();
function getDiv() {
var div = jQuery("").click(function(){
@@ -1040,4 +1085,4 @@ test("jQuery.cleanData", function() {
return div;
}
-});
\ No newline at end of file
+});