Fix special casing of UnexpectedError in <function> to error/throw

Pointed out by @alexjeffburke here: #535 (comment)
unexpectedjs · Dec 9, 2018 · 057c5d8 · 057c5d8
1 parent 9b30831
commit 057c5d8
Showing 1 changed file with 8 additions and 21 deletions.
diff --git a/lib/assertions.js b/lib/assertions.js
@@ -950,14 +950,7 @@ module.exports = expect => {
         expect.errorMode = 'nested';
         return expect.withError(
           () => {
-            if (
-              error.isUnexpected &&
-              (typeof arg === 'string' || isRegExp(arg))
-            ) {
-              return expect(error, 'to have message', arg);
-            } else {
-              return expect(error, 'to satisfy', arg);
-            }
+            return expect(error, 'to satisfy', arg);
           },
           e => {
             e.originalError = error;
@@ -1054,15 +1047,7 @@ module.exports = expect => {
         expect.errorMode = 'nested';
         return expect.withError(
           () => {
-            if (isUnexpected && (typeof arg === 'string' || isRegExp(arg))) {
-              return expect(
-                error.getErrorMessage('text').toString(),
-                'to satisfy',
-                arg
-              );
-            } else {
-              return expect(error, 'to satisfy', arg);
-            }
+            return expect(error, 'to satisfy', arg);
           },
           err => {
             err.originalError = error;
@@ -1340,15 +1325,17 @@ module.exports = expect => {
   );
 
   expect.addAssertion(
-    '<Error> to [exhaustively] satisfy <regexp|string>',
+    '<Error> to [exhaustively] satisfy <regexp|string|any>',
     (expect, { message }, value) =>
       expect(message, 'to [exhaustively] satisfy', value)
   );
 
   expect.addAssertion(
-    '<Error> to [exhaustively] satisfy <any>',
-    (expect, { message }, value) =>
-      expect(message, 'to [exhaustively] satisfy', value)
+    '<UnexpectedError> to [exhaustively] satisfy <regexp|string>',
+    (expect, error, value) => {
+      expect.errorMode = 'bubble';
+      return expect(error, 'to have message', value);
+    }
   );
 
   expect.addAssertion(