joi 4.6.2 → 4.9.0

package/test/number.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('number', function () {
@@ -51,7 +53,7 @@ describe('number', function () {
             var text = Joi.number().invalid(50);
             text.validate(50, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 done();
             });
         });
@@ -101,7 +103,7 @@ describe('number', function () {
 
             Joi.compile(config).validate(obj, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value.a).to.equal(123);
                 done();
             });
@@ -111,7 +113,7 @@ describe('number', function () {
 
             Joi.number().validate('1', function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value).to.equal(1);
                 done();
             });
@@ -121,7 +123,7 @@ describe('number', function () {
 
             Joi.number().validate(null, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(value).to.equal(null);
                 done();
             });
@@ -370,6 +372,99 @@ describe('number', function () {
                 [null, true]
             ], done);
         });
+
+        it('should handle limiting the number of decimal places', function (done) {
+
+            var rule = Joi.number().precision(1);
+            Helper.validate(rule, [
+                [1, true],
+                [9.1, true],
+                [9.21, false],
+                [9.9999, false],
+                [9.999e99, true],
+                [9.9e-99, false],
+                [9.9e3, true],
+                [null, false]
+            ], done);
+        });
+
+        it('should handle combination of min, max, integer, allow, invalid, null allowed and precision', function (done) {
+
+            var rule = Joi.number().min(8).max(10).integer().allow(9.1).invalid(8).allow(null).precision(1);
+            Helper.validate(rule, [
+                [1, false],
+                [11, false],
+                [8, false],
+                [9, true],
+                [9.1, true],
+                [9.11, false],
+                [9.2, false],
+                [9.22, false],
+                [null, true]
+            ], done);
+        });
+
+        it('should handle combination of greater and less', function (done) {
+
+            var rule = Joi.number().greater(5).less(10);
+            Helper.validate(rule, [
+                [0, false],
+                [11, false],
+                [5, false],
+                [10, false],
+                [8, true],
+                [5.01, true],
+                [9.99, true],
+                [null, false]
+            ], done);
+        });
+
+        it('should handle combination of greater, less, and integer', function (done) {
+
+            var rule = Joi.number().integer().greater(5).less(10);
+            Helper.validate(rule, [
+                [0, false],
+                [11, false],
+                [5, false],
+                [10, false],
+                [6, true],
+                [9, true],
+                [5.01, false],
+                [9.99, false]
+            ], done);
+        });
+
+        it('should handle combination of greater, less, and null allowed', function (done) {
+
+            var rule = Joi.number().greater(5).less(10).allow(null);
+            Helper.validate(rule, [
+                [0, false],
+                [11, false],
+                [5, false],
+                [10, false],
+                [8, true],
+                [5.01, true],
+                [9.99, true],
+                [null, true]
+            ], done);
+        });
+
+        it('should handle combination of greater, less, invalid, and allow', function (done) {
+
+            var rule = Joi.number().greater(5).less(10).invalid(6).allow(-3);
+            Helper.validate(rule, [
+                [0, false],
+                [11, false],
+                [5, false],
+                [10, false],
+                [6, false],
+                [8, true],
+                [5.01, true],
+                [9.99, true],
+                [-3, true],
+                [null, false]
+            ], done);
+        });
     });
 
     it('should instantiate separate copies on invocation', function (done) {
@@ -384,7 +479,7 @@ describe('number', function () {
     it('should show resulting object with #valueOf', function (done) {
 
         var result = Joi.number().min(5);
-        expect(result.valueOf()).to.exist;
+        expect(result.valueOf()).to.exist();
         done();
     });
 
@@ -419,7 +514,7 @@ describe('number', function () {
 
             schema.validate(input, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value).to.equal(input);
                 done();
             });
@@ -437,4 +532,22 @@ describe('number', function () {
             done();
         });
     });
-});
+
+    describe('#describe', function () {
+
+        it('should describe a minimum of 0', function (done) {
+
+            var schema = Joi.number().min(0);
+            expect(schema.describe()).to.deep.equal({
+                "type": "number",
+                "rules": [
+                    {
+                        "name": "min",
+                        "arg": 0
+                    }
+                ]
+            });
+            done();
+        });
+    });
+});

