Merge pull request #2293 from hapijs/consider-changeless-forks

Fix error on changeless forks. Fixes #2292.
hapijs · Feb 12, 2020 · 6ec7131 · 6ec7131
2 parents a9b5c3c + e9f1865
commit 6ec7131
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/modify.js b/lib/modify.js
@@ -163,7 +163,7 @@ internals.fork = function (schema, id, replacement) {
     };
 
     const obj = exports.schema(schema, { each, ref: false });
-    return obj.$_mutateRebuild();
+    return obj ? obj.$_mutateRebuild() : schema;
 };
 
 

diff --git a/test/modify.js b/test/modify.js
@@ -163,6 +163,14 @@ describe('Modify', () => {
             Helper.equal(before.fork('x', (schema) => schema.min(10)), after);
         });
 
+        it('preserves unchanged schemas', () => {
+
+            const before = Joi.object({ x: Joi.string().optional() });
+            const after = Joi.object({ x: Joi.string().optional() });
+
+            Helper.equal(before.fork('x', (schema) => schema.optional()), after);
+        });
+
         it('adjusts reused schema in multiple places', () => {
 
             const shared = Joi.number().id('x');