Skip to content

Commit 331b274

Browse files
author
Kohei Asai
committed
Merge pull request #2 from axross/bugfix-consolelog-not-show
Bugfix: console.log() did not show
2 parents be36bda + 2e9acb9 commit 331b274

File tree

2 files changed

+57
-61
lines changed

2 files changed

+57
-61
lines changed

‎distributions/index.js

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ Object.defineProperty(exports, '__esModule', {
66

77
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
88

9-
var _babelPolyfill = require('babel/polyfill');
10-
11-
var _babelPolyfill2 = _interopRequireDefault(_babelPolyfill);
12-
139
var _diff = require('diff');
1410

1511
var _chalk = require('chalk');
@@ -46,7 +42,8 @@ var createReporter = function createReporter() {
4642
var stream = (0, _duplexer2['default'])(p, output);
4743
var startedAt = Date.now();
4844

49-
var write = function write(str) {
45+
var println = function println() {
46+
var input = arguments.length <= 0 || arguments[0] === undefined ? '' : arguments[0];
5047
var indentLevel = arguments.length <= 1 || arguments[1] === undefined ? 0 : arguments[1];
5148

5249
var indent = '';
@@ -55,20 +52,21 @@ var createReporter = function createReporter() {
5552
indent += INDENT;
5653
}
5754

58-
output.push(str.split('\n').map(function (part) {
59-
return part.length > 0 ? '' + indent + part : part;
60-
}).join('\n'));
55+
input.split('\n').forEach(function (line) {
56+
output.push('' + indent + line);
57+
output.push('\n');
58+
});
6159
};
6260

6361
var handleTest = function handleTest(name) {
64-
write('\n');
65-
write(_chalk2['default'].blue(name) + '\n', 1);
62+
println();
63+
println(_chalk2['default'].blue(name), 1);
6664
};
6765

6866
var handleAssertSuccess = function handleAssertSuccess(assert) {
6967
var name = assert.name;
7068

71-
write(_chalk2['default'].green(FIG_TICK) + ' ' + _chalk2['default'].dim(name) + '\n', 2);
69+
println(_chalk2['default'].green(FIG_TICK) + ' ' + _chalk2['default'].dim(name), 2);
7270
};
7371

7472
var handleAssertFailure = function handleAssertFailure(assert) {
@@ -84,44 +82,39 @@ var createReporter = function createReporter() {
8482
if (added) style = _chalk2['default'].green.inverse;
8583
if (removed) style = _chalk2['default'].red.inverse;
8684

87-
return value.split('\n').map(function (str) {
88-
return str.length > 0 ? style(str) : str;
89-
}).join('\n');
85+
return style(value);
9086
};
9187

92-
write(_chalk2['default'].red(FIG_CROSS) + ' ' + _chalk2['default'].red(name) + ' ', 2);
93-
write('at ' + _chalk2['default'].magenta(diag.at) + '\n');
88+
println(_chalk2['default'].red(FIG_CROSS) + ' ' + _chalk2['default'].red(name) + ' at ' + _chalk2['default'].magenta(diag.at), 2);
9489

9590
if (typeof diag.expected === 'object' && diag.expected !== null) {
9691
var compared = (0, _diff.diffJson)(diag.actual, diag.expected).map(writeDiff).join('');
9792

98-
write(compared + '\n', 4);
93+
println(compared, 4);
9994
} else if (typeof diag.expected === 'string') {
10095
var compared = (0, _diff.diffWords)(diag.actual, diag.expected).map(writeDiff).join('');
10196

102-
write(compared + '\n', 4);
97+
println(compared, 4);
10398
} else {
104-
write(' ' + _chalk2['default'].red.inverse(diag.actual) + _chalk2['default'].green.inverse(diag.expected) + '\n');
99+
println(_chalk2['default'].red.inverse(diag.actual) + _chalk2['default'].green.inverse(diag.expected), 4);
105100
}
106101
};
107102

108-
var handleComplete = function handleComplete(results) {
103+
var handleComplete = function handleComplete(result) {
109104
var finishedAt = Date.now();
110105

111-
write('\n');
112-
write(_chalk2['default'].green('passed: ' + results.pass + ' '));
113-
write(_chalk2['default'].red('failed: ' + (results.fail || 0) + ' '));
114-
write(_chalk2['default'].white('of ' + results.count + ' tests '));
115-
write(_chalk2['default'].dim('(' + (0, _prettyMs2['default'])(finishedAt - startedAt) + ')\n\n'));
106+
println();
107+
println(_chalk2['default'].green('passed: ' + result.pass + ' ') + _chalk2['default'].red('failed: ' + (result.fail || 0) + ' ') + _chalk2['default'].white('of ' + result.count + ' tests ') + _chalk2['default'].dim('(' + (0, _prettyMs2['default'])(finishedAt - startedAt) + ')'));
108+
println();
116109

117-
if (results.ok) {
118-
write(_chalk2['default'].green('All of ' + results.count + ' tests passed!'));
110+
if (result.ok) {
111+
println(_chalk2['default'].green('All of ' + result.count + ' tests passed!'));
119112
} else {
120-
write(_chalk2['default'].red(results.fail + ' of ' + results.count + ' tests failed.'));
113+
println(_chalk2['default'].red(result.fail + ' of ' + result.count + ' tests failed.'));
121114
stream.isFailed = true;
122115
}
123116

124-
write('\n\n');
117+
println();
125118
};
126119

127120
p.on('comment', function (comment) {
@@ -147,6 +140,10 @@ var createReporter = function createReporter() {
147140
;
148141
});
149142

143+
p.on('extra', function (extra) {
144+
println(_chalk2['default'].yellow(('' + extra).replace(/\n$/, '')), 4);
145+
});
146+
150147
return stream;
151148
};
152149

‎sources/index.js

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,33 @@ const FIG_TICK = figures.tick;
1111
const FIG_CROSS = figures.cross;
1212

1313
const createReporter = () => {
14-
const output = through2()
14+
const output = through2();
1515
const p = parser();
1616
const stream = duplexer(p, output);
1717
const startedAt = Date.now();
1818

19-
const write = (str, indentLevel = 0) => {
19+
const println = (input = '', indentLevel = 0) => {
2020
let indent = '';
2121

2222
for (let i = 0; i < indentLevel; ++i) {
2323
indent += INDENT;
2424
}
2525

26-
output.push(
27-
str.split('\n')
28-
.map(part => part.length > 0 ? `${indent}${part}` : part)
29-
.join('\n')
30-
);
26+
input.split('\n').forEach(line => {
27+
output.push(`${indent}${line}`);
28+
output.push('\n');
29+
});
3130
};
3231

3332
const handleTest = name => {
34-
write('\n');
35-
write(`${chalk.blue(name)}\n`, 1);
33+
println();
34+
println(chalk.blue(name), 1);
3635
};
3736

3837
const handleAssertSuccess = assert => {
3938
const name = assert.name;
4039

41-
write(`${chalk.green(FIG_TICK)} ${chalk.dim(name)}\n`, 2);
40+
println(`${chalk.green(FIG_TICK)} ${chalk.dim(name)}`, 2)
4241
};
4342

4443
const handleAssertFailure = assert => {
@@ -50,55 +49,51 @@ const createReporter = () => {
5049
if (added) style = chalk.green.inverse;
5150
if (removed) style = chalk.red.inverse;
5251

53-
return value.split('\n')
54-
.map(str => str.length > 0 ? style(str) : str)
55-
.join('\n')
52+
return style(value);
5653
};
5754

58-
write(`${chalk.red(FIG_CROSS)} ${chalk.red(name)} `, 2);
59-
write(`at ${chalk.magenta(diag.at)}\n`);
55+
println(`${chalk.red(FIG_CROSS)} ${chalk.red(name)} at ${chalk.magenta(diag.at)}`, 2);
6056

6157
if (typeof diag.expected === 'object' && diag.expected !== null) {
6258
const compared = diffJson(diag.actual, diag.expected)
6359
.map(writeDiff)
6460
.join('');
6561

66-
write(`${compared}\n`, 4);
62+
println(compared, 4);
6763
} else if (typeof diag.expected === 'string') {
6864
const compared = diffWords(diag.actual, diag.expected)
6965
.map(writeDiff)
7066
.join('');
7167

72-
write(`${compared}\n`, 4);
68+
println(compared, 4);
7369
} else {
74-
write(' ' +
75-
chalk.red.inverse(diag.actual) +
76-
chalk.green.inverse(diag.expected) + '\n'
70+
println(
71+
chalk.red.inverse(diag.actual) + chalk.green.inverse(diag.expected),
72+
4
7773
);
7874
}
79-
80-
8175
};
8276

8377
const handleComplete = result => {
8478
const finishedAt = Date.now();
8579

86-
write('\n');
87-
write(chalk.green(`passed: ${result.pass} `));
88-
write(chalk.red(`failed: ${result.fail || 0} `));
89-
write(chalk.white(`of ${result.count} tests `));
90-
write(chalk.dim(`(${prettyMs(finishedAt - startedAt)})\n\n`));
80+
println();
81+
println(
82+
chalk.green(`passed: ${result.pass} `) +
83+
chalk.red(`failed: ${result.fail || 0} `) +
84+
chalk.white(`of ${result.count} tests `) +
85+
chalk.dim(`(${prettyMs(finishedAt - startedAt)})`)
86+
);
87+
println();
9188

9289
if (result.ok) {
93-
write(chalk.green(`All of ${result.count} tests passed!`));
90+
println(chalk.green(`All of ${result.count} tests passed!`));
9491
} else {
95-
write(chalk.red(
96-
`${result.fail} of ${result.count} tests failed.`
97-
));
92+
println(chalk.red(`${result.fail} of ${result.count} tests failed.`));
9893
stream.isFailed = true;
9994
}
10095

101-
write('\n\n');
96+
println();
10297
};
10398

10499
p.on('comment', (comment) => {
@@ -124,6 +119,10 @@ const createReporter = () => {
124119
;
125120
});
126121

122+
p.on('extra', extra => {
123+
println(chalk.yellow(`${extra}`.replace(/\n$/, '')), 4);
124+
});
125+
127126
return stream;
128127
};
129128

0 commit comments

Comments
 (0)