package/test/object.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('object', function () {
@@ -25,7 +27,7 @@ describe('object', function () {
 
         Joi.object().validate('{"hi":true}', function (err, value) {
 
-            expect(err).to.not.exist;
+            expect(err).to.not.exist();
             expect(value.hi).to.equal(true);
             done();
         });
@@ -35,13 +37,13 @@ describe('object', function () {
 
         Joi.object().validate('a string', function (err, value) {
 
-            expect(err).to.exist;
+            expect(err).to.exist();
             expect(value).to.equal('a string');
             done();
         });
     });
 
-    it('should validate an object', function (done) {
+    it('validates an object', function (done) {
 
         var schema = Joi.object().required();
         Helper.validate(schema, [
@@ -51,6 +53,20 @@ describe('object', function () {
         ], done);
     });
 
+    it('return object reference when no rules specified', function (done) {
+
+        var schema = Joi.object({
+            a: Joi.object()
+        });
+
+        var item = { x: 5 };
+        schema.validate({ a: item }, function (err, value) {
+
+            expect(value.a).to.equal(item);
+            done();
+        });
+    });
+
     it('retains ignored values', function (done) {
 
         var schema = Joi.object();
@@ -76,11 +92,11 @@ describe('object', function () {
 
         Joi.object().validate({ a: 4 }, function (err, value) {
 
-            expect(err).to.not.exist;
+            expect(err).to.not.exist();
 
             Joi.object(undefined).validate({ a: 4 }, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 done();
             });
         });
@@ -90,7 +106,7 @@ describe('object', function () {
 
         Joi.object(null).validate({ a: 4 }, function (err, value) {
 
-            expect(err).to.not.exist;
+            expect(err).to.not.exist();
             done();
         });
     });
@@ -117,8 +133,8 @@ describe('object', function () {
 
         Joi.object({ a: Joi.object() }).validate(undefined, function (err, value) {
 
-            expect(err).to.not.exist;
-            expect(value).to.not.exist;
+            expect(err).to.not.exist();
+            expect(value).to.not.exist();
             done();
         });
     });
@@ -127,7 +143,7 @@ describe('object', function () {
 
         Joi.object().validate([1, 2, 3], function (err, value) {
 
-            expect(err).to.exist;
+            expect(err).to.exist();
             done();
         });
     });
@@ -187,6 +203,18 @@ describe('object', function () {
         ], done);
     });
 
+    it('should validate constructor when type is set', function (done) {
+
+        var schema = Joi.object().type(RegExp);
+        Helper.validate(schema, [
+            [{ item: 'something' }, false],
+            ['', false],
+            [new Date(), false],
+            [/abcd/, true],
+            [new RegExp(), true]
+        ], done);
+    });
+
     it('should traverse an object and validate all properties in the top level', function (done) {
 
         var schema = Joi.object({
@@ -292,7 +320,7 @@ describe('object', function () {
         var obj = { a: 5, b: 'value' };
         schema.validate(obj, function (err, value) {
 
-            expect(err).to.exist;
+            expect(err).to.exist();
             done();
         });
     });
@@ -317,10 +345,10 @@ describe('object', function () {
             var b = a.keys();
             a.validate({ b: 3 }, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 b.validate({ b: 3 }, function (err, value) {
 
-                    expect(err).to.not.exist;
+                    expect(err).to.not.exist();
                     done();
                 });
             });
@@ -332,10 +360,10 @@ describe('object', function () {
             var b = a.keys({});
             a.validate({ b: 3 }, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 b.validate({ b: 3 }, function (err, value) {
 
-                    expect(err).to.exist;
+                    expect(err).to.exist();
                     done();
                 });
             });
@@ -347,10 +375,10 @@ describe('object', function () {
             var b = a.keys({ b: 2 });
             a.validate({ a: 1, b: 2 }, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 b.validate({ a: 1, b: 2 }, function (err, value) {
 
-                    expect(err).to.not.exist;
+                    expect(err).to.not.exist();
                     done();
                 });
             });
@@ -402,7 +430,7 @@ describe('object', function () {
 
             Joi.compile(schema).validate({ test1: 'a', test2: 'b' }, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 done();
             });
         });
@@ -424,7 +452,7 @@ describe('object', function () {
 
             Joi.object().rename('a', 'b').rename('c', 'b').rename('d', 'b').options({ abortEarly: false }).validate({ a: 1, c: 1, d: 1 }, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(err.message).to.equal('value cannot rename child c because multiple renames are disabled and another key was already renamed to b. value cannot rename child d because multiple renames are disabled and another key was already renamed to b');
                 done();
             });
@@ -441,7 +469,7 @@ describe('object', function () {
 
             Joi.compile(schema).validate(obj, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value.a).to.equal(10);
                 expect(value.b).to.equal(10);
                 done();
@@ -469,7 +497,7 @@ describe('object', function () {
 
             schema.validate({ test: 'b', test1: 'a' }, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 done();
             });
         });
@@ -486,7 +514,7 @@ describe('object', function () {
             var data = { arr: [{ uno: '1', dos: '2' }] };
             Joi.object(schema).validate(data, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value.arr[0].one).to.equal('1');
                 expect(value.arr[0].two).to.equal('2');
                 done();
@@ -503,8 +531,8 @@ describe('object', function () {
 
             schema1.validate(input1, function (err1, value1) {
 
-                expect(err1).to.not.exist;
-                expect(value1.b).to.not.exist;
+                expect(err1).to.not.exist();
+                expect(value1.b).to.not.exist();
                 expect(value1.a).to.equal(5);
 
                 var schema2 = Joi.object({ a: Joi.number(), b: Joi.any() }).rename('b', 'a');
@@ -512,8 +540,8 @@ describe('object', function () {
 
                 schema2.validate(input2, function (err2, value2) {
 
-                    expect(err2).to.not.exist;
-                    expect(value2.b).to.not.exist;
+                    expect(err2).to.not.exist();
+                    expect(value2.b).to.not.exist();
                     expect(value2.a).to.equal(5);
 
                     done();
@@ -531,7 +559,7 @@ describe('object', function () {
 
             Joi.validate(input, schema, function (err, value) {
 
-                expect(err).to.not.exist;
+                expect(err).to.not.exist();
                 expect(value.foo2).to.equal('test');
 
                 done();
@@ -547,8 +575,8 @@ describe('object', function () {
 
             schema.validate(input, function (err, value) {
 
-                expect(err).to.not.exist;
-                expect(value['']).to.not.exist;
+                expect(err).to.not.exist();
+                expect(value['']).to.not.exist();
                 expect(value.notEmpty).to.equal('something');
                 done();
             });
@@ -564,8 +592,8 @@ describe('object', function () {
 
             schema.validate(input, function (err, value) {
 
-                expect(err).to.not.exist;
-                expect(value).to.have.keys(['a']);
+                expect(err).to.not.exist();
+                expect(Object.keys(value)).to.include('a');
                 expect(value.a).to.equal('something');
                 done();
             });
@@ -593,8 +621,35 @@ describe('object', function () {
                 })
             });
 
-            expect(schema.describe(true)).to.not.contain.key('children');
-            expect(schema.describe()).to.contain.key('children');
+            expect(Object.keys(schema.describe(true))).to.not.include('children');
+            expect(Object.keys(schema.describe())).to.include('children');
+
+            done();
+        });
+
+        it('describes patterns', function (done) {
+
+            var schema = Joi.object({
+                a: Joi.string()
+            }).pattern(/\w\d/i, Joi.boolean());
+
+            expect(schema.describe()).to.deep.equal({
+                type: 'object',
+                children: {
+                    a: {
+                        type: 'string',
+                        invalids: ['']
+                    }
+                },
+                patterns: [
+                    {
+                        regex: '/\\w\\d/i',
+                        rule: {
+                            type: 'boolean'
+                        }
+                    }
+                ]
+            });
 
             done();
         });
@@ -646,7 +701,7 @@ describe('object', function () {
 
             Joi.validate({ bb: 'y', 5: 'x' }, schema, { abortEarly: false }, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(err.message).to.equal('5 must be a boolean. bb must be one of x');
 
                 Helper.validate(schema, [
@@ -671,7 +726,7 @@ describe('object', function () {
 
             Joi.validate({ x: { bb: 'y', 5: 'x' } }, schema, { abortEarly: false }, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(err.message).to.equal('5 must be a boolean. bb must be one of x');
                 done();
             });
@@ -683,11 +738,22 @@ describe('object', function () {
 
             Joi.validate({ a: 5 }, schema, { abortEarly: false }, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(err.message).to.equal('a is not allowed');
                 done();
             });
         });
+
+        it('removes global flag from patterns', function (done) {
+
+            var schema = Joi.object().pattern(/a/g, Joi.number());
+
+            Joi.validate({ a1: 5, a2: 6 }, schema, function (err, value) {
+
+                expect(err).to.not.exist();
+                done();
+            });
+        });
     });
 
     describe('#with', function () {
@@ -817,7 +883,7 @@ describe('object', function () {
                 }
             }).validate({ a: { b: { c: 1 } } }, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(err.message).to.equal('value must contain at least one of x, y');
                 done();
             });
@@ -840,7 +906,7 @@ describe('object', function () {
 
             schema.validate({ a: { b: 'x', c: 5 }, d: { e: 6 } }, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(err.message).to.equal('value validation failed because d.e failed to equal to a.c');
 
                 Helper.validate(schema, [
@@ -863,7 +929,7 @@ describe('object', function () {
 
             schema.validate({ a: { b: 'x', c: 5 }, d: { e: 6 } }, function (err, value) {
 
-                expect(err).to.exist;
+                expect(err).to.exist();
                 expect(err.message).to.equal('value validation failed because d.e failed to equal to a.c');
 
                 Helper.validate(schema, [
@@ -905,5 +971,88 @@ describe('object', function () {
             }).to.not.throw();
             done();
         });
+
+        it('provides a default message for failed assertions', function (done) {
+
+            var schema = Joi.object({
+                a: {
+                    b: Joi.string(),
+                    c: Joi.number()
+                },
+                d: {
+                    e: Joi.any()
+                }
+            }).assert('d.e', Joi.boolean());
+
+            schema.validate({
+                d: {
+                    e:[]
+                }
+            }, function (err) {
+
+                expect(err).to.exist();
+                expect(err.message).to.equal('value validation failed because d.e failed to pass the assertion test');
+                done();
+            });
+        });
+    });
+
+    describe('#type', function () {
+
+        it('uses constructor name for default type name', function (done) {
+
+            function Foo () {}
+
+            var schema = Joi.object().type(Foo);
+            schema.validate({}, function (err) {
+
+                expect(err).to.exist();
+                expect(err.message).to.equal('value must be an instance of Foo');
+                done();
+            });
+        });
+
+        it('uses custom type name if supplied', function (done) {
+
+            var Foo = function () {};
+
+            var schema = Joi.object().type(Foo, 'Bar');
+            schema.validate({}, function (err) {
+
+                expect(err).to.exist();
+                expect(err.message).to.equal('value must be an instance of Bar');
+                done();
+            });
+        });
+
+        it('overrides constructor name with custom name', function (done) {
+
+            function Foo () {}
+
+            var schema = Joi.object().type(Foo, 'Bar');
+            schema.validate({}, function (err) {
+
+                expect(err).to.exist();
+                expect(err.message).to.equal('value must be an instance of Bar');
+                done();
+            });
+        });
+
+        it('throws when constructor is not a function', function (done) {
+
+            expect(function () {
+
+                var schema = Joi.object().type('');
+            }).to.throw('type must be a constructor function');
+            done();
+        });
+
+        it('uses the constructor name in the schema description', function (done) {
+
+            var description = Joi.object().type(RegExp).describe();
+
+            expect(description.rules).to.deep.include({ name: 'type', arg: 'RegExp' });
+            done();
+        });
     });
 });