Simplified the structure of the .css() and .attr() methods (reducing the number of...

[jquery.git] / test / unit / core.js

diff --git a/test/unit/core.js b/test/unit/core.js
index b2ddca4..a4e82eb 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -909,7 +909,7 @@ test("append(String|Element|Array<Element>|jQuery)", function() {
 });
 
 test("appendTo(String|Element|Array<Element>|jQuery)", function() {
-       expect(7);
+       expect(12);
        var defaultText = 'Try them out:'
        jQuery('<b>buga</b>').appendTo('#first');
        equals( jQuery("#first").text(), defaultText + 'buga', 'Check if text appending works' );
@@ -936,6 +936,27 @@ test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
        reset();
        jQuery('#select1').appendTo('#foo');
        t( 'Append select', '#foo select', ['select1'] );
+
+       reset();
+       var div = jQuery("<div/>").click(function(){
+               ok(true, "Running a cloned click.");
+       });
+       div.appendTo("#main, #moretests");
+
+       jQuery("#main div:last").click();
+       jQuery("#moretests div:last").click();
+
+       reset();
+       var div = jQuery("<div/>").appendTo("#main, #moretests");
+
+       equals( div.length, 2, "appendTo returns the inserted elements" );
+       
+       div.addClass("test");
+
+       ok( jQuery("#main div:last").hasClass("test"), "appendTo element was modified after the insertion" );
+       ok( jQuery("#moretests div:last").hasClass("test"), "appendTo element was modified after the insertion" );
+
+       reset();
 });
 
 test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -975,12 +996,12 @@ test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 
        reset();
        expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
-       jQuery([document.getElementById('yahoo'), document.getElementById('first')]).prependTo('#sap');
+       jQuery([document.getElementById('first'), document.getElementById('yahoo')]).prependTo('#sap');
        equals( expected, jQuery('#sap').text(), "Check for prepending of array of elements" );
 
        reset();
-       expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
-       jQuery("#yahoo, #first").prependTo('#sap');
+       expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog";
+       jQuery("#first, #yahoo").prependTo('#sap');
        equals( expected, jQuery('#sap').text(), "Check for prepending of jQuery object" );
 
        reset();
@@ -1069,12 +1090,12 @@ test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 
        reset();
        expected = "This is a normal link: YahooTry them out:diveintomark";
-       jQuery([document.getElementById('mark'), document.getElementById('first')]).insertAfter('#yahoo');
+       jQuery([document.getElementById('first'), document.getElementById('mark')]).insertAfter('#yahoo');
        equals( expected, jQuery('#en').text(), "Insert array of elements after" );
 
        reset();
-       expected = "This is a normal link: YahooTry them out:diveintomark";
-       jQuery("#mark, #first").insertAfter('#yahoo');
+       expected = "This is a normal link: YahoodiveintomarkTry them out:";
+       jQuery("#first, #mark").insertAfter('#yahoo');
        equals( expected, jQuery('#en').text(), "Insert jQuery after" );
 });
 
@@ -1532,6 +1553,9 @@ test("show()", function() {
        ok( pass, "Show" );
 
        jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');
+
+       var old = jQuery("#show-tests table").show().css("display") !== "table";
+
        var test = {
                "div"      : "block",
                "p"        : "block",
@@ -1539,14 +1563,14 @@ test("show()", function() {
                "code"     : "inline",
                "pre"      : "block",
                "span"     : "inline",
-               "table"    : jQuery.browser.msie ? "block" : "table",
-               "thead"    : jQuery.browser.msie ? "block" : "table-header-group",
-               "tbody"    : jQuery.browser.msie ? "block" : "table-row-group",
-               "tr"       : jQuery.browser.msie ? "block" : "table-row",
-               "th"       : jQuery.browser.msie ? "block" : "table-cell",
-               "td"       : jQuery.browser.msie ? "block" : "table-cell",
+               "table"    : old ? "block" : "table",
+               "thead"    : old ? "block" : "table-header-group",
+               "tbody"    : old ? "block" : "table-row-group",
+               "tr"       : old ? "block" : "table-row",
+               "th"       : old ? "block" : "table-cell",
+               "td"       : old ? "block" : "table-cell",
                "ul"       : "block",
-               "li"       : jQuery.browser.msie ? "block" : "list-item"
+               "li"       : old ? "block" : "list-item"
        };
 
        jQuery.each(test, function(selector, expected) {
@@ -1664,13 +1688,6 @@ test("jQuery.each(Object,Function)", function() {
         equals( total, 3, "Looping over an object, with break" );
 });
 
-test("jQuery.prop", function() {
-       expect(2);
-       var handle = function() { return this.id };
-       equals( jQuery.prop(jQuery("#ap")[0], handle), "ap", "Check with Function argument" );
-       equals( jQuery.prop(jQuery("#ap")[0], "value"), "value", "Check with value argument" );
-});
-
 test("jQuery.className", function() {
        expect(6);
        var x = jQuery("<p>Hi</p>")[0];
@@ -1689,7 +1706,7 @@ test("jQuery.className", function() {
 });
 
 test("remove()", function() {
-       expect(6);
+       expect(7);
        jQuery("#ap").children().remove();
        ok( jQuery("#ap").text().length > 10, "Check text is not removed" );
        equals( jQuery("#ap").children().length, 0, "Check remove" );
@@ -1699,6 +1716,9 @@ test("remove()", function() {
        ok( jQuery("#ap").text().length > 10, "Check text is not removed" );
        equals( jQuery("#ap").children().length, 1, "Check filtered remove" );
 
+       jQuery("#ap").children().remove("a, code");
+       equals( jQuery("#ap").children().length, 0, "Check multi-filtered remove" );
+
        // using contents will get comments regular, text, and comment nodes
        equals( jQuery("#nonnodes").contents().length, 3, "Check node,textnode,comment remove works" );
        jQuery("#nonnodes").contents().remove();