From 749d32a290d8d22a662ffc18db2fb035b401564d Mon Sep 17 00:00:00 2001 From: jaubourg Date: Tue, 4 Oct 2011 12:08:46 -0400 Subject: [PATCH] isProgressing becomes isPending. Unit tests added. --- src/deferred.js | 2 +- test/unit/deferred.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/deferred.js b/src/deferred.js index 2ebf3fa59..9e5f5110a 100644 --- a/src/deferred.js +++ b/src/deferred.js @@ -21,7 +21,7 @@ jQuery.extend({ isResolved: doneList.fired, isRejected: failList.fired, - isProgressing: function() { + isPending: function() { return !progressList.locked(); }, diff --git a/test/unit/deferred.js b/test/unit/deferred.js index de74aeccd..f8232f9cc 100644 --- a/test/unit/deferred.js +++ b/test/unit/deferred.js @@ -8,7 +8,7 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) { test("jQuery.Deferred" + withNew, function() { - expect( 14 ); + expect( 20 ); createDeferred().resolve().then( function() { ok( true , "Success on resolve" ); @@ -37,6 +37,7 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) { jQuery.each( "resolve reject".split( " " ), function( _, change ) { createDeferred( function( defer ) { + ok( defer.isPending(), "pending after creation" ); var checked = 0; defer.progress(function( value ) { strictEqual( value, checked, "Progress: right value (" + value + ") received" ); @@ -44,7 +45,9 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) { for( checked = 0; checked < 3 ; checked++ ) { defer.notify( checked ); } + ok( defer.isPending(), "pending after notification" ); defer[ change ](); + ok( !defer.isPending(), "not pending after " + change ); defer.notify(); }); }); -- 2.39.5