diff options
author | John Resig <jeresig@gmail.com> | 2010-09-17 14:32:43 -0400 |
---|---|---|
committer | John Resig <jeresig@gmail.com> | 2010-09-17 14:32:43 -0400 |
commit | 51d258074cf4cbb6e8c57361c421494220a65cb1 (patch) | |
tree | be2d6c7a72b03b6e7a89180585fa86c7232445a0 /test/unit/css.js | |
parent | fc5b69fc706a6025e5084d4b86adb3b97840c84f (diff) | |
parent | 192bab8ed6e8ad2b4c5de0c4660c80b6ecddfd33 (diff) | |
download | jquery-51d258074cf4cbb6e8c57361c421494220a65cb1.tar.gz jquery-51d258074cf4cbb6e8c57361c421494220a65cb1.zip |
Merge branch 'csshooks'
Diffstat (limited to 'test/unit/css.js')
-rw-r--r-- | test/unit/css.js | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/test/unit/css.js b/test/unit/css.js index 5f8a74ae4..99bab1fe5 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -1,7 +1,7 @@ module("css"); test("css(String|Hash)", function() { - expect(30); + expect(28); equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"'); @@ -19,10 +19,6 @@ test("css(String|Hash)", function() { equals( parseFloat(jQuery('#nothiddendiv').css('width')), width, 'Test negative width ignored') equals( parseFloat(jQuery('#nothiddendiv').css('height')), height, 'Test negative height ignored') - jQuery('#floatTest').css({styleFloat: 'right'}); - equals( jQuery('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right'); - jQuery('#floatTest').css({cssFloat: 'left'}); - equals( jQuery('#floatTest').css('cssFloat'), 'left', 'Modified CSS float using "cssFloat": Assert float is left'); jQuery('#floatTest').css({'float': 'right'}); equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right'); jQuery('#floatTest').css({'font-size': '30px'}); @@ -65,7 +61,7 @@ test("css(String|Hash)", function() { }); test("css(String, Object)", function() { - expect(21); + expect(19); 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'); @@ -75,10 +71,6 @@ test("css(String, Object)", function() { jQuery("#nothiddendiv").css("top", "-1em"); ok( jQuery("#nothiddendiv").css("top"), -16, "Check negative number in EMs." ); - jQuery('#floatTest').css('styleFloat', 'left'); - equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left'); - jQuery('#floatTest').css('cssFloat', 'right'); - equals( jQuery('#floatTest').css('cssFloat'), 'right', 'Modified CSS float using "cssFloat": Assert float is right'); jQuery('#floatTest').css('float', 'left'); equals( jQuery('#floatTest').css('float'), 'left', 'Modified CSS float using "float": Assert float is left'); jQuery('#floatTest').css('font-size', '20px'); |