Merge pull request #556 from unexpectedjs/feature/simplifyToBeRejecte…

…dWith

Simplify the "to be rejected with" and "to call the callback with error" assertions

lib/assertions.js

@@ -4,7 +4,6 @@ const arrayChanges = require('array-changes');
 const arrayChangesAsync = require('array-changes-async');
 const throwIfNonUnexpectedError = require('./throwIfNonUnexpectedError');
 const objectIs = utils.objectIs;
-const isRegExp = utils.isRegExp;
 const extend = utils.extend;
 
 module.exports = expect => {
@@ -2265,17 +2264,7 @@ module.exports = expect => {
       expect.errorMode = 'nested';
       return expect(subject, 'to be rejected').tap(err =>
         expect.withError(
-          () => {
-            if (
-              err &&
-              err._isUnexpected &&
-              (typeof value === 'string' || isRegExp(value))
-            ) {
-              return expect(err, 'to have message', value);
-            } else {
-              return expect(err, 'to [exhaustively] satisfy', value);
-            }
-          },
+          () => expect(err, 'to [exhaustively] satisfy', value),
           e => {
             e.originalError = err;
             throw e;
@@ -2525,15 +2514,7 @@ module.exports = expect => {
     (expect, subject, value) =>
       expect(subject, 'to call the callback with error').tap(err => {
         expect.errorMode = 'nested';
-        if (
-          err &&
-          err._isUnexpected &&
-          (typeof value === 'string' || isRegExp(value))
-        ) {
-          return expect(err, 'to have message', value);
-        } else {
-          return expect(err, 'to satisfy', value);
-        }
+        expect(err, 'to satisfy', value);
       })
   );
 };