Merge pull request #7407 from jayther/promisequeuerejectfix

Narciso Jaramillo · Narciso Jaramillo · commit 6cdd1deffd00 · 2014-04-04T03:03:11.000-04:00
Fixed bug in utils/Async.PromiseQueue where a rejected promise keeps the...
diff --git a/src/utils/Async.js b/src/utils/Async.js
@@ -487,7 +487,7 @@ define(function (require, exports, module) {
         if (this._queue.length) {
             var op = this._queue.shift();
             this._curPromise = op();
-            this._curPromise.done(function () {
+            this._curPromise.always(function () {
                 self._curPromise = null;
                 self._doNext();
             });
diff --git a/test/spec/Async-test.js b/test/spec/Async-test.js
@@ -314,12 +314,14 @@ define(function (require, exports, module) {
                 calledFns = {};
             });
             
-            function makeFn(id, resolveNow) {
+            function makeFn(id, resolveNow, rejectNow) {
                 var result = new $.Deferred();
                 return {
                     fn: function () {
                         calledFns[id] = true;
-                        if (resolveNow) {
+                        if (rejectNow) {
+                            result.reject();
+                        } else if (resolveNow) {
                             result.resolve();
                         }
                         return result.promise();
@@ -440,6 +442,63 @@ define(function (require, exports, module) {
                 expect(queue._queue.length).toBe(0);
                 expect(queue._curPromise).toBe(null);
             });
+            
+            it("should execute the second function if the first function is rejected", function () {
+                var fnInfo1 = makeFn("one"),
+                    fnInfo2 = makeFn("two");
+                
+                queue.add(fnInfo1.fn);
+                expect(calledFns.one).toBe(true);
+                
+                queue.add(fnInfo2.fn);
+                expect(calledFns.two).toBeUndefined();
+                
+                fnInfo1.deferred.reject();
+                expect(calledFns.two).toBe(true);
+                
+                fnInfo2.deferred.resolve();
+                expect(queue._queue.length).toBe(0);
+                expect(queue._curPromise).toBe(null);
+            });
+            
+            it("should execute the third function after first and second functions are rejected", function () {
+                var fnInfo1 = makeFn("one"),
+                    fnInfo2 = makeFn("two"),
+                    fnInfo3 = makeFn("three");
+                
+                queue.add(fnInfo1.fn);
+                expect(calledFns.one).toBe(true);
+                
+                queue.add(fnInfo2.fn);
+                queue.add(fnInfo3.fn);
+                expect(calledFns.two).toBeUndefined();
+                expect(calledFns.three).toBeUndefined();
+                
+                fnInfo1.deferred.reject();
+                expect(calledFns.two).toBe(true);
+                
+                fnInfo2.deferred.reject();
+                expect(calledFns.three).toBe(true);
+                
+                fnInfo3.deferred.resolve();
+                expect(queue._queue.length).toBe(0);
+                expect(queue._curPromise).toBe(null);
+            });
+            
+            it("should execute the second function after the already-rejected first function is added to the queue", function () {
+                var fnInfo1 = makeFn("one", false, true),
+                    fnInfo2 = makeFn("two");
+                
+                queue.add(fnInfo1.fn);
+                expect(calledFns.one).toBe(true);
+                
+                queue.add(fnInfo2.fn);
+                expect(calledFns.two).toBe(true);
+                
+                fnInfo2.deferred.resolve();
+                expect(queue._queue.length).toBe(0);
+                expect(queue._curPromise).toBe(null);
+            });
         });
     });
 });
