handle this.callback called synchronously

vowsjs · Jun 8, 2010 · 062450c · 062450c
1 parent 311df5f
commit 062450c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/lib/vows/context.js b/lib/vows/context.js
@@ -9,10 +9,19 @@ this.Context = function (vow, ctx, env) {
     this.env.context = this;
     this.env.__defineGetter__('callback', function () {
         that._callback = true;
+
         return function (e, res) {
             var args = Array.prototype.slice.call(arguments, 1);
-            if (e) { that.emitter.emit('error', e) }
-            else   { that.emitter.emit.apply(that.emitter, ['success'].concat(args)) }
+            var emit = function () {
+                if (e) { that.emitter.emit('error', e) }
+                else   { that.emitter.emit.apply(that.emitter, ['success'].concat(args)) }
+            };
+            // If `this.callback` is called synchronously,
+            // the emitter will not have been set yet,
+            // so we defer the emition, that way it'll behave
+            // asynchronously.
+            if (that.emitter) { emit() }
+            else              { process.nextTick(emit) }
         };
     });
     this.name = (ctx.name ? ctx.name + ' ' : '') +

diff --git a/test/vows-test.js b/test/vows-test.js
@@ -235,6 +235,14 @@ vows.describe("Vows").addVows({
                 assert.equal(e, "ERROR");
                 assert.equal(res, undefined);
             }
+        },
+        "using this.callback synchronously": {
+            topic: function () {
+                this.callback(null, 'hello');
+            },
+            "should work the same as returning a value": function (res) {
+                assert.equal(res, 'hello');
+            }
         }
     }
 }).addVows({