Skip to content

Commit cf3f4e2

Browse files
author
cloudhead
committed
use suite's reporter for errors
1 parent 833a2a0 commit cf3f4e2

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

bin/vows

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,17 +141,17 @@ if (! options.watch) {
141141
reporter.report = function (data) {
142142
switch (data[0]) {
143143
case 'subject':
144-
_reporter.report(data);
145-
break;
146144
case 'vow':
147145
case 'context':
146+
case 'error':
148147
_reporter.report(data);
149148
break;
150149
case 'end':
151150
(options.verbose || _reporter.name === 'json') && _reporter.report(data);
152151
break;
153152
case 'finish':
154153
options.verbose ? _reporter.print('\n') : _reporter.print(' ');
154+
break;
155155
}
156156
};
157157
reporter.reset = function () { _reporter.reset && _reporter.reset() };

lib/vows.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ process.addListener('exit', function () {
136136

137137
vows.suites.forEach(function (s) {
138138
if ((s.results.total > 0) && (s.results.time === null)) {
139-
vows.reporter.report(['error', { error: "Asynchronous Error", suite: s }]);
139+
s.reporter.report(['error', { error: "Asynchronous Error", suite: s }]);
140140
}
141141
s.batches.forEach(function (b) {
142142
var unFired = [];
@@ -152,12 +152,12 @@ process.addListener('exit', function () {
152152
if (unFired.length > 0) { sys.print('\n') }
153153

154154
unFired.forEach(function (title) {
155-
sys.puts(console.error({
155+
s.reporter.report(['error', {
156156
error: "not fired!",
157157
context: title,
158158
batch: b,
159159
suite: s
160-
}));
160+
}]);
161161
});
162162

163163
if (b.status === 'begin') {

lib/vows/console.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@ this.inspect = function inspect(val) {
8080

8181
this.error = function (obj) {
8282
return '✗ ' + $('Errored ').red + '» '
83-
+ $('' + $(obj.context).italic + ' ∙ ' + obj.error).red;
83+
+ $('' + $(obj.context).italic + ' ∙ ') + $(obj.error).red;
8484
};

lib/vows/reporters/dot-matrix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ this.report = function (data, s) {
5959
puts(console.result(event).join('\n'));
6060
break;
6161
case 'error':
62-
sys.puts('\n* ' + stylize(event.error + ' in ', 'red') + event.suite.subject);
62+
puts(console.error(event));
6363
break;
6464
}
6565
};

lib/vows/reporters/spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ this.report = function (data, s) {
3232
puts(console.result(event).join('\n'));
3333
break;
3434
case 'error':
35-
puts('\n * ' + stylize(event.error, 'red'));
35+
puts(console.error(event));
3636
break;
3737
}
3838
};

lib/vows/reporters/watch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ this.report = function (data) {
3131
}
3232
break;
3333
case 'error':
34-
puts('\n\n * ' + stylize(event.error, 'red'));
34+
puts(console.error(event));
3535
break;
3636
}
3737
};

0 commit comments

Comments
 (0)