diff options
| author | Richard Gibson <richard.gibson@gmail.com> | 2013-08-30 12:38:43 -0400 |
|---|---|---|
| committer | Richard Gibson <richard.gibson@gmail.com> | 2013-08-30 12:38:43 -0400 |
| commit | 5cd6868365d74093883290337fa97b95c327d254 (patch) | |
| tree | 090976627b785697883cd72edc098cc0b7af351d /test | |
| parent | 8e6e23925669faea03f83c387a62110d7482e827 (diff) | |
| download | jquery-5cd6868365d74093883290337fa97b95c327d254.tar.gz jquery-5cd6868365d74093883290337fa97b95c327d254.zip | |
Fix #14318: Cherry-pick interrupted animation fix from master ea5c22ec12e6a548b1ec2d7b0dcd9f71bea8d5dd
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/effects.js | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/test/unit/effects.js b/test/unit/effects.js index ea8d93f5a..ac0e8a66d 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -2192,7 +2192,8 @@ asyncTest( ".finish() is applied correctly when multiple elements were animated }); asyncTest( "slideDown() after stop() (#13483)", 2, function() { - var ul = jQuery( "<ul style='height: 100px;display: block'></ul>" ), + var ul = jQuery( "<ul style='height: 100px; display: block;'></ul>" ) + .appendTo("#qunit-fixture"), origHeight = ul.height(); // First test. slideUp() -> stop() in the middle -> slideDown() until the end @@ -2221,24 +2222,28 @@ asyncTest( "slideDown() after stop() (#13483)", 2, function() { }, 500 ); }); -asyncTest( "fadeIn() after stop() (related to #13483)", 2, function() { - var ul = jQuery( "<ul style='height: 100px;display: block; opacity: 1'></ul>" ), +asyncTest( "fadeIn() after stop() (related to #13483)", 5, function() { + var ul = jQuery( "<ul style='height: 100px; display: block;'></ul>" ) + .appendTo("#qunit-fixture").css( "opacity", 1 ), origOpacity = ul.css( "opacity" ); // First test. fadeOut() -> stop() in the middle -> fadeIn() until the end - ul.fadeOut( 1000 ); + ul.fadeOut( 2000 ); setTimeout( function() { ul.stop( true ); + ok( ul.css( "opacity" ) > 0, "fadeOut() interrupted" ); ul.fadeIn( 1, function() { - equal( ul.css( "opacity" ), origOpacity, "fadeIn() after interrupting fadeOut() with stop(). Opacity must be in original value" ); + equal( ul.css( "opacity" ), origOpacity, "fadeIn() restored original opacity after interrupted fadeOut()" ); // Second test. fadeIn() -> stop() in the middle -> fadeIn() until the end ul.fadeOut( 1, function() { - ul.fadeIn( 1000 ); + equal( ul.css( "opacity" ), origOpacity, "fadeOut() completed" ); + ul.fadeIn( 2000 ); setTimeout( function() { ul.stop( true ); + ok( ul.css( "opacity" ) < origOpacity, "fadeIn() interrupted" ); ul.fadeIn( 1, function() { - equal( ul.css("opacity"), origOpacity, "fadeIn() after interrupting fadeIn() with stop(). Opacity must be in original value" ); + equal( ul.css("opacity"), origOpacity, "fadeIn() restored original opacity after interrupted fadeIn()" ); // Cleanup ul.remove(); |