Fix for tlivings#73: Empty string ignores regex string validation

yosheeck · Dec 19, 2019 · f90df37 · f90df37
1 parent c3ac49c
commit f90df37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/resolver.js b/lib/resolver.js
@@ -351,9 +351,7 @@ class SchemaResolver {
 
         if (Util.isUndefined(schema.minLength)) {
             schema.minLength = 0;
-        }
-
-        if (schema.minLength === 0) {
+        } else if (schema.minLength === 0) {
             joischema = joischema.allow('');
         }
         Util.isNumber(schema.minLength) && (joischema = joischema.min(schema.minLength));

diff --git a/test/test-types.js b/test/test-types.js
@@ -273,7 +273,7 @@ Test('types', function (t) {
     });
 
     t.test('string regex', function (t) {
-        t.plan(2);
+        t.plan(3);
 
         const schema = Enjoi.schema({
             'type': 'string',
@@ -284,11 +284,15 @@ Test('types', function (t) {
             t.ok(error, 'error.');
         });
 
+        Joi.validate('', schema, function (error, value) {
+            t.ok(error, 'error.');
+        });
+
         Joi.validate('foobar', schema, function (error, value) {
             t.ok(!error, 'no error.');
         });
     });
-
+    
     t.test('string length', function (t) {
         t.plan(3);