fix context reporting for dot-matrix

vowsjs · Jun 9, 2010 · c533efa · c533efa
1 parent 3e67750
commit c533efa
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 16 deletions.
diff --git a/bin/vows b/bin/vows
@@ -83,6 +83,8 @@ if (args.length > 0) {
                 options.verbose ? _reporter.print('\n') : _reporter.print(' ');
         }
     };
+    reporter.reset = function () { _reporter.reset && _reporter.reset() };
+
     suites = args.map(function (a) {
         a = path.join(process.cwd(), a.replace(/\.js$/, ''));
         msg('runner', "loading", a);
@@ -257,6 +259,8 @@ function runSuites(suites, callback) {
         total:   0,
         time:    0
     };
+    reporter.reset();
+
     (function run(suites, callback) {
         var suite = suites.shift();
         if (suite) {

diff --git a/lib/vows.js b/lib/vows.js
@@ -110,20 +110,16 @@ function addVow(vow) {
     }
 
     function output(status, exception) {
-        var context;
-
-        if (exception) {
-            if (vow.context && batch.lastContext !== vow.context) {
-                batch.lastContext = context = vow.context;
-                batch.suite.report(['context', context]);
-            }
-            batch.suite.report(['vow', {
-                title: vow.description,
-                context: context,
-                status: status,
-                exception: exception || null
-            }]);
+        if (vow.context && batch.lastContext !== vow.context) {
+            batch.lastContext = vow.context;
+            batch.suite.report(['context', vow.context]);
         }
+        batch.suite.report(['vow', {
+            title: vow.description,
+            context: vow.context,
+            status: status,
+            exception: exception || null
+        }]);
     }
 };
 

diff --git a/lib/vows/reporters/dot-matrix.js b/lib/vows/reporters/dot-matrix.js
@@ -8,9 +8,13 @@ var stylize = console.stylize,
 //
 // Console reporter
 //
-var stream, messages = [];
+var stream, messages = [], lastContext;
 
 this.name = 'dot-matrix';
+this.reset = function () {
+    messages = [];
+    lastContext = null;
+};
 this.report = function (data, s) {
     var event = data[1];
 
@@ -28,7 +32,10 @@ this.report = function (data, s) {
             } else if (event.status === 'pending') {
                 sys.print(stylize('.', 'cyan'));
             } else {
-                event.context && messages.push(event.context);
+                if (lastContext !== event.context) {
+                    lastContext = event.context;
+                    messages.push(event.context);
+                }
                 if (event.status === 'broken') {
                     sys.print(stylize('B', 'yellow'));
                     messages.push(' - '   + stylize(event.title, 'yellow'));

diff --git a/lib/vows/reporters/watch.js b/lib/vows/reporters/watch.js
@@ -7,7 +7,12 @@ var stylize = console.stylize,
 //
 // Console reporter
 //
+var lastContext;
+
 this.name = 'watch';
+this.reset = function () {
+    lastContext = null;
+};
 this.report = function (data) {
     var event = data[1];
 
@@ -16,7 +21,10 @@ this.report = function (data) {
     switch (data[0]) {
         case 'vow':
             if (event.status !== 'honored') {
-                event.context && puts(event.context);
+                if (lastContext !== event.context) {
+                    lastContext = event.context;
+                    puts(event.context);
+                }
                 if (event.status === 'broken') {
                     puts(' - '   + stylize(event.title, 'yellow'));
                     puts('   ~ ' + event.exception);