X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=a4e82eb6e0ec2e3f695bc2eb07e2ea21af087fee;hb=f1f5cd9f6a80b0de18cc0402f28b440f48b95f83;hp=aec334e52b053d2639330d7974b311d7b6e06948;hpb=28a1f022233585cf40ae727d7d8334665a495e61;p=jquery.git diff --git a/test/unit/core.js b/test/unit/core.js index aec334e..a4e82eb 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -615,11 +615,11 @@ test("css(String|Hash)", function() { equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"'); - ok( jQuery('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible'); - jQuery('#foo').css({display: 'none'}); - ok( !jQuery('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden'); - jQuery('#foo').css({display: 'block'}); - ok( jQuery('#foo').is(':visible'), 'Modified CSS display: Assert element is visible'); + ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible'); + jQuery('#nothiddendiv').css({display: 'none'}); + ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden'); + jQuery('#nothiddendiv').css({display: 'block'}); + ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible'); jQuery('#floatTest').css({styleFloat: 'right'}); equals( jQuery('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right'); @@ -642,11 +642,11 @@ test("css(String|Hash)", function() { test("css(String, Object)", function() { expect(21); - ok( jQuery('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible'); - jQuery('#foo').css('display', 'none'); - ok( !jQuery('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden'); - jQuery('#foo').css('display', 'block'); - ok( jQuery('#foo').is(':visible'), 'Modified CSS display: Assert element is visible'); + ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible'); + jQuery('#nothiddendiv').css("display", 'none'); + ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden'); + jQuery('#nothiddendiv').css("display", 'block'); + ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible'); jQuery('#floatTest').css('styleFloat', 'left'); equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left'); @@ -694,26 +694,27 @@ test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", funct }); test("width()", function() { - expect(8); + expect(6); var $div = jQuery("#nothiddendiv"); $div.width(30); equals($div.width(), 30, "Test set to 30 correctly"); + $div.hide(); + equals($div.width(), 30, "Test hidden div"); + $div.show(); $div.width(-1); // handle negative numbers by ignoring #1599 equals($div.width(), 30, "Test negative width ignored"); $div.css("padding", "20px"); equals($div.width(), 30, "Test padding specified with pixels"); $div.css("border", "2px solid #fff"); equals($div.width(), 30, "Test border specified with pixels"); - $div.css("padding", "2em"); - equals($div.width(), 30, "Test padding specified with ems"); - $div.css("border", "1em solid #fff"); + //$div.css("padding", "2em"); + //equals($div.width(), 30, "Test padding specified with ems"); + //$div.css("border", "1em solid #fff"); //DISABLED - Opera 9.6 fails this test, returns 8 //equals($div.width(), 30, "Test border specified with ems"); - $div.css("padding", "2%"); - equals($div.width(), 30, "Test padding specified with percent"); - $div.hide(); - equals($div.width(), 30, "Test hidden div"); + //$div.css("padding", "2%"); + //equals($div.width(), 30, "Test padding specified with percent"); $div.css({ display: "", border: "", padding: "" }); @@ -723,26 +724,27 @@ test("width()", function() { }); test("height()", function() { - expect(7); + expect(5); var $div = jQuery("#nothiddendiv"); $div.height(30); equals($div.height(), 30, "Test set to 30 correctly"); + $div.hide(); + equals($div.height(), 30, "Test hidden div"); + $div.show(); $div.height(-1); // handle negative numbers by ignoring #1599 equals($div.height(), 30, "Test negative height ignored"); $div.css("padding", "20px"); equals($div.height(), 30, "Test padding specified with pixels"); $div.css("border", "2px solid #fff"); equals($div.height(), 30, "Test border specified with pixels"); - $div.css("padding", "2em"); - equals($div.height(), 30, "Test padding specified with ems"); - $div.css("border", "1em solid #fff"); + //$div.css("padding", "2em"); + //equals($div.height(), 30, "Test padding specified with ems"); + //$div.css("border", "1em solid #fff"); //DISABLED - Opera 9.6 fails this test, returns 8 //equals($div.height(), 30, "Test border specified with ems"); - $div.css("padding", "2%"); - equals($div.height(), 30, "Test padding specified with percent"); - $div.hide(); - equals($div.height(), 30, "Test hidden div"); + //$div.css("padding", "2%"); + //equals($div.height(), 30, "Test padding specified with percent"); $div.css({ display: "", border: "", padding: "", height: "1px" }); }); @@ -840,9 +842,7 @@ test("append(String|Element|Array<Element>|jQuery)", function() { equals( expected, jQuery('#sap').text(), "Check for appending of array of elements" ); reset(); - expected = document.querySelectorAll ? - "This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:" : - "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo"; + expected = "This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:"; jQuery('#sap').append(jQuery("#first, #yahoo")); equals( expected, jQuery('#sap').text(), "Check for appending of jQuery object" ); @@ -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('buga').appendTo('#first'); equals( jQuery("#first").text(), defaultText + 'buga', 'Check if text appending works' ); @@ -929,15 +929,34 @@ test("appendTo(String|Element|Array<Element>|jQuery)", function() { ok( jQuery(document.createElement("script")).appendTo("body").length, "Make sure a disconnected script can be appended." ); reset(); - expected = document.querySelectorAll ? - "This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:" : - "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo"; + expected = "This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:"; jQuery("#first, #yahoo").appendTo('#sap'); equals( expected, jQuery('#sap').text(), "Check for appending of jQuery object" ); reset(); jQuery('#select1').appendTo('#foo'); t( 'Append select', '#foo select', ['select1'] ); + + reset(); + var div = jQuery("
").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("").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<Element>|jQuery)", function() { @@ -958,9 +977,7 @@ test("prepend(String|Element|Array<Element>|jQuery)", function() { equals( expected, jQuery('#sap').text(), "Check for prepending of array of elements" ); reset(); - expected = document.querySelectorAll ? - "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog" : - "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog"; + expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog"; jQuery('#sap').prepend(jQuery("#first, #yahoo")); equals( expected, jQuery('#sap').text(), "Check for prepending of jQuery object" ); }); @@ -979,12 +996,12 @@ test("prependTo(String|Element|Array<Element>|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(); @@ -1011,9 +1028,7 @@ test("before(String|Element|Array<Element>|jQuery)", function() { equals( expected, jQuery('#en').text(), "Insert array of elements before" ); reset(); - expected = document.querySelectorAll ? - "This is a normal link: diveintomarkTry them out:Yahoo" : - "This is a normal link: Try them out:diveintomarkYahoo"; + expected = "This is a normal link: diveintomarkTry them out:Yahoo"; jQuery('#yahoo').before(jQuery("#first, #mark")); equals( expected, jQuery('#en').text(), "Insert jQuery before" ); }); @@ -1035,9 +1050,7 @@ test("insertBefore(String|Element|Array<Element>|jQuery)", function() { equals( expected, jQuery('#en').text(), "Insert array of elements before" ); reset(); - expected = document.querySelectorAll ? - "This is a normal link: diveintomarkTry them out:Yahoo" : - "This is a normal link: Try them out:diveintomarkYahoo"; + expected = "This is a normal link: diveintomarkTry them out:Yahoo"; jQuery("#first, #mark").insertBefore('#yahoo'); equals( expected, jQuery('#en').text(), "Insert jQuery before" ); }); @@ -1059,9 +1072,7 @@ test("after(String|Element|Array<Element>|jQuery)", function() { equals( expected, jQuery('#en').text(), "Insert array of elements after" ); reset(); - expected = document.querySelectorAll ? - "This is a normal link: YahoodiveintomarkTry them out:" : - "This is a normal link: YahooTry them out:diveintomark"; + expected = "This is a normal link: YahoodiveintomarkTry them out:"; jQuery('#yahoo').after(jQuery("#first, #mark")); equals( expected, jQuery('#en').text(), "Insert jQuery after" ); }); @@ -1079,12 +1090,12 @@ test("insertAfter(String|Element|Array<Element>|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" ); }); @@ -1156,7 +1167,7 @@ test("find(String)", function() { }); test("clone()", function() { - expect(20); + expect(28); equals( 'This is a normal link: Yahoo', jQuery('#en').text(), 'Assert text for #en' ); var clone = jQuery('#yahoo').clone(); equals( 'Try them out:Yahoo', jQuery('#first').append(clone).text(), 'Check for clone' ); @@ -1176,6 +1187,31 @@ test("clone()", function() { // using contents will get comments regular, text, and comment nodes var cl = jQuery("#nonnodes").contents().clone(); ok( cl.length >= 2, "Check node,textnode,comment clone works (some browsers delete comments on clone)" ); + + var div = jQuery("Hi
")[0]; @@ -1670,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" ); @@ -1680,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();