From f16baeb6b916f673e4aa22e4903f9a29bcf17abe Mon Sep 17 00:00:00 2001 From: Ryan Holstad Date: Mon, 30 Apr 2018 14:39:03 -0400 Subject: [PATCH 1/6] Update getReasonName to use getMessage if getConstructorName is not a String --- lib/chai-as-promised.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/chai-as-promised.js b/lib/chai-as-promised.js index 0b84194..a19083b 100644 --- a/lib/chai-as-promised.js +++ b/lib/chai-as-promised.js @@ -77,7 +77,10 @@ module.exports = (chai, utils) => { } function getReasonName(reason) { - return reason instanceof Error ? reason.toString() : checkError.getConstructorName(reason); + let constructorName = checkError.getConstructorName(reason); + let message = checkError.getMessage(reason) + + return reason instanceof Error ? reason.toString() : (constructorName instanceof String ? constructorName : message); } // Grab these first, before we modify `Assertion.prototype`. From d67c867f375979774114e70badc1c2729aa8086c Mon Sep 17 00:00:00 2001 From: Ryan Holstad Date: Mon, 30 Apr 2018 15:18:35 -0400 Subject: [PATCH 2/6] Update chai-as-promised.js --- lib/chai-as-promised.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/chai-as-promised.js b/lib/chai-as-promised.js index a19083b..f3cc42a 100644 --- a/lib/chai-as-promised.js +++ b/lib/chai-as-promised.js @@ -77,8 +77,8 @@ module.exports = (chai, utils) => { } function getReasonName(reason) { - let constructorName = checkError.getConstructorName(reason); - let message = checkError.getMessage(reason) + const constructorName = checkError.getConstructorName(reason); + const message = checkError.getMessage(reason) return reason instanceof Error ? reason.toString() : (constructorName instanceof String ? constructorName : message); } From 981bb9ebf2e347d505fd6445a8b997abac2d1a84 Mon Sep 17 00:00:00 2001 From: Ryan Holstad Date: Mon, 30 Apr 2018 15:20:14 -0400 Subject: [PATCH 3/6] Update chai-as-promised.js --- lib/chai-as-promised.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chai-as-promised.js b/lib/chai-as-promised.js index f3cc42a..c9f07ac 100644 --- a/lib/chai-as-promised.js +++ b/lib/chai-as-promised.js @@ -78,7 +78,7 @@ module.exports = (chai, utils) => { function getReasonName(reason) { const constructorName = checkError.getConstructorName(reason); - const message = checkError.getMessage(reason) + const message = checkError.getMessage(reason); return reason instanceof Error ? reason.toString() : (constructorName instanceof String ? constructorName : message); } From 1d0b304390f3d3dfaab5496939ddbc8c12a235b0 Mon Sep 17 00:00:00 2001 From: Ryan Holstad Date: Mon, 30 Apr 2018 15:43:51 -0400 Subject: [PATCH 4/6] Update chai-as-promised.js --- lib/chai-as-promised.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/chai-as-promised.js b/lib/chai-as-promised.js index c9f07ac..7620845 100644 --- a/lib/chai-as-promised.js +++ b/lib/chai-as-promised.js @@ -80,7 +80,15 @@ module.exports = (chai, utils) => { const constructorName = checkError.getConstructorName(reason); const message = checkError.getMessage(reason); - return reason instanceof Error ? reason.toString() : (constructorName instanceof String ? constructorName : message); + if (reason instanceof Error) { + return reason.toString(); + }else if (constructorName instanceof String) { + return constructorName; + }else if (message instanceof String) { + return message; + }else { + return reason; + } } // Grab these first, before we modify `Assertion.prototype`. From 3afc66fe8d7815f22dc930da9af1baf242593e01 Mon Sep 17 00:00:00 2001 From: Ryan Holstad Date: Mon, 30 Apr 2018 15:51:47 -0400 Subject: [PATCH 5/6] Update chai-as-promised.js --- lib/chai-as-promised.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/chai-as-promised.js b/lib/chai-as-promised.js index 7620845..c3efe5e 100644 --- a/lib/chai-as-promised.js +++ b/lib/chai-as-promised.js @@ -82,13 +82,13 @@ module.exports = (chai, utils) => { if (reason instanceof Error) { return reason.toString(); - }else if (constructorName instanceof String) { + } else if (constructorName instanceof String) { return constructorName; - }else if (message instanceof String) { + } else if (message instanceof String) { return message; - }else { - return reason; } + + return reason; } // Grab these first, before we modify `Assertion.prototype`. From a2ae96e8d2759e04bb95a06fb3d46ef6293209da Mon Sep 17 00:00:00 2001 From: Ryan Holstad Date: Mon, 30 Apr 2018 15:57:21 -0400 Subject: [PATCH 6/6] Update chai-as-promised.js --- lib/chai-as-promised.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/chai-as-promised.js b/lib/chai-as-promised.js index c3efe5e..a10f892 100644 --- a/lib/chai-as-promised.js +++ b/lib/chai-as-promised.js @@ -87,7 +87,6 @@ module.exports = (chai, utils) => { } else if (message instanceof String) { return message; } - return reason; }