Merge pull request #7485 from jayther/promisequeuesharefix

Narciso Jaramillo · Narciso Jaramillo · commit 336fe54cf954 · 2014-04-14T20:15:40.000-04:00
Fixed bug with PromiseQueue instances sharing same queue.
diff --git a/src/utils/Async.js b/src/utils/Async.js
@@ -424,6 +424,7 @@ define(function (require, exports, module) {
      * has finished.
      */
     function PromiseQueue() {
+        this._queue = [];
     }
     
     /**
@@ -432,7 +433,7 @@ define(function (require, exports, module) {
      * The queue of operations to execute sequentially. Note that even if this array is empty, there might
      * still be an operation we need to wait on; that operation's promise is stored in _curPromise.
      */
-    PromiseQueue.prototype._queue = [];
+    PromiseQueue.prototype._queue = null;
     
     /**
      * @private
diff --git a/test/spec/Async-test.js b/test/spec/Async-test.js
@@ -499,6 +499,49 @@ define(function (require, exports, module) {
                 expect(queue._queue.length).toBe(0);
                 expect(queue._curPromise).toBe(null);
             });
+            
+            it("should be able to run two queues simultaneously without clashing", function () {
+                var queue2 = new PromiseQueue(),
+                    q1FnInfo1 = makeFn("one"),
+                    q1FnInfo2 = makeFn("two"),
+                    q2FnInfo3 = makeFn("three"),
+                    q2FnInfo4 = makeFn("four");
+                
+                //queue one
+                queue.add(q1FnInfo1.fn);
+                queue.add(q1FnInfo2.fn);
+                expect(calledFns.one).toBe(true);
+                expect(calledFns.two).toBeUndefined();
+                //queue one should have one in _queue,
+                //queue two should have zero in _queue
+                expect(queue._queue.length).toBe(1);
+                expect(queue2._queue.length).toBe(0);
+                
+                //queue two
+                queue2.add(q2FnInfo3.fn);
+                queue2.add(q2FnInfo4.fn);
+                expect(calledFns.three).toBe(true);
+                expect(calledFns.four).toBeUndefined();
+                //queue one and two should have one in _queue
+                expect(queue._queue.length).toBe(1);
+                expect(queue2._queue.length).toBe(1);
+                
+                q1FnInfo1.deferred.resolve();
+                expect(calledFns.two).toBe(true);
+                expect(queue._queue.length).toBe(0);
+                
+                q1FnInfo2.deferred.resolve();
+                expect(queue._queue.length).toBe(0);
+                expect(queue._curPromise).toBe(null);
+                
+                q2FnInfo3.deferred.resolve();
+                expect(calledFns.three).toBe(true);
+                expect(queue2._queue.length).toBe(0);
+                
+                q2FnInfo4.deferred.resolve();
+                expect(queue2._queue.length).toBe(0);
+                expect(queue2._curPromise).toBe(null);
+            });
         });
     });
 });
