From 97c52ca5dc0b9c4df015dc36ef394ebe06ec00c6 Mon Sep 17 00:00:00 2001
From: Ruben Bridgewater <ruben@bridgewater.de>
Date: Sat, 15 Jun 2019 13:27:21 +0200
Subject: assert: add more information to AssertionErrors

This adds information about the actual thrown error to the
AssertionError's message property.

It also improves the logged error instances error name by using the
constructors name, if available.

PR-URL: https://github.com/nodejs/node/pull/28263
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-assert-async.js | 3 ++-
 test/parallel/test-assert.js       | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/parallel/test-assert-async.js b/test/parallel/test-assert-async.js
index 45447d4563..cbb4431f19 100644
--- a/test/parallel/test-assert-async.js
+++ b/test/parallel/test-assert-async.js
@@ -73,7 +73,8 @@ const invalidThenableFunc = () => {
     () => assert.rejects(Promise.reject(err), validate),
     {
       message: 'The "validate" validation function is expected to ' +
-               "return \"true\". Received 'baz'",
+               "return \"true\". Received 'baz'\n\nCaught error:\n\n" +
+               'Error: foobar',
       code: 'ERR_ASSERTION',
       actual: err,
       expected: validate,
diff --git a/test/parallel/test-assert.js b/test/parallel/test-assert.js
index 9c59227a78..07cf374696 100644
--- a/test/parallel/test-assert.js
+++ b/test/parallel/test-assert.js
@@ -133,7 +133,7 @@ assert.throws(
     name: 'AssertionError',
     operator: 'throws',
     message: 'The error is expected to be an instance of "AssertionError". ' +
-             'Received "TypeError"'
+             'Received "TypeError"\n\nError message:\n\n[object Object]'
   }
 );
 
@@ -255,7 +255,7 @@ a.throws(() => thrower(TypeError), (err) => {
       assert.strictEqual(
         err.message,
         'The error is expected to be an instance of "ES6Error". ' +
-          'Received "Error"'
+          'Received "AnotherErrorType"\n\nError message:\n\nfoo'
       );
       assert.strictEqual(err.actual, actual);
       return true;
@@ -1334,7 +1334,8 @@ assert.throws(
     () => assert.throws(() => { throw err; }, validate),
     {
       message: 'The validation function is expected to ' +
-              `return "true". Received ${inspect(validate())}`,
+              `return "true". Received ${inspect(validate())}\n\nCaught ` +
+              `error:\n\n${err}`,
       code: 'ERR_ASSERTION',
       actual: err,
       expected: validate,
-- 
cgit v1.2.3