Fix pref().when(). Closes #2128

hapijs · Sep 19, 2019 · 96019a7 · 96019a7
1 parent 1e7f3aa
commit 96019a7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/common.js b/lib/common.js
@@ -145,6 +145,7 @@ exports.preferences = function (target, source) {
     Messages = Messages || require('./messages');
 
     target = target || {};
+    source = source || {};
 
     const merged = Object.assign({}, target, source);
     if (source.errors &&

diff --git a/test/base.js b/test/base.js
@@ -3258,6 +3258,18 @@ describe('any', () => {
             ]);
         });
 
+        it('works with prefs()', () => {
+
+            const schema = Joi.number()
+                .prefs({ errors: { label: 'key' } })
+                .when('$x', { then: Joi.number().min(1) });
+
+            Helper.validate(schema, { context: { x: true } }, [
+                [1, true],
+                [0, false, '"value" must be larger than or equal to 1']
+            ]);
+        });
+
         it('describes the base schema', () => {
 
             const schema = Joi.number()