diff options
Diffstat (limited to 'test/unit/css.js')
| -rw-r--r-- | test/unit/css.js | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/test/unit/css.js b/test/unit/css.js index 5e9e109bb..8f17ce74a 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -120,39 +120,39 @@ test("css() explicit and relative values", function() { var $elem = jQuery("#nothiddendiv"); $elem.css({ width: 1, height: 1, paddingLeft: "1px", opacity: 1 }); - equal( $elem.width(), 1, "Initial css set or width/height works (hash)" ); + equal( $elem.css("width"), "1px", "Initial css set or width/height works (hash)" ); equal( $elem.css("paddingLeft"), "1px", "Initial css set of paddingLeft works (hash)" ); equal( $elem.css("opacity"), "1", "Initial css set of opacity works (hash)" ); $elem.css({ width: "+=9" }); - equal( $elem.width(), 10, "'+=9' on width (hash)" ); + equal( $elem.css("width"), "10px", "'+=9' on width (hash)" ); $elem.css({ width: "-=9" }); - equal( $elem.width(), 1, "'-=9' on width (hash)" ); + equal( $elem.css("width"), "1px", "'-=9' on width (hash)" ); $elem.css({ width: "+=9px" }); - equal( $elem.width(), 10, "'+=9px' on width (hash)" ); + equal( $elem.css("width"), "10px", "'+=9px' on width (hash)" ); $elem.css({ width: "-=9px" }); - equal( $elem.width(), 1, "'-=9px' on width (hash)" ); + equal( $elem.css("width"), "1px", "'-=9px' on width (hash)" ); $elem.css( "width", "+=9" ); - equal( $elem.width(), 10, "'+=9' on width (params)" ); + equal( $elem.css("width"), "10px", "'+=9' on width (params)" ); $elem.css( "width", "-=9" ) ; - equal( $elem.width(), 1, "'-=9' on width (params)" ); + equal( $elem.css("width"), "1px", "'-=9' on width (params)" ); $elem.css( "width", "+=9px" ); - equal( $elem.width(), 10, "'+=9px' on width (params)" ); + equal( $elem.css("width"), "10px", "'+=9px' on width (params)" ); $elem.css( "width", "-=9px" ); - equal( $elem.width(), 1, "'-=9px' on width (params)" ); + equal( $elem.css("width"), "1px", "'-=9px' on width (params)" ); $elem.css( "width", "-=-9px" ); - equal( $elem.width(), 10, "'-=-9px' on width (params)" ); + equal( $elem.css("width"), "10px", "'-=-9px' on width (params)" ); $elem.css( "width", "+=-9px" ); - equal( $elem.width(), 1, "'+=-9px' on width (params)" ); + equal( $elem.css("width"), "1px", "'+=-9px' on width (params)" ); $elem.css({ paddingLeft: "+=4" }); equal( $elem.css("paddingLeft"), "5px", "'+=4' on paddingLeft (hash)" ); @@ -722,13 +722,6 @@ test("Do not append px to 'fill-opacity' #9548", 1, function() { equal( $div.css("fill-opacity"), 1, "Do not append px to 'fill-opacity'"); }); -test("outerWidth(true) and css('margin') returning % instead of px in Webkit, see #10639", function() { - var container = jQuery( "<div/>" ).width(400).appendTo( "#qunit-fixture" ), - el = jQuery( "<div/>" ).css({ width: "50%", marginRight: "50%" }).appendTo( container ); - - equal( el.outerWidth(true), 400, "outerWidth(true) and css('margin') returning % instead of px in Webkit, see #10639" ); -}); - test("css('width') and css('height') should respect box-sizing, see #11004", function() { var el_dis = jQuery("<div style='width:300px;height:300px;margin:2px;padding:2px;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;'>test</div>"), el = el_dis.clone().appendTo("#qunit-fixture"); |