Fix: control stringification of error message (#4128)

Author: syeutyu

lib/reporters/base.js

@@ -236,10 +236,10 @@ exports.list = function(failures) {
       err = test.err;
     }
     var message;
-    if (err.message && typeof err.message.toString === 'function') {
-      message = err.message + '';
-    } else if (typeof err.inspect === 'function') {
+    if (typeof err.inspect === 'function') {
       message = err.inspect() + '';
+    } else if (err.message && typeof err.message.toString === 'function') {
+      message = err.message + '';
     } else {
       message = '';
     }

test/reporters/base.spec.js

@@ -366,22 +366,24 @@ describe('Base reporter', function() {
     expect(errOut, 'to be', '1) test title:\n     Error\n  foo\n  bar');
   });
 
-  it("should use 'inspect' if 'message' is not set", function() {
-    var err = {
-      showDiff: false,
-      inspect: function() {
-        return 'an error happened';
-      }
+  it("should use 'inspect' if 'inspect' and 'message' are set", function() {
+    var err = new Error('test');
+    err.showDiff = false;
+    err.message = 'error message';
+    err.inspect = function() {
+      return 'Inspect Error';
     };
+
     var test = makeTest(err);
 
     list([test]);
 
     var errOut = stdout.join('\n').trim();
-    expect(errOut, 'to be', '1) test title:\n     an error happened');
+
+    expect(errOut, 'to contain', 'Inspect Error');
   });
 
-  it("should set an empty message if neither 'message' nor 'inspect' is set", function() {
+  it("should set an empty message if neither 'inspect' nor 'message' is set", function() {
     var err = {
       showDiff: false
     };