From d615f0ff82f5b2b530940a21a61e5b4b08b1d1f4 Mon Sep 17 00:00:00 2001
From: Rob Waller <rdwaller1984@gmail.com>
Date: Tue, 23 Jun 2020 15:47:09 +0100
Subject: fix(std/testing): assertThrows gracefully fails if non-Error thrown
 (#6330)

---
 std/testing/asserts.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'std/testing/asserts.ts')

diff --git a/std/testing/asserts.ts b/std/testing/asserts.ts
index 50a9c59ce..50c45c6ca 100644
--- a/std/testing/asserts.ts
+++ b/std/testing/asserts.ts
@@ -322,7 +322,8 @@ export function fail(msg?: string): void {
   assert(false, `Failed assertion${msg ? `: ${msg}` : "."}`);
 }
 
-/** Executes a function, expecting it to throw.  If it does not, then it
+/**
+ * Executes a function, expecting it to throw.  If it does not, then it
  * throws.  An error class and a string that should be included in the
  * error message can also be asserted.
  */
@@ -337,6 +338,9 @@ export function assertThrows<T = void>(
   try {
     fn();
   } catch (e) {
+    if (e instanceof Error === false) {
+      throw new AssertionError("A non-Error object was thrown.");
+    }
     if (ErrorClass && !(Object.getPrototypeOf(e) === ErrorClass.prototype)) {
       msg = `Expected error to be instance of "${ErrorClass.name}", but was "${
         e.constructor.name
@@ -362,6 +366,11 @@ export function assertThrows<T = void>(
   return error;
 }
 
+/**
+ * Executes a function which returns a promise, expecting it to throw or reject.
+ * If it does not, then it throws.  An error class and a string that should be
+ * included in the error message can also be asserted.
+ */
 export async function assertThrowsAsync<T = void>(
   fn: () => Promise<T>,
   ErrorClass?: Constructor,
@@ -373,6 +382,9 @@ export async function assertThrowsAsync<T = void>(
   try {
     await fn();
   } catch (e) {
+    if (e instanceof Error === false) {
+      throw new AssertionError("A non-Error object was thrown or rejected.");
+    }
     if (ErrorClass && !(Object.getPrototypeOf(e) === ErrorClass.prototype)) {
       msg = `Expected error to be instance of "${ErrorClass.name}", but got "${
         e.name
-- 
cgit v1.2.3