X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=c5ff6f6c5170d4d1dc3a2b0a34527101ee256b4f;hb=f89f5eb61f6b19cc2204ddbe2abc797f7ee14cfd;hp=aec334e52b053d2639330d7974b311d7b6e06948;hpb=28a1f022233585cf40ae727d7d8334665a495e61;p=jquery.git diff --git a/test/unit/core.js b/test/unit/core.js index aec334e..c5ff6f6 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'); @@ -840,9 +840,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" ); @@ -929,9 +927,7 @@ 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" ); @@ -958,9 +954,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" ); }); @@ -1011,9 +1005,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 +1027,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 +1049,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" ); }); @@ -1156,7 +1144,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 +1164,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("