Alternatives respect subsequent "when"s if first has only "otherwise"

rooftopsparrow · Apr 14, 2017 · 19ef7ce · 19ef7ce
1 parent 5450404
commit 19ef7ce
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/lib/alternatives.js b/lib/alternatives.js
@@ -43,6 +43,9 @@ internals.Alternatives = class extends Any {
                         return baseType._validate(value, state, options);
                     }
                 }
+                else if (item.then === undefined && i < (il - 1)) {
+                    continue;
+                }
                 else if (item.then || baseType) {
                     return (item.then || baseType)._validate(value, state, options);
                 }

diff --git a/test/alternatives.js b/test/alternatives.js
@@ -222,6 +222,24 @@ describe('alternatives', () => {
             ], done);
         });
 
+        it('validates "then" when a preceding "when" has only "otherwise"', (done) => {
+
+            const schema = Joi.object({
+                a: Joi.number(),
+                b: Joi.number(),
+                c: Joi.number()
+                    .when('a', { is: 1, otherwise: Joi.number().min(1) })
+                    .when('b', { is: 1, then: Joi.number().min(1) })
+            });
+
+            Helper.validate(schema, [
+                [{ a: 1, b: 1, c: 0 }, false, null, 'child "c" fails because ["c" must be larger than or equal to 1]'],
+                [{ a: 1, b: 1, c: 1 }, true],
+                [{ a: 0, b: 1, c: 1 }, true],
+                [{ a: 1, b: 0, c: 0 }, true]
+            ], done);
+        });
+
         it('validates when is is null', (done) => {
 
             const schema = {