Fix error() function. Closes #2147

hapijs · Sep 29, 2019 · 5d6d5ed · 5d6d5ed
1 parent 4753311
commit 5d6d5ed
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/validator.js b/lib/validator.js
@@ -461,6 +461,10 @@ internals.finalize = function (value, errors, helpers) {
             if (!Array.isArray(errors)) {
                 errors = [errors];
             }
+
+            for (const error of errors) {
+                Assert(error instanceof Error || error instanceof Errors.Report, 'error() must return an Error object');
+            }
         }
         else {
             errors = [schema._flags.error];

diff --git a/test/base.js b/test/base.js
@@ -1372,7 +1372,6 @@ describe('any', () => {
                     }
                 });
             }).to.throw('Must provide a valid Error object or a function');
-
         });
 
         it('errors on missing error option', () => {
@@ -1386,7 +1385,6 @@ describe('any', () => {
                     }
                 });
             }).to.throw('Missing error');
-
         });
 
         describe('with a function', () => {
@@ -1540,6 +1538,13 @@ describe('any', () => {
                 expect(result2.value).to.equal({ a: [' xx', 'yy?'], b: ' x' });
                 expect(result2.error).to.be.an.error('my new error message');
             });
+
+            it('errors on invalid error function', () => {
+
+                const schema = Joi.number().error(() => 'not an Error');
+
+                expect(() => schema.validate('x')).to.throw('error() must return an Error object');
+            });
         });
     });