(new) basic teardown support

bnoguchi · Aug 25, 2010 · c3ad80d · c3ad80d
1 parent 7cdf94f
commit c3ad80d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/lib/vows/suite.js b/lib/vows/suite.js
@@ -66,7 +66,7 @@ this.Suite.prototype = new(function () {
             var match = false;
 
             var keys = Object.keys(tests).filter(function (k) {
-                return k !== 'topic';
+                return k !== 'topic' && k !== 'teardown';
             });
 
             for (var i = 0, key; i < keys.length; i++) {
@@ -163,7 +163,8 @@ this.Suite.prototype = new(function () {
 
             // Now run the tests, or sub-contexts
             Object.keys(ctx.tests).filter(function (k) {
-                return ctx.tests[k] && k !== 'topic' && !ctx.tests[k]._skip;
+                return ctx.tests[k] && k !== 'topic'    &&
+                                       k !== 'teardown' && !ctx.tests[k]._skip;
             }).forEach(function (item) {
                 // Create a new evaluation context,
                 // inheriting from the parent one.
@@ -201,6 +202,12 @@ this.Suite.prototype = new(function () {
                     }
                 }
             });
+            // Teardown
+            topic.addListener("success", function () {
+                if (ctx.tests.teardown) {
+                    ctx.tests.teardown.apply(ctx.env, ctx.topics);
+                }
+            });
             if (! ctx.tests._skip) {
                 batch.remaining --;
             }

diff --git a/test/vows-test.js b/test/vows-test.js
@@ -301,3 +301,23 @@ vows.describe("Vows with multiple batches added as optional parameters", {
     }
 }).export(module);
 
+vows.describe("Vows with teardowns").addBatch({
+    "A context": {
+        topic: function () {
+            return { flag: true };
+        },
+        "And a vow": function (topic) {
+            assert.isTrue(topic.flag);
+        },
+        "And another vow": function (topic) {
+            assert.isTrue(topic.flag);
+        },
+        "And a final vow": function (topic) {
+            assert.isTrue(topic.flag);
+        },
+        teardown: function (topic) {
+            topic.flag = false;
+        }
+    }
+}).export(module);
+