Assert: Extend throws to accept Error instances

Fixes gh-476 Closes gh-506
qunitjs · Jan 29, 2014 · b10cd7f · b10cd7f
1 parent 48761bb
commit b10cd7f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/assert.js b/src/assert.js
@@ -142,6 +142,12 @@ assert = QUnit.assert = {
 				ok = true;
 				expectedOutput = null;
 
+			// expected is an Error object
+			} else if ( expected instanceof Error ) {
+				ok = actual instanceof Error &&
+					 actual.name === expected.name &&
+					 actual.message === expected.message;
+
 			// expected is a regexp
 			} else if ( QUnit.objectType( expected ) === "regexp" ) {
 				ok = expected.test( errorString( actual ) );

diff --git a/test/test.js b/test/test.js
@@ -497,7 +497,7 @@ test("propEqual", function( assert ) {
 });
 
 test("throws", function( assert ) {
-	expect(9);
+	expect(10);
 	function CustomError( message ) {
 		this.message = message;
 	}
@@ -584,6 +584,14 @@ test("throws", function( assert ) {
 		"some error description",
 		"handle string typed thrown errors"
 	);
+
+	assert.throws(
+		function() {
+			throw new Error( "foo" );
+		},
+		new Error( "foo" ),
+		"assert when a function throws an 'Error' object"
+	);
 });
 
 if (typeof document !== "undefined") {