Fix test of #13855 for Opera 12.1 and IE10

This commit is contained in:
Oleg 2013-08-10 07:47:21 +04:00
parent ae630c40ba
commit 4b74fe1a6e

10
test/unit/effects.js vendored
View File

@ -1448,10 +1448,10 @@ test("Do not append px to 'fill-opacity' #9548", 1, function() {
asyncTest("line-height animates correctly (#13855)", 12, function() { asyncTest("line-height animates correctly (#13855)", 12, function() {
var var
animated = jQuery( 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: 5000px;'>px</p>" +
"<p style='line-height: 5000%;'>percent</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"), ).appendTo("#qunit-fixture"),
initialHeight = jQuery.map( animated, function( el ) { initialHeight = jQuery.map( animated, function( el ) {
return jQuery( el ).height(); return jQuery( el ).height();
@ -1463,8 +1463,8 @@ asyncTest("line-height animates correctly (#13855)", 12, function() {
var label = jQuery.text( this ), var label = jQuery.text( this ),
initial = initialHeight[ i ], initial = initialHeight[ i ],
height = jQuery( this ).height(); height = jQuery( this ).height();
ok( height < initial, "hide " + label + ": upper bound; height:" + height + "; intitial: " + initial ); 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 / 3, "hide " + label + ": lower bound; height: " + height + "; intitial/3: " + initial );
}); });
animated.stop( true, true ).hide().animate( { "line-height": "show" }, 1500 ); animated.stop( true, true ).hide().animate( { "line-height": "show" }, 1500 );
setTimeout(function() { setTimeout(function() {
@ -1472,7 +1472,7 @@ asyncTest("line-height animates correctly (#13855)", 12, function() {
var label = jQuery.text( this ), var label = jQuery.text( this ),
initial = initialHeight[ i ], initial = initialHeight[ i ],
height = jQuery( this ).height(); 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 ); animated.stop( true, true );
start(); start();