aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg <markelog@gmail.com>2013-08-10 07:47:21 +0400
committerOleg <markelog@gmail.com>2013-08-10 07:47:21 +0400
commit5bbfa46aba1e6d2d56923f77b194371791f75061 (patch)
treebab38bfbc1c4aba1f1a0367b016020a79c9f9ff4
parent2bdeb6b14dfdb4b5f0c4adf2c43797921e1526cb (diff)
downloadjquery-5bbfa46aba1e6d2d56923f77b194371791f75061.tar.gz
jquery-5bbfa46aba1e6d2d56923f77b194371791f75061.zip
Fix test of #13855 for Opera 12.1 and IE10
-rw-r--r--test/unit/effects.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 523e19b12..18dac1f3d 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -1414,10 +1414,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();
@@ -1429,8 +1429,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() {
@@ -1438,7 +1438,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();