library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

No ticket: improve line-height animation test robustness

Browse Source
This commit is contained in:
Richard Gibson 2013-08-26 16:36:55 -04:00
parent 0f03378bdc
commit 2b6a7b1caf
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
test/unit/effects.js vendored
View File

@ -1446,7 +1446,8 @@ 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 longDuration = 2000,
shortDuration = 500,
animated = jQuery( animated = jQuery(
"<p style='line-height: 100;'>unitless</p>" + "<p style='line-height: 100;'>unitless</p>" +
"<p style='line-height: 5000px;'>px</p>" + "<p style='line-height: 5000px;'>px</p>" +
@ -1455,29 +1456,43 @@ asyncTest("line-height animates correctly (#13855)", 12, function() {
).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();
}),
tolerance = 1.5,
t0 = +(new Date());
animated.animate( { "line-height": "hide" }, longDuration );
setTimeout(function() {
var progress = ( (new Date()) - t0 ) / longDuration;
animated.each(function( i ) {
var label = jQuery.text( this ),
initial = initialHeight[ i ],
height = jQuery( this ).height(),
lower = initial * ( 1 - progress ) / tolerance;
ok( height < initial, "hide " + label + ": upper bound; " +
height + " < " + initial + " @ " + ( progress * 100 ) + "%" );
ok( height > lower, "hide " + label + ": lower bound; " +
height + " > " + lower + " @ " + ( progress * 100 ) + "%" );
}); });
animated.animate( { "line-height": "hide" }, 1500 ); t0 = +(new Date());
animated.stop( true, true ).hide().animate( { "line-height": "show" }, longDuration );
setTimeout(function() { setTimeout(function() {
var progress = ( (new Date()) - t0 ) / longDuration;
animated.each(function( i ) { animated.each(function( i ) {
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 ); upper = initial * progress * tolerance;
ok( height > initial / 2, "hide " + label + ": lower bound; height: " + height + "; intitial/2: " + initial / 2 ); ok( height < upper, "show " + label + ": upper bound; " +
}); height + " < " + upper + " @ " + ( progress * 100 ) + "%" );
animated.stop( true, true ).hide().animate( { "line-height": "show" }, 1500 );
setTimeout(function() {
animated.each(function( i ) {
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 );
}); });
animated.stop( true, true ); animated.stop( true, true );
start(); start();
}, 400 ); }, shortDuration );
}, 400 ); }, shortDuration );
}); });
// Start 1.8 Animation tests // Start 1.8 Animation tests