summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolan McMahon <caolan@caolanmcmahon.com>2012-02-12 16:49:31 -0800
committerCaolan McMahon <caolan@caolanmcmahon.com>2012-02-12 16:49:31 -0800
commita472964d5cb12f20550dd21673b6ad229d5a2ce8 (patch)
tree877ede6bcb97a606a7e67f702f97ae94445bd856
parentf7fec588ee9d53c22e2009a7e38e386c7d5b7ce4 (diff)
parentc09be737df455b5d797bf0467e2ffcfa90813a61 (diff)
downloadasync-a472964d5cb12f20550dd21673b6ad229d5a2ce8.tar.gz
Merge pull request #91 from zaphod1984/scriptFix
fixed noConflict test
-rw-r--r--test/test-async.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/test-async.js b/test/test-async.js
index d3eeddc..887e17c 100644
--- a/test/test-async.js
+++ b/test/test-async.js
@@ -559,7 +559,7 @@ exports['forEachLimit limit exceeds size'] = function(test){
setTimeout(function(){
args.push(x);
callback();
- }, x*5);
+ }, x*25);
}, function(err){
test.same(args, arr);
test.done();
@@ -573,7 +573,7 @@ exports['forEachLimit limit equal size'] = function(test){
setTimeout(function(){
args.push(x);
callback();
- }, x*5);
+ }, x*25);
}, function(err){
test.same(args, arr);
test.done();
@@ -1072,7 +1072,7 @@ exports['noConflict - node only'] = function(test){
var filename = __dirname + '/../lib/async.js';
fs.readFile(filename, function(err, content){
if(err) return test.done();
- var Script = process.binding('evals').Script;
+ var Script = process.binding('evals').NodeScript;
var s = new Script(content, filename);
var s2 = new Script(