From f71e32d4b46f3be293304d40ed6dc85cf30d6a7b Mon Sep 17 00:00:00 2001 From: Thomas Tortorini Date: Mon, 11 May 2015 01:39:26 +0200 Subject: [PATCH] Effects: Finish should call progress (cherry-picked from 3dd3d1357d027a487559516fcdd9064cc792edab) Fixes gh-2283 Closes gh-2292 --- Gruntfile.js | 5 ++ external/qunit-assert-step/MIT-LICENSE.txt | 21 ++++++++ .../qunit-assert-step/qunit-assert-step.js | 26 ++++++++++ package.json | 1 + src/effects.js | 1 + test/index.html | 1 + test/unit/effects.js | 49 +++++++++++++++++-- 7 files changed, 100 insertions(+), 4 deletions(-) create mode 100644 external/qunit-assert-step/MIT-LICENSE.txt create mode 100644 external/qunit-assert-step/qunit-assert-step.js diff --git a/Gruntfile.js b/Gruntfile.js index d5611904a..080332ece 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -75,6 +75,11 @@ module.exports = function( grunt ) { "qunit/qunit.css": "qunitjs/qunit/qunit.css", "qunit/LICENSE.txt": "qunitjs/LICENSE.txt", + "qunit-assert-step/qunit-assert-step.js": + "qunit-assert-step/qunit-assert-step.js", + "qunit-assert-step/MIT-LICENSE.txt": + "qunit-assert-step/MIT-LICENSE.txt", + "requirejs/require.js": "requirejs/require.js", "sinon/fake_timers.js": "sinon/lib/sinon/util/fake_timers.js", diff --git a/external/qunit-assert-step/MIT-LICENSE.txt b/external/qunit-assert-step/MIT-LICENSE.txt new file mode 100644 index 000000000..aed5dc97e --- /dev/null +++ b/external/qunit-assert-step/MIT-LICENSE.txt @@ -0,0 +1,21 @@ +Copyright jQuery Foundation and other contributors +http://jquery.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/external/qunit-assert-step/qunit-assert-step.js b/external/qunit-assert-step/qunit-assert-step.js new file mode 100644 index 000000000..90bca18cf --- /dev/null +++ b/external/qunit-assert-step/qunit-assert-step.js @@ -0,0 +1,26 @@ +QUnit.extend( QUnit.assert, { + + /** + * Check the sequence/order + * + * @example test('Example unit test', function(assert) { assert.step(1); setTimeout(function () { assert.step(3); start(); }, 100); assert.step(2); stop(); }); + * @param Number expected The excepted step within the test() + * @param String message (optional) + */ + step: function (expected, message) { + // increment internal step counter. + QUnit.config.current.step++; + if (typeof message === "undefined") { + message = "step " + expected; + } + var actual = QUnit.config.current.step; + QUnit.push(QUnit.equiv(actual, expected), actual, expected, message); + } +}); + +/** + * Reset the step counter for every test() + */ +QUnit.testStart(function () { + QUnit.config.current.step = 0; +}); diff --git a/package.json b/package.json index bc309d035..c681a2c2c 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "promises-aplus-tests": "2.1.0", "q": "1.1.2", "qunitjs": "1.17.1", + "qunit-assert-step": "1.0.3", "requirejs": "2.1.17", "sinon": "1.12.2", "sizzle": "2.2.0", diff --git a/src/effects.js b/src/effects.js index 64ec4ae15..b4cd34532 100644 --- a/src/effects.js +++ b/src/effects.js @@ -346,6 +346,7 @@ function Animation( elem, properties, options ) { // resolve when we played the last frame // otherwise, reject if ( gotoEnd ) { + deferred.notifyWith( elem, [ animation, 1, 0 ] ); deferred.resolveWith( elem, [ animation, gotoEnd ] ); } else { deferred.rejectWith( elem, [ animation, gotoEnd ] ); diff --git a/test/index.html b/test/index.html index 70940568d..df1bdaa5b 100644 --- a/test/index.html +++ b/test/index.html @@ -13,6 +13,7 @@ + diff --git a/test/unit/effects.js b/test/unit/effects.js index 31822274c..b31617bb9 100644 --- a/test/unit/effects.js +++ b/test/unit/effects.js @@ -1849,10 +1849,11 @@ QUnit.test( "non-px animation handles non-numeric start (#11971)", function( ass this.clock.tick( 10 ); } ); -QUnit.test( "Animation callbacks (#11797)", function( assert ) { - assert.expect( 15 ); +QUnit.test("Animation callbacks (#11797)", function( assert ) { + assert.expect( 16 ); - var targets = jQuery( "#foo" ).children(), + var prog = 0, + targets = jQuery( "#foo" ).children(), done = false, expectedProgress = 0; @@ -1862,7 +1863,8 @@ QUnit.test( "Animation callbacks (#11797)", function( assert ) { assert.ok( true, "empty: start" ); }, progress: function( anim, percent ) { - assert.equal( percent, 0, "empty: progress 0" ); + assert.equal( percent, prog, "empty: progress " + prog ); + prog = 1; }, done: function() { assert.ok( true, "empty: done" ); @@ -1934,6 +1936,45 @@ QUnit.test( "Animation callbacks (#11797)", function( assert ) { this.clock.tick( 10 ); } ); +QUnit.test( "Animation callbacks in order (#2292)", function( assert ) { + assert.expect( 9 ); + + var step = 0, + dur = 50; + + // assert? -> github.com/JamesMGreene/qunit-assert-step + jQuery( "#foo" ).animate( { + width: "5px" + }, { + duration: dur, + start: function() { + assert.step( 1 ); + }, + progress: function( anim, p, ms ) { + if ( !( step++ ) ) { + assert.step( 2 ); + assert.strictEqual( p, 0, "first progress callback: progress ratio" ); + assert.strictEqual( ms, dur, "first progress callback: remaining ms" ); + } else { + assert.step( 3 ); + assert.strictEqual( p, 1, "last progress callback: progress ratio" ); + assert.strictEqual( ms, 0, "last progress callback: remaining ms" ); + } + }, + done: function() { + assert.step( 4 ); + }, + fail: function() { + assert.ok( false, "Animation failed" ); + }, + always: function() { + assert.step( 5 ); + } + }).finish(); + + this.clock.tick( dur + 10 ); +} ); + QUnit.test( "Animate properly sets overflow hidden when animating width/height (#12117)", function( assert ) { assert.expect( 8 ); -- 2.39.5