Dependencies (incomplete). Closes hapijs#2452. Closes hapijs#2454. Closes hapijs#2455. Closes hapijs#2457. For hapijs#2453

Eran Hammer · Eran Hammer · commit c2634234145f · 2015-03-10T01:16:57.000-07:00
diff --git a/lib/schema.js b/lib/schema.js
@@ -58,7 +58,7 @@ internals.routeBase = Joi.object({
         expiresIn: Joi.number(),
         expiresAt: Joi.string(),
         privacy: Joi.string().valid('default', 'public', 'private'),
-        statuses: Joi.array().min(1).includes(Joi.number().integer().min(200))
+        statuses: Joi.array().items(Joi.number().integer().min(200)).min(1)
     }),
     cors: Joi.object({
         origin: Joi.array(),
@@ -170,7 +170,7 @@ internals.server = Joi.object({
     cache: Joi.alternatives([
         Joi.func(),
         internals.cache,
-        Joi.array().includes(internals.cache).min(1)
+        Joi.array().items(internals.cache).min(1)
     ]).allow(null),
     connections: internals.connectionBase,
     debug: Joi.object({
@@ -191,7 +191,7 @@ internals.connection = internals.connectionBase.keys({
     autoListen: Joi.boolean(),
     host: Joi.string().hostname(),
     address: Joi.string().hostname(),
-    labels: Joi.array().includes(Joi.string()).single(),
+    labels: Joi.array().items(Joi.string()).single(),
     listener: Joi.any(),
     port: Joi.alternatives([
         Joi.number().integer().min(0),          // TCP port
@@ -209,7 +209,7 @@ internals.connection = internals.connectionBase.keys({
 
 internals.vhost = Joi.alternatives([
     Joi.string().hostname(),
-    Joi.array().includes(Joi.string().hostname()).min(1)
+    Joi.array().items(Joi.string().hostname()).min(1)
 ]);
 
 
@@ -236,7 +236,7 @@ internals.pre = [
 
 internals.routeConfig = internals.routeBase.keys({
     id: Joi.string(),
-    pre: Joi.array().includes(internals.pre.concat(Joi.array().includes(internals.pre).min(1))),
+    pre: Joi.array().items(internals.pre.concat(Joi.array().items(internals.pre).min(1))),
     handler: [
         Joi.func(),
         Joi.string(),
@@ -245,11 +245,11 @@ internals.routeConfig = internals.routeBase.keys({
     description: Joi.string(),
     notes: [
         Joi.string(),
-        Joi.array().includes(Joi.string())
+        Joi.array().items(Joi.string())
     ],
     tags: [
         Joi.string(),
-        Joi.array().includes(Joi.string())
+        Joi.array().items(Joi.string())
     ]
 });
 
@@ -275,7 +275,7 @@ internals.register = Joi.object({
         prefix: Joi.string().regex(/^\/.+/),
         vhost: internals.vhost
     }),
-    select: Joi.array().includes(Joi.string()).single()
+    select: Joi.array().items(Joi.string()).single()
 });
 
-internals.dependencies = Joi.array().includes(Joi.string()).single();
+internals.dependencies = Joi.array().items(Joi.string()).single();
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "inert": "2.x.x",
     "iron": "2.x.x",
     "items": "1.x.x",
-    "joi": "5.x.x",
+    "joi": "6.x.x",
     "kilt": "^1.1.x",
     "mimos": "2.x.x",
     "peekaboo": "1.x.x",
diff --git a/test/plugin.js b/test/plugin.js
@@ -826,7 +826,7 @@ describe('Plugin', function () {
             expect(function () {
 
                 server.register(a, function () {});
-            }).to.throw('Invalid dependencies options (must be a string or an array of strings) {\n  \"b\": true,\n  \u001b[41m\"0\"\u001b[0m\u001b[31m [1]: -- missing --\u001b[0m\n}\n\u001b[31m\n[1] single value of value fails because value must be a string\u001b[0m');
+            }).to.throw('Invalid dependencies options (must be a string or an array of strings) {\n  \"b\": true,\n  \u001b[41m\"0\"\u001b[0m\u001b[31m [1]: -- missing --\u001b[0m\n}\n\u001b[31m\n[1] "0" must be a string\u001b[0m');
             done();
         });
 
@@ -847,7 +847,7 @@ describe('Plugin', function () {
             expect(function () {
 
                 server.register(a, function () {});
-            }).to.throw('Invalid dependencies options (must be a string or an array of strings) [\n  null\n]\n\u001b[31m\n[1] value at position 0 fails because value must be a string\u001b[0m');
+            }).to.throw('Invalid dependencies options (must be a string or an array of strings) [\n  null\n]\n\u001b[31m\n[1] "0" must be a string\u001b[0m');
             done();
         });
     });
diff --git a/test/route.js b/test/route.js
@@ -49,7 +49,7 @@ describe('Route', function () {
             var server = new Hapi.Server();
             server.connection();
             server.route({ path: '/', handler: function () { } });
-        }).to.throw(/method is required/);
+        }).to.throw(/"method" is required/);
         done();
     });
 
diff --git a/test/validation.js b/test/validation.js
@@ -473,7 +473,7 @@ describe('validation', function () {
         server.inject('/?a=1', function (res) {
 
             expect(res.statusCode).to.equal(200);
-            expect(res.result.data.output.payload.message).to.deep.equal('a length must be at least 2 characters long');
+            expect(res.result.data.output.payload.message).to.deep.equal('child "a" fails because ["a" length must be at least 2 characters long]');
             done();
         });
     });
@@ -561,7 +561,7 @@ describe('validation', function () {
             expect(res.result).to.deep.equal({
                 statusCode: 400,
                 error: 'Bad Request',
-                message: 'a length must be at least 2 characters long',
+                message: 'child "a" fails because ["a" length must be at least 2 characters long]',
                 validation: {
                     source: 'query',
                     keys: ['a']
@@ -1000,7 +1000,7 @@ describe('validation', function () {
                 },
                 handler: handler
             });
-        }).to.throw(/modify conflict with forbidden peer sample/);
+        }).to.throw(/"modify" conflict with forbidden peer "sample"/);
         done();
     });
 
@@ -1289,7 +1289,7 @@ describe('validation', function () {
         server.on('request-internal', function (request, event, tags) {
 
             if (tags.validation) {
-                expect(event.data).to.equal('a is not allowed');
+                expect(event.data).to.equal('"a" is not allowed');
             }
         });
 
