Fix #317

hapijs · Jul 1, 2019 · b930b49 · b930b49
1 parent aecedb0
commit b930b49
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -592,6 +592,12 @@ exports.assert = function (condition, ...args) {
         return;
     }
 
+    if (args.length === 1 &&
+        args[0] instanceof Error) {
+
+        throw args[0];
+    }
+
     throw new exports.Error(args);
 };
 

diff --git a/test/index.js b/test/index.js
@@ -179,7 +179,7 @@ describe('clone()', () => {
     it('shallow clones map', () => {
 
         const map = new Map();
-        map.set('a', { x : 1 });
+        map.set('a', { x: 1 });
         map.set(map, map);
 
         const clone = Hoek.clone(map, { shallow: true });
@@ -2487,10 +2487,9 @@ describe('assert()', () => {
 
     it('throws an Error when using assert in a test with error object message', () => {
 
-        expect(() => {
-
-            Hoek.assert(false, new Error('This is spinal tap'));
-        }).to.throw('This is spinal tap');
+        const err = new Error('This is spinal tap');
+        const got = expect(() => Hoek.assert(false, err)).to.throw('This is spinal tap');
+        expect(got).to.shallow.equal(err);
     });
 
     it('throws the same Error that is passed to it if there is only one error passed', () => {