Skip to content

armgit / mocha

Public Imported from GitHub
0

☕️ Classic, reliable, trusted test framework for Node.js and the browser

Fix visionmedia/should.js#168

Travis Jeffery833132865feb
diff --git a/lib/reporters/base.js b/lib/reporters/base.js
index 661126cf..0754fe1a 100644
--- a/lib/reporters/base.js
+++ b/lib/reporters/base.js
@@ -188,7 +188,7 @@ exports.list = function(failures){
if ('string' == typeof actual && 'string' == typeof expected) {
fmt = color('error title', ' %s) %s:\n%s') + color('error stack', '\n%s\n');
var match = message.match(/^([^:]+): expected/);
- msg = match ? '\n ' + color('error message', match[1]) : '';
+ msg = '\n ' + color('error message', match ? match[1] : msg);
if (exports.inlineDiffs) {
msg += inlineDiff(err, escape);
diff --git a/mocha.js b/mocha.js
index c8c9b9ff..fec94e59 100644
--- a/mocha.js
+++ b/mocha.js
@@ -2038,7 +2038,7 @@ exports.list = function(failures){
if ('string' == typeof actual && 'string' == typeof expected) {
fmt = color('error title', ' %s) %s:\n%s') + color('error stack', '\n%s\n');
var match = message.match(/^([^:]+): expected/);
- msg = match ? '\n ' + color('error message', match[1]) : '';
+ msg = '\n ' + color('error message', match ? match[1] : msg);
if (exports.inlineDiffs) {
msg += inlineDiff(err, escape);
@@ -4404,7 +4404,6 @@ function Runner(suite) {
this.on('test end', function(test){ self.checkGlobals(test); });
this.on('hook end', function(hook){ self.checkGlobals(hook); });
this.grep(/.*/);
- console.log(extraGlobals());
this.globals(this.globalProps().concat(extraGlobals()));
}