Apply hapijs#3663 to v16

rokoroku · Apr 23, 2018 · 41177fe · 41177fe
1 parent 7869933
commit 41177fe
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/lib/schema.js b/lib/schema.js
@@ -128,12 +128,12 @@ internals.routeBase = Joi.object({
         modify: Joi.boolean(),
         options: Joi.object(),
         ranges: Joi.boolean(),
-        sample: Joi.number().min(0).max(100),
+        sample: Joi.number().min(0).max(100).when('modify', { is: true, then: Joi.forbidden() }),
         schema: Joi.alternatives(Joi.object(), Joi.array(), Joi.func()).allow(true, false),
         status: Joi.object().pattern(/\d\d\d/, Joi.alternatives(Joi.object(), Joi.array(), Joi.func()).allow(true, false))
     })
         .without('modify', 'sample')
-        .assert('options.stripUnknown', Joi.when('modify', { is: true, otherwise: Joi.forbidden() }), 'meet requirement of having peer modify set to true'),
+        .assert('options.stripUnknown', Joi.when('modify', { is: true, otherwise: Joi.boolean().valid(false) }), 'meet requirement of having peer modify set to true'),
     security: Joi.object({
         hsts: [
             Joi.object({

diff --git a/test/validation.js b/test/validation.js
@@ -1380,10 +1380,32 @@ describe('validation', () => {
                 },
                 handler
             });
-        }).to.throw(/"modify" conflict with forbidden peer "sample"/);
+        }).to.throw(/"sample" is not allowed/);
         done();
     });
 
+    it('do not throws on sample with false response modify', () => {
+
+        const server = Hapi.server({ debug: false });
+        expect(() => {
+
+            server.route({
+                method: 'GET',
+                path: '/',
+                config: {
+                    response: {
+                        schema: Joi.object({
+                            a: Joi.number()
+                        }).options({ stripUnknown: true }),
+                        modify: false,
+                        sample: 90
+                    }
+                },
+                handler: () => ({ a: 1, b: 2 })
+            });
+        }).to.not.throw();
+    });
+
     it('validates response using custom validation function', (done) => {
 
         let i = 0;