Skip to content

Commit cdf1b87

Browse files
committed
chore(plugins): refactor logging from plugins
Make it easier to swap out for a new way of printing results, if desired.
1 parent 5f8cffd commit cdf1b87

File tree

1 file changed

+33
-29
lines changed

1 file changed

+33
-29
lines changed

Diff for: lib/plugins.js

+33-29
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var q = require('q'),
22
helper = require('./util'),
3-
ConfigParser = require('./configParser');
3+
ConfigParser = require('./configParser'),
4+
log = require('./logger');
45

56
var logPrefix = '[plugins]';
67

@@ -11,7 +12,7 @@ var logPrefix = '[plugins]';
1112
*/
1213
var log_ = function() {
1314
var args = [logPrefix].concat([].slice.call(arguments));
14-
console.log.apply(console, args);
15+
log.puts.apply(log, args);
1516
};
1617

1718
/**
@@ -42,16 +43,36 @@ var Plugins = function(config) {
4243
});
4344
};
4445

45-
var green = '\x1b[32m';
46-
var red = '\x1b[31m';
47-
var normalColor = '\x1b[39m';
46+
var noop = function() {};
4847

49-
var printResult = function(message, pass) {
50-
console.log(pass ? green : red,
51-
'\t', pass ? 'Pass: ' : 'Fail: ', message, normalColor);
52-
};
48+
Plugins.printPluginResults = function(specResults) {
49+
var green = '\x1b[32m';
50+
var red = '\x1b[31m';
51+
var normalColor = '\x1b[39m';
5352

54-
var noop = function() {};
53+
var printResult = function(message, pass) {
54+
log.puts(pass ? green : red,
55+
'\t', pass ? 'Pass: ' : 'Fail: ', message, normalColor);
56+
};
57+
58+
for (var j = 0; j < specResults.length; j++) {
59+
var specResult = specResults[j];
60+
var passed = specResult.assertions.map(function(x) {
61+
return x.passed;
62+
}).reduce(function(x, y) {
63+
return x && y;
64+
}, true);
65+
66+
printResult(specResult.description, passed);
67+
if (!passed) {
68+
for (var k = 0; k < specResult.assertions.length; k++) {
69+
if (!specResult.assertions[k].passed) {
70+
log.puts('\t\t' + specResult.assertions[k].errorMsg);
71+
}
72+
}
73+
}
74+
}
75+
}
5576

5677
function pluginFunFactory(funName) {
5778
return function() {
@@ -81,25 +102,8 @@ function pluginFunFactory(funName) {
81102

82103
// Output test results
83104
if (pluginResult.specResults) {
84-
console.log('Plugin: ' + names[i] + ' (' + funName + ')');
85-
for (var j = 0; j < pluginResult.specResults.length; j++) {
86-
var specResult = pluginResult.specResults[j];
87-
var passed = specResult.assertions.map(function(x) {
88-
return x.passed;
89-
}).reduce(function(x, y) {
90-
return x && y;
91-
}, true);
92-
93-
94-
printResult(specResult.description, passed);
95-
if (!passed) {
96-
for (var k = 0; k < specResult.assertions.length; k++) {
97-
if (!specResult.assertions[k].passed) {
98-
console.log('\t\t' + specResult.assertions[k].errorMsg);
99-
}
100-
}
101-
}
102-
}
105+
log.puts('Plugin: ' + names[i] + ' (' + funName + ')');
106+
Plugins.printPluginResults(pluginResult.specResults);
103107
}
104108

105109
// Join objects

0 commit comments

Comments
 (0)