diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/css.js | 16 | ||||
| -rw-r--r-- | test/unit/effects.js | 3 |
2 files changed, 18 insertions, 1 deletions
diff --git a/test/unit/css.js b/test/unit/css.js index 4533e4692..79cce0549 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -271,6 +271,22 @@ QUnit.test( "css() non-px relative values (gh-1711)", function( assert ) { add( "lineHeight", 50, "%" ); } ); +QUnit.test( "css() mismatched relative values with bounded styles (gh-2144)", function( assert ) { + assert.expect( 1 ); + + var right, + $container = jQuery( "<div/>" ) + .css( { position: "absolute", width: "400px", fontSize: "4px" } ) + .appendTo( "#qunit-fixture" ), + $el = jQuery( "<div/>" ) + .css( { position: "absolute", left: "50%", right: "50%" } ) + .appendTo( $container ); + + $el.css( "right", "-=25em" ); + assert.equal( Math.round( parseFloat( $el.css( "right" ) ) ), 100, + "Constraints do not interfere with unit conversion" ); +} ); + QUnit.test( "css(String, Object)", function( assert ) { assert.expect( 19 ); var j, div, display, ret, success; diff --git a/test/unit/effects.js b/test/unit/effects.js index 54c7f7995..ec1669f54 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -1807,7 +1807,8 @@ QUnit.test( "animate does not change start value for non-px animation (#7109)", } } ).queue( function( next ) { var ratio = computed[ 0 ] / actual; - assert.ok( ratio > 0.9 && ratio < 1.1, "Starting width was close enough" ); + assert.ok( ratio > 0.9 && ratio < 1.1, + "Starting width was close enough (" + computed[ 0 ] + " approximates " + actual + ")" ); next(); parent.remove(); } ); |