diff options
author | Caolan McMahon <caolan@caolanmcmahon.com> | 2013-01-31 13:52:55 +0000 |
---|---|---|
committer | Caolan McMahon <caolan@caolanmcmahon.com> | 2013-01-31 13:52:55 +0000 |
commit | 089d94b3ac96b3a1a1aab42672f793c1b2dbfe46 (patch) | |
tree | d2045d081f4282be883ef6ba3c8fe0f1c952d640 /test | |
parent | bee45ddd8655de34befb7d5ae3bc665b42666c25 (diff) | |
parent | 7d1827063ea28bb06b4ac492323c1cdd7b9e5df0 (diff) | |
download | async-089d94b3ac96b3a1a1aab42672f793c1b2dbfe46.tar.gz |
Merge remote branch 'dpatti/auto-fix'
Conflicts:
dist/async.min.js
Diffstat (limited to 'test')
-rw-r--r-- | test/test-async.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/test-async.js b/test/test-async.js index 69390fa..6cc06e2 100644 --- a/test/test-async.js +++ b/test/test-async.js @@ -91,12 +91,18 @@ exports['auto'] = function(test){ callback(); }], task5: ['task2', function(callback){ - callOrder.push('task5'); + setTimeout(function(){ + callOrder.push('task5'); + callback(); + }, 0); + }], + task6: ['task2', function(callback){ + callOrder.push('task6'); callback(); }] }, function(err){ - test.same(callOrder, ['task2','task5','task3','task1','task4']); + test.same(callOrder, ['task2','task6','task3','task5','task1','task4']); test.done(); }); }; |