fix vow context when global

vowsjs · Feb 21, 2011 · 3291d77 · 3291d77
1 parent f700eed
commit 3291d77
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/vows.js b/lib/vows.js
@@ -92,7 +92,7 @@ function addVow(vow) {
         // Run the test, and try to catch `AssertionError`s and other exceptions;
         // increment counters accordingly.
         try {
-            vow.callback.apply(ctx || vow.binding || null, args);
+            vow.callback.apply(ctx === global || !ctx ? vow.binding : ctx, args);
             output('honored');
         } catch (e) {
             if (e.name && e.name.match(/AssertionError/)) {

diff --git a/test/vows-test.js b/test/vows-test.js
@@ -248,7 +248,19 @@ vows.describe("Vows").addBatch({
             topic: function () {
                 this.callback.call({ boo: true }, null, 'hello');
             },
-            "should work the same as returning a value": function (res) {
+            "should give access to the user context": function (res) {
+                assert.isTrue(this.boo);
+            }
+        },
+        "passing this.callback to a function": {
+            topic: function () {
+                this.boo = true;
+                var async = function (callback) {
+                    callback(null);
+                };
+                async(this.callback);
+            },
+            "should give access to the topic context": function (e, t, tt) {
                 assert.isTrue(this.boo);
             }
         },