Add options support on any().validate()

Fixes #884.

Author: Marsup

lib/any.js

@@ -656,16 +656,13 @@ internals.Any.prototype._validateWithOptions = function (value, options, callbac
 };
 
 
-internals.Any.prototype.validate = function (value, callback) {
+internals.Any.prototype.validate = function (value, options, callback) {
 
-    const result = this._validate(value, null, internals.defaults);
-    const errors = Errors.process(result.errors, value);
-
-    if (callback) {
-        return callback(errors, result.value);
+    if (typeof options === 'function') {
+        return this._validateWithOptions(value, null, options);
     }
 
-    return { error: errors, value: result.value };
+    return this._validateWithOptions(value, options, callback);
 };
 
 

test/any.js

@@ -989,6 +989,47 @@ describe('any', () => {
         });
     });
 
+    describe('validate()', () => {
+
+        it('accepts only value (sync way)', (done) => {
+
+            const schema = Joi.number();
+            const result = schema.validate('2');
+            expect(result).to.deep.equal({ value: 2, error: null });
+            done();
+        });
+
+        it('accepts value and callback', (done) => {
+
+            const schema = Joi.number();
+            schema.validate('2', (err, value) => {
+
+                expect(err).to.not.exist();
+                expect(value).to.equal(2);
+                done();
+            });
+        });
+
+        it('accepts value and options', (done) => {
+
+            const schema = Joi.number();
+            const result = schema.validate('2', { convert: false });
+            expect(result.error).to.be.an.error('"value" must be a number');
+            done();
+        });
+
+        it('accepts value, options and callback', (done) => {
+
+            const schema = Joi.number();
+            schema.validate('2', { convert: false }, (err, value) => {
+
+                expect(err).to.be.an.error('"value" must be a number');
+                done();
+            });
+        });
+
+    });
+
     describe('concat()', () => {
 
         it('throws when schema is not any', (done) => {