summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Małecki <maciej.malecki@notimplemented.org>2012-02-21 02:28:57 +0100
committerMaciej Małecki <maciej.malecki@notimplemented.org>2012-02-21 02:43:32 +0100
commitc82e885c3f4cd0bce2f02b0d6a46774fa78c89fc (patch)
treede1847a5e6c5ee4cd77c605c265c76af1521786d
parent68974db49ee6714e0995e3e21d9523919ad0a34b (diff)
downloadasync-c82e885c3f4cd0bce2f02b0d6a46774fa78c89fc.tar.gz
Allow `forEach*` functions to be called with no callback
Tests included.
-rw-r--r--lib/async.js3
-rw-r--r--test/test-async.js18
2 files changed, 21 insertions, 0 deletions
diff --git a/lib/async.js b/lib/async.js
index 0bcd80d..a607e6c 100644
--- a/lib/async.js
+++ b/lib/async.js
@@ -89,6 +89,7 @@
}
async.forEach = function (arr, iterator, callback) {
+ callback = callback || function () {};
if (!arr.length) {
return callback();
}
@@ -110,6 +111,7 @@
};
async.forEachSeries = function (arr, iterator, callback) {
+ callback = callback || function () {};
if (!arr.length) {
return callback();
}
@@ -135,6 +137,7 @@
};
async.forEachLimit = function (arr, limit, iterator, callback) {
+ callback = callback || function () {};
if (!arr.length || limit <= 0) {
return callback();
}
diff --git a/test/test-async.js b/test/test-async.js
index e51cea0..ff4b749 100644
--- a/test/test-async.js
+++ b/test/test-async.js
@@ -37,6 +37,12 @@ function detectIterator(call_order, x, callback) {
}, x*25);
}
+function forEachNoCallbackIterator(test, x, callback) {
+ test.equal(x, 1);
+ callback();
+ test.done();
+}
+
function getFunctionsObject(call_order) {
return {
one: function(callback){
@@ -514,6 +520,10 @@ exports['forEach error'] = function(test){
setTimeout(test.done, 50);
};
+exports['forEach no callback'] = function(test){
+ async.forEach([1], forEachNoCallbackIterator.bind(this, test));
+};
+
exports['forEachSeries'] = function(test){
var args = [];
async.forEachSeries([1,3,2], forEachIterator.bind(this, args), function(err){
@@ -546,6 +556,10 @@ exports['forEachSeries error'] = function(test){
setTimeout(test.done, 50);
};
+exports['forEachSeries no callback'] = function(test){
+ async.forEachSeries([1], forEachNoCallbackIterator.bind(this, test));
+};
+
exports['forEachLimit'] = function(test){
var args = [];
var arr = [0,1,2,3,4,5,6,7,8,9];
@@ -617,6 +631,10 @@ exports['forEachLimit error'] = function(test){
setTimeout(test.done, 25);
};
+exports['forEachLimit no callback'] = function(test){
+ async.forEachLimit([1], 1, forEachNoCallbackIterator.bind(this, test));
+};
+
exports['map'] = function(test){
var call_order = [];
async.map([1,3,2], mapIterator.bind(this, call_order), function(err, results){