joi 4.6.2 → 4.9.0

package/test/any.js

@@ -1,6 +1,7 @@
 // Load modules
 
 var Lab = require('lab');
+var Code = require('code');
 var Joi = require('../lib');
 var Helper = require('./helper');
 
@@ -12,11 +13,12 @@ var internals = {};
 
 // Test shortcuts
 
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
+var lab = exports.lab = Lab.script();
+var before = lab.before;
+var after = lab.after;
+var describe = lab.describe;
+var it = lab.it;
+var expect = Code.expect;
 
 
 describe('any', function () {
@@ -79,13 +81,37 @@ describe('any', function () {
             var input = { b: '2' };
             schema.validate(input, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value.b).to.equal(2);
                 done();
             });
         });
     });
 
+    describe('#label', function () {
+
+        it('adds to existing options', function (done) {
+
+            var schema = Joi.object({ b: Joi.string().email().label('Custom label') });
+            var input = { b: 'not_a_valid_email' };
+            schema.validate(input, function (err, value) {
+
+                expect(err).to.exist();
+                expect(err.details[0].message).to.equal('Custom label must be a valid email');
+                done();
+            });
+        });
+
+        it('throws when label is missing', function (done) {
+
+            expect(function () {
+
+                Joi.label();
+            }).to.throw('Label name must be a non-empty string');
+            done();
+        });
+    });
+
     describe('#strict', function () {
 
         it('adds to existing options', function (done) {
@@ -94,7 +120,7 @@ describe('any', function () {
             var input = { b: '2' };
             schema.validate(input, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(value.b).to.equal('2');
                 done();
             });
@@ -110,7 +136,7 @@ describe('any', function () {
 
             schema.validate(input, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value.foo).to.equal('test');
                 done();
             });
@@ -123,13 +149,13 @@ describe('any', function () {
 
             schema.validate(input, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value.foo).to.equal('test');
                 done();
             });
         });
 
-        it('sets value based on condition (outter)', function (done) {
+        it('sets value based on condition (outer)', function (done) {
 
             var schema = Joi.object({
                 a: Joi.boolean(),
@@ -138,7 +164,7 @@ describe('any', function () {
 
             schema.validate({ a: false }, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value.b).to.equal(false);
                 done();
             });
@@ -153,13 +179,36 @@ describe('any', function () {
 
             schema.validate({ a: true }, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value.b).to.equal(false);
                 done();
             });
         });
     });
 
+    describe('#optional', function () {
+
+        it('validates optional with default required', function (done) {
+
+            var schema = Joi.object({
+                a: Joi.any(),
+                b: Joi.any(),
+                c: {
+                    d: Joi.any()
+                }
+            }).options({ presence: 'required' });
+
+            Helper.validate(schema, [
+                [{ a: 5 }, false],
+                [{ a: 5, b: 6 }, false],
+                [{ a: 5, b: 6, c: {} }, false],
+                [{ a: 5, b: 6, c: { d: 7 } }, true],
+                [{}, false],
+                [{ b: 5 }, false]
+            ], done);
+        });
+    });
+
     describe('#forbidden', function () {
 
         it('validates forbidden', function (done) {
@@ -339,7 +388,7 @@ describe('any', function () {
             var schema = Joi.number().invalid(2);
             Joi.validate('2', schema, { abortEarly: false }, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 done();
             });
         });
@@ -569,7 +618,7 @@ describe('any', function () {
 
             a.concat(b).validate({ c: 1, d: 2 }, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value).to.deep.equal({ a: 1, b: 2 });
                 done();
             });
@@ -582,7 +631,7 @@ describe('any', function () {
 
             a.concat(b).validate({ a: 1, b: 2 }, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 done();
             });
         });

package/test/array.js

@@ -1,6 +1,7 @@
 // Load modules
 
 var Lab = require('lab');
+var Code = require('code');
 var Joi = require('../lib');
 var Helper = require('./helper');
 
@@ -12,11 +13,12 @@ var internals = {};
 
 // Test shortcuts
 
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
+var lab = exports.lab = Lab.script();
+var before = lab.before;
+var after = lab.after;
+var describe = lab.describe;
+var it = lab.it;
+var expect = Code.expect;
 
 
 describe('array', function () {
@@ -25,7 +27,7 @@ describe('array', function () {
 
         Joi.array().validate('[1,2,3]', function (err, value) {
 
-            expect(err).to.not.exist;
+            expect(err).to.not.exist();
             expect(value.length).to.equal(3);
             done();
         });
@@ -35,7 +37,7 @@ describe('array', function () {
 
         Joi.array().validate('{ "something": false }', function (err, value) {
 
-            expect(err).to.exist;
+            expect(err).to.exist();
             expect(err.message).to.equal('value must be an array');
             done();
         });
@@ -45,7 +47,7 @@ describe('array', function () {
 
         Joi.array().validate(3, function (err, value) {
 
-            expect(err).to.exist;
+            expect(err).to.exist();
             expect(value).to.equal(3);
             done();
         });
@@ -55,7 +57,7 @@ describe('array', function () {
 
         Joi.array().validate('3', function (err, value) {
 
-            expect(err).to.exist;
+            expect(err).to.exist();
             expect(value).to.equal('3');
             done();
         });
@@ -65,7 +67,7 @@ describe('array', function () {
 
         Joi.array().validate('asdf', function (err, value) {
 
-            expect(err).to.exist;
+            expect(err).to.exist();
             expect(value).to.equal('asdf');
             done();
         });
@@ -79,7 +81,7 @@ describe('array', function () {
             var input = ['1', '2', '3'];
             schema.validate(input, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value).to.deep.equal([1, 2, 3]);
                 done();
             });
@@ -96,7 +98,7 @@ describe('array', function () {
 
             schema.validate(input, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 done();
             });
         });
@@ -263,12 +265,12 @@ describe('array', function () {
             var n = [1, 2, 'hippo'];
             schema.validate(n, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
 
                 var m = ['x', 'y', 'z'];
                 schema.validate(m, function (err2, value) {
 
-                    expect(err2).to.not.exist;
+                    expect(err2).to.not.exist();
                     done();
                 });
             });
@@ -320,7 +322,7 @@ describe('array', function () {
             var input = { arr: [1, 2, 2.1] };
             schema.validate(input, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(err.message).to.equal('arr position 2 fails because 2 must be an integer');
                 done();
             });
@@ -356,7 +358,7 @@ describe('array', function () {
 
                 var schema = Joi.array().includes().max(5);
                 var desc = schema.describe();
-                expect(desc.includes).to.not.exist;
+                expect(desc.includes).to.not.exist();
                 done();
             });
 
@@ -376,4 +378,41 @@ describe('array', function () {
             });
         });
     });
+
+    describe('#unique', function() {
+
+        it('errors if duplicate numbers or string', function(done) {
+            var schema = Joi.array().unique();
+
+            Helper.validate(schema, [
+                [[2, 2], false],
+                [[02, 2], false],
+                [[0x2, 2], false],
+                [['duplicate', 'duplicate'], false]
+            ], done);
+        });
+
+        it('ignores duplicates if they are of different types', function(done) {
+            var schema = Joi.array().unique();
+
+            Helper.validate(schema, [
+                [[2, '2'], true]
+            ], done);
+        });
+
+        it('ignores duplicates objects, binaries, functions, dates and booleans', function(done) {
+            var buffer = new Buffer('hello world');
+            var func = function() {};
+            var now = new Date();
+            var schema = Joi.array().unique();
+
+            Helper.validate(schema, [
+                [[{ a: 'b' }, { a: 'b' }], true],
+                [[buffer, buffer], true],
+                [[func, func], true],
+                [[now, now], true],
+                [[true, true], true]
+            ], done);
+        });
+    });
 });

package/test/binary.js

@@ -1,6 +1,7 @@
 // Load modules
 
 var Lab = require('lab');
+var Code = require('code');
 var Joi = require('../lib');
 var Helper = require('./helper');
 
@@ -12,11 +13,12 @@ var internals = {};
 
 // Test shortcuts
 
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
+var lab = exports.lab = Lab.script();
+var before = lab.before;
+var after = lab.after;
+var describe = lab.describe;
+var it = lab.it;
+var expect = Code.expect;
 
 
 describe('binary', function () {
@@ -25,7 +27,7 @@ describe('binary', function () {
 
         Joi.binary().validate('test', function (err, value) {
 
-            expect(err).to.not.exist;
+            expect(err).to.not.exist();
             expect(value instanceof Buffer).to.equal(true);
             expect(value.length).to.equal(4);
             expect(value.toString('utf8')).to.equal('test');
@@ -54,7 +56,7 @@ describe('binary', function () {
 
             Joi.binary().validate(5, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(err.message).to.equal('value must be a buffer or a string');
                 done();
             });
@@ -68,7 +70,7 @@ describe('binary', function () {
 
             Joi.binary().validate(new Buffer('hello world'), function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value.toString('utf8')).to.equal('hello world');
                 done();
             });
@@ -83,17 +85,17 @@ describe('binary', function () {
             var input = new Buffer('abcdef');
             schema.validate(input.toString('base64'), function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value instanceof Buffer).to.equal(true);
                 expect(value.toString()).to.equal('abcdef');
                 done();
             });
         });
-        
+
         it('throws when encoding is invalid', function (done) {
 
             expect(function () {
-                
+
                 Joi.binary().encoding('base6');
             }).to.throw('Invalid encoding: base6');
             done();

package/test/boolean.js

@@ -1,6 +1,7 @@
 // Load modules
 
 var Lab = require('lab');
+var Code = require('code');
 var Joi = require('../lib');
 var Helper = require('./helper');
 
@@ -12,11 +13,12 @@ var internals = {};
 
 // Test shortcuts
 
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
+var lab = exports.lab = Lab.script();
+var before = lab.before;
+var after = lab.after;
+var describe = lab.describe;
+var it = lab.it;
+var expect = Code.expect;
 
 
 describe('boolean', function () {
@@ -25,7 +27,7 @@ describe('boolean', function () {
 
         Joi.boolean().validate('true', function (err, value) {
 
-            expect(err).to.not.exist;
+            expect(err).to.not.exist();
             expect(value).to.equal(true);
             done();
         });
@@ -35,7 +37,7 @@ describe('boolean', function () {
 
         Joi.boolean().validate(1, function (err, value) {
 
-            expect(err).to.exist;
+            expect(err).to.exist();
             expect(value).to.equal(1);
             done();
         });

package/test/date.js

@@ -1,6 +1,7 @@
 // Load modules
 
 var Lab = require('lab');
+var Code = require('code');
 var Joi = require('../lib');
 var Helper = require('./helper');
 
@@ -12,11 +13,12 @@ var internals = {};
 
 // Test shortcuts
 
-var expect = Lab.expect;
-var before = Lab.before;
-var after = Lab.after;
-var describe = Lab.experiment;
-var it = Lab.test;
+var lab = exports.lab = Lab.script();
+var before = lab.before;
+var after = lab.after;
+var describe = lab.describe;
+var it = lab.it;
+var expect = Code.expect;
 
 
 describe('date', function () {
@@ -35,16 +37,16 @@ describe('date', function () {
         var now = Date.now();
         Joi.date().valid(new Date(now)).validate(new Date(now), function (err, value) {
 
-            expect(err).to.not.exist;
+            expect(err).to.not.exist();
             done();
         });
     });
 
     it('errors on invalid input and convert disabled', function (done) {
 
-        Joi.date().options({ convert: false }).validate('1-1-2013', function (err, value) {
+        Joi.date().options({ convert: false }).validate('1-1-2013 UTC', function (err, value) {
 
-            expect(err).to.exist;
+            expect(err).to.exist();
             expect(err.message).to.equal('value must be a number of milliseconds or valid date string');
             done();
         });
@@ -54,7 +56,7 @@ describe('date', function () {
 
         Joi.date().validate(new Date(), function (err, value) {
 
-            expect(err).to.not.exist;
+            expect(err).to.not.exist();
             done();
         });
     });
@@ -66,41 +68,162 @@ describe('date', function () {
 
         Joi.date().validate(mili.toString(), function (err, value) {
 
-            expect(err).to.not.exist;
-            expect(value).to.be.eql(now);
+            expect(err).to.not.exist();
+            expect(value).to.deep.equal(now);
             done();
         });
     });
 
+    it('accepts "now" as the min date', function(done) {
+
+      var future = new Date(Date.now() + 1000000);
+
+      Joi.date().min('now').validate(future, function (err, value) {
+
+        expect(err).to.not.exist();
+        expect(value).to.deep.equal(future);
+        done();
+      });
+    });
+
+    it('errors if .min("now") is used with a past date', function(done) {
+
+      var past = new Date(Date.now() - 1000000);
+
+      Joi.date().min('now').validate(past, function (err, value) {
+
+        expect(err).to.exist();
+        done();
+      });
+    });
+
+    it('accepts "now" as the max date', function(done) {
+
+      var past = new Date(Date.now() - 1000000);
+
+      Joi.date().max('now').validate(past, function (err, value) {
+
+        expect(err).to.not.exist();
+        expect(value).to.deep.equal(past);
+        done();
+      });
+    });
+
+    it('errors if .max("now") is used with a future date', function(done) {
+
+      var future = new Date(Date.now() + 1000000);
+
+      Joi.date().max('now').validate(future, function (err, value) {
+
+        expect(err).to.exist();
+        done();
+      });
+    });
+
     describe('#validate', function () {
 
         it('validates min', function (done) {
 
-            Helper.validate(Joi.date().min('1-1-2012'), [
-                ['1-1-2013', true],
-                ['1-1-2012', true],
+            Helper.validate(Joi.date().min('1-1-2000 UTC'), [
+                ['1-1-2001 UTC', true],
+                ['1-1-2000 UTC', true],
                 [0, false],
-                ['1-1-2000', false]
+                ["0", false],
+                ["-1", false],
+                ['1-1-1999 UTC', false]
             ], done);
         });
 
         it('validates max', function (done) {
 
-            Helper.validate(Joi.date().max('1-1-2013'), [
-                ['1-1-2013', true],
-                ['1-1-2012', true],
+            Helper.validate(Joi.date().max('1-1-1970 UTC'), [
+                ['1-1-1971 UTC', false],
+                ['1-1-1970 UTC', true],
                 [0, true],
-                ['1-1-2014', false]
+                [1, false],
+                ["0", true],
+                ["-1", true],
+                ['1-1-2014 UTC', false]
             ], done);
         });
 
         it('validates only valid dates', function (done) {
 
             Helper.validate(Joi.date(), [
-                ['1-1-2013', true],
+                ['1-1-2013 UTC', true],
                 ['not a valid date', false],
                 [new Date('not a valid date'), false]
             ], done);
         });
+
+        describe('#iso', function() {
+
+            it('validates isoDate', function (done) {
+
+                Helper.validate(Joi.date().iso(), [
+                    ['2013-06-07T14:21:46.295Z', true],
+                    ['2013-06-07T14:21:46.295Z0', false],
+                    ['2013-06-07T14:21:46.295+07:00', true],
+                    ['2013-06-07T14:21:46.295+07:000', false],
+                    ['2013-06-07T14:21:46.295-07:00', true],
+                    ['2013-06-07T14:21:46Z', true],
+                    ['2013-06-07T14:21:46Z0', false],
+                    ['2013-06-07T14:21:46+07:00', true],
+                    ['2013-06-07T14:21:46-07:00', true],
+                    ['2013-06-07T14:21Z', true],
+                    ['2013-06-07T14:21+07:00', true],
+                    ['2013-06-07T14:21+07:000', false],
+                    ['2013-06-07T14:21-07:00', true],
+                    ['2013-06-07T14:21Z+7:00', false],
+                    ['2013-06-07', true],
+                    ['2013-06-07T', false],
+                    ['2013-06-07T14:21', false],
+                    ['1-1-2013', false]
+                ], done);
+            });
+
+            it('validates isoDate with a friendly error message', function (done) {
+
+                var schema = { item: Joi.date().iso() };
+                Joi.compile(schema).validate({ item: 'something' }, function (err, value) {
+
+                    expect(err.message).to.contain('must be a valid ISO 8601 date');
+                    done();
+                });
+            });
+        });
+
+        describe('#format', function () {
+
+            it('validates custom format', function (done) {
+
+                Helper.validate(Joi.date().format('DD#YYYY$MM'), [
+                    ['07#2013$06', true],
+                    ['2013-06-07', false]
+                ], done);
+            });
+
+            it('validates several custom formats', function (done) {
+
+                Helper.validate(Joi.date().format(['DD#YYYY$MM', 'YY|DD|MM']), [
+                    ['13|07|06', true],
+                    ['2013-06-07', false]
+                ], done);
+            });
+
+            it('fails with bad formats', function (done) {
+
+                expect(function () {
+
+                    Joi.date().format(true);
+                }).to.throw('Invalid format.');
+
+                expect(function () {
+
+                    Joi.date().format(['YYYYMMDD', true]);
+                }).to.throw('Invalid format.');
+                done();
+            });
+        });
     });
 });