Assign the right thing to 'delay', and use it consistently

squaremo · squaremo · commit 782c58346c6d · 2014-03-31T18:42:35.000+01:00
diff --git a/lib/sockets.js b/lib/sockets.js
@@ -8,7 +8,7 @@ var Readable = Stream.Readable || require('readable-stream/readable');
 var Writable = Stream.Writable || require('readable-stream/writable');
 var Duplex   = Stream.Duplex   || require('readable-stream/duplex');
 
-var delay = global.setImmediate || nextTick;
+var delay = global.setImmediate || process.nextTick;
 
 // A default value to substitute when we don't get a callback
 function ignore() {}
@@ -113,7 +113,7 @@ function Socket(setup, options) {
 
   function closeAndInvalidate(event, err) {
     this.readable = this.writable = false;
-    setImmediate(this.emit.bind(this, event, err));
+    delay(this.emit.bind(this, event, err));
   }
 
   var close = closeAndInvalidate.bind(this, 'close');
diff --git a/test/tests.js b/test/tests.js
@@ -2,6 +2,7 @@ var assert = require('assert');
 
 var createContext = require('../index').createContext;
 
+var delay = global.setImmediate || process.nextTick;
 
 var PARAMS = process.env['AMQP_PARAMS'];
 if (PARAMS) {
@@ -45,7 +46,7 @@ function testWithContext(test) {
     return function(done) { // mocha looks at the number of arguments
         withContext(function(ctx) {
             var closeAndDone = function(maybeErr) {
-              setImmediate(ctx.close.bind(ctx));
+              delay(ctx.close.bind(ctx));
               done(maybeErr);
             };
             ctx.on('ready', function() { return test(closeAndDone, ctx); });
