Fix message/defaultMessage handling and add test

mkg20001 · Dec 16, 2016 · 2212ab0 · 2212ab0
1 parent 6d3c80b
commit 2212ab0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -9,6 +9,6 @@ module.exports = function joiObjectId(Joi, message) {
     message = defaultMessage;
   }
   return function objectId() {
-    return Joi.string().regex(/^[0-9a-fA-F]{24}$/, defaultMessage);
+    return Joi.string().regex(/^[0-9a-fA-F]{24}$/, message);
   };
 };
diff --git a/test.js b/test.js
@@ -42,4 +42,13 @@ describe('joi-objectid', function() {
 
     done();
   });
+
+  it('includes custom message for invalid value', function(done) {
+    var dbId = joiObjectId(Joi, 'database id');
+    var result = Joi.validate('blah', dbId());
+
+    assert(result.error);
+    assert(result.error.message.indexOf('database id') >= 0);
+    done();
+  });
 });