summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCaolan McMahon <caolan@caolanmcmahon.com>2012-02-12 17:21:07 -0800
committerCaolan McMahon <caolan@caolanmcmahon.com>2012-02-12 17:21:07 -0800
commit785349f5cc8d2ba16e66719a7b44cdb575da49f5 (patch)
treeeabd00bf94d3dbd3fbb6dda00ffef75aa6aa9f4e /test
parenta472964d5cb12f20550dd21673b6ad229d5a2ce8 (diff)
parent912d36bbfa58125918a14c945380178a393bdc42 (diff)
downloadasync-785349f5cc8d2ba16e66719a7b44cdb575da49f5.tar.gz
Merge branch 'issue-88' of https://github.com/ixti/async
Conflicts: test/test-async.js
Diffstat (limited to 'test')
-rw-r--r--test/test-async.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/test-async.js b/test/test-async.js
index 887e17c..a020251 100644
--- a/test/test-async.js
+++ b/test/test-async.js
@@ -1072,7 +1072,9 @@ 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').NodeScript;
+
+ // Script -> NodeScript in node v0.6.x
+ var Script = process.binding('evals').Script || process.binding('evals').NodeScript;
var s = new Script(content, filename);
var s2 = new Script(