#1 Fixing no Enum validation error raised if type string specified

worldline · Sep 2, 2015 · 338e574 · 338e574
1 parent ca3d57b
commit 338e574
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/lib/enjoi.js b/lib/enjoi.js
@@ -35,6 +35,7 @@ module.exports = function enjoi(schema, options) {
             return resolve(resolveref(current.$ref));
         }
 
+        //if no type is specified, just enum
         if (current.enum) {
             return Joi.any().valid(current.enum);
         }
@@ -180,6 +181,10 @@ module.exports = function enjoi(schema, options) {
     function string(current) {
         var joischema = Joi.string();
 
+        if (current.enum) {
+            return Joi.any().valid(current.enum);
+        }
+
         switch (current.format) {
             case 'date':
             case 'date-time':

diff --git a/test/test-enjoi.js b/test/test-enjoi.js
@@ -367,7 +367,7 @@ Test('types', function (t) {
     });
 
     t.test('enum', function (t) {
-        t.plan(3);
+        t.plan(5);
 
         var schema = Enjoi({
             'enum': ['A', 'B']
@@ -384,6 +384,19 @@ Test('types', function (t) {
         Joi.validate('C', schema, function (error, value) {
             t.ok(error, 'error.');
         });
+
+        schema = Enjoi({
+            type: 'string',
+            'enum': ['A', 'B']
+        });
+
+        Joi.validate('B', schema, function (error, value) {
+            t.ok(!error, 'no error.');
+        });
+
+        Joi.validate('C', schema, function (error, value) {
+            t.ok(error, 'error.');
+        });
     });
 
     t.test('unknown type fails', function (t) {