diff options
| author | Oleg <markelog@gmail.com> | 2013-08-10 07:47:21 +0400 |
|---|---|---|
| committer | Oleg <markelog@gmail.com> | 2013-08-10 08:00:09 +0400 |
| commit | 4b74fe1a6e77db024ecdaf7f79735bc3d4aadfe9 (patch) | |
| tree | 8fbe2721e0ebda2c002a97bc545da9a549ad7e1a /test/unit | |
| parent | ae630c40ba70b2e3e8f1652c98e641e88c3eb2b6 (diff) | |
| download | jquery-4b74fe1a6e77db024ecdaf7f79735bc3d4aadfe9.tar.gz jquery-4b74fe1a6e77db024ecdaf7f79735bc3d4aadfe9.zip | |
Fix test of #13855 for Opera 12.1 and IE10
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/effects.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js index 113390e6f..82ca6c26c 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -1448,10 +1448,10 @@ test("Do not append px to 'fill-opacity' #9548", 1, function() { asyncTest("line-height animates correctly (#13855)", 12, function() { var animated = jQuery( - "<p style='line-height: 5000;'>unitless</p>" + + "<p style='line-height: 100;'>unitless</p>" + "<p style='line-height: 5000px;'>px</p>" + "<p style='line-height: 5000%;'>percent</p>" + - "<p style='line-height: 5000em;'>em</p>" + "<p style='line-height: 100em;'>em</p>" ).appendTo("#qunit-fixture"), initialHeight = jQuery.map( animated, function( el ) { return jQuery( el ).height(); @@ -1463,8 +1463,8 @@ asyncTest("line-height animates correctly (#13855)", 12, function() { var label = jQuery.text( this ), initial = initialHeight[ i ], height = jQuery( this ).height(); - ok( height < initial, "hide " + label + ": upper bound; height:" + height + "; intitial: " + initial ); - ok( height > initial / 2, "hide " + label + ": lower bound; height:" + height + "; intitial/2: " + initial / 2 ); + ok( height < initial, "hide " + label + ": upper bound; height: " + height + "; intitial: " + initial ); + ok( height > initial / 3, "hide " + label + ": lower bound; height: " + height + "; intitial/3: " + initial ); }); animated.stop( true, true ).hide().animate( { "line-height": "show" }, 1500 ); setTimeout(function() { @@ -1472,7 +1472,7 @@ asyncTest("line-height animates correctly (#13855)", 12, function() { var label = jQuery.text( this ), initial = initialHeight[ i ], height = jQuery( this ).height(); - ok( height < initial / 2, "show " + label + ": upper bound; height:" + height + "; intitial/2: " + initial / 2 ); + ok( height < initial / 2, "show " + label + ": upper bound; height: " + height + "; intitial/2: " + initial / 2 ); }); animated.stop( true, true ); start(); |