allow queue.push without a callback

lmorchard · Nov 17, 2010 · 960b9bf · 960b9bf
1 parent b4d3709
commit 960b9bf
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/dist/async.min.js b/dist/async.min.js
diff --git a/lib/async.js b/lib/async.js
@@ -559,7 +559,9 @@
                     workers += 1;
                     worker(task.data, function () {
                         workers -= 1;
-                        task.callback.apply(task, arguments);
+                        if (task.callback) {
+                            task.callback.apply(task, arguments);
+                        }
                         q.process();
                     });
                 }

diff --git a/test/test-async.js b/test/test-async.js
@@ -1160,3 +1160,34 @@ exports['queue changing concurrency'] = function (test) {
         test.done();
     }, 100);
 };
+
+exports['queue push without callback'] = function (test) {
+    var call_order = [],
+        delays = [20,10,30,10];
+
+    // worker1: --1-4
+    // worker2: -2---3
+    // order of completion: 2,1,4,3
+
+    var q = async.queue(function (task, callback) {
+        setTimeout(function () {
+            call_order.push('process ' + task);
+            callback('error', 'arg');
+        }, delays.splice(0,1)[0]);
+    }, 2);
+
+    q.push(1);
+    q.push(2);
+    q.push(3);
+    q.push(4);
+
+    setTimeout(function () {
+        test.same(call_order, [
+            'process 2',
+            'process 1',
+            'process 4',
+            'process 3'
+        ]);
+        test.done();
+    }, 60);
+};