Comparing version 13.4.0 to 13.4.1
@@ -119,4 +119,4 @@ 'use strict'; | ||
sample: Joi.number().min(0).max(100), | ||
schema: Joi.alternatives(Joi.object(), Joi.func()).allow(true, false), | ||
status: Joi.object().pattern(/\d\d\d/, Joi.alternatives(Joi.object(), Joi.func()).allow(true, false)) | ||
schema: Joi.alternatives(Joi.object(), Joi.array(), Joi.func()).allow(true, false), | ||
status: Joi.object().pattern(/\d\d\d/, Joi.alternatives(Joi.object(), Joi.array(), Joi.func()).allow(true, false)) | ||
}) | ||
@@ -158,6 +158,6 @@ .without('modify', 'sample') | ||
validate: Joi.object({ | ||
headers: Joi.alternatives(Joi.object(), Joi.func()).allow(null, false, true), | ||
params: Joi.alternatives(Joi.object(), Joi.func()).allow(null, false, true), | ||
query: Joi.alternatives(Joi.object(), Joi.func()).allow(null, false, true), | ||
payload: Joi.alternatives(Joi.object(), Joi.func()).allow(null, false, true), | ||
headers: Joi.alternatives(Joi.object(), Joi.array(), Joi.func()).allow(null, false, true), | ||
params: Joi.alternatives(Joi.object(), Joi.array(), Joi.func()).allow(null, false, true), | ||
query: Joi.alternatives(Joi.object(), Joi.array(), Joi.func()).allow(null, false, true), | ||
payload: Joi.alternatives(Joi.object(), Joi.array(), Joi.func()).allow(null, false, true), | ||
failAction: [ | ||
@@ -164,0 +164,0 @@ Joi.string().valid('error', 'log', 'ignore'), |
{ | ||
"name": "hapi", | ||
"version": "13.4.0", | ||
"version": "13.4.1", | ||
"dependencies": { | ||
@@ -9,18 +9,18 @@ "accept": { | ||
"ammo": { | ||
"version": "2.0.0" | ||
"version": "2.0.1" | ||
}, | ||
"boom": { | ||
"version": "3.1.3" | ||
"version": "3.2.0" | ||
}, | ||
"call": { | ||
"version": "3.0.0" | ||
"version": "3.0.1" | ||
}, | ||
"catbox": { | ||
"version": "7.1.0" | ||
"version": "7.1.1" | ||
}, | ||
"catbox-memory": { | ||
"version": "2.0.1" | ||
"version": "2.0.2" | ||
}, | ||
"cryptiles": { | ||
"version": "3.0.0" | ||
"version": "3.0.1" | ||
}, | ||
@@ -34,3 +34,3 @@ "heavy": { | ||
"iron": { | ||
"version": "4.0.0" | ||
"version": "4.0.1" | ||
}, | ||
@@ -44,3 +44,3 @@ "items": { | ||
"isemail": { | ||
"version": "2.1.0" | ||
"version": "2.1.2" | ||
}, | ||
@@ -53,6 +53,6 @@ "moment": { | ||
"kilt": { | ||
"version": "2.0.0" | ||
"version": "2.0.1" | ||
}, | ||
"mimos": { | ||
"version": "3.0.0", | ||
"version": "3.0.1", | ||
"dependencies": { | ||
@@ -65,3 +65,3 @@ "mime-db": { | ||
"peekaboo": { | ||
"version": "2.0.0" | ||
"version": "2.0.1" | ||
}, | ||
@@ -72,6 +72,6 @@ "shot": { | ||
"statehood": { | ||
"version": "4.0.0" | ||
"version": "4.0.1" | ||
}, | ||
"subtext": { | ||
"version": "4.0.1", | ||
"version": "4.0.3", | ||
"dependencies": { | ||
@@ -82,9 +82,9 @@ "content": { | ||
"pez": { | ||
"version": "2.1.0", | ||
"version": "2.1.1", | ||
"dependencies": { | ||
"b64": { | ||
"version": "3.0.0" | ||
"version": "3.0.1" | ||
}, | ||
"nigel": { | ||
"version": "2.0.0", | ||
"version": "2.0.1", | ||
"dependencies": { | ||
@@ -99,3 +99,3 @@ "vise": { | ||
"wreck": { | ||
"version": "7.2.0" | ||
"version": "7.2.1" | ||
} | ||
@@ -105,5 +105,5 @@ } | ||
"topo": { | ||
"version": "2.0.0" | ||
"version": "2.0.1" | ||
} | ||
} | ||
} |
@@ -5,3 +5,3 @@ { | ||
"homepage": "http://hapijs.com", | ||
"version": "13.4.0", | ||
"version": "13.4.1", | ||
"repository": { | ||
@@ -43,5 +43,5 @@ "type": "git", | ||
"devDependencies": { | ||
"code": "2.x.x", | ||
"code": "3.x.x", | ||
"handlebars": "4.x.x", | ||
"inert": "3.x.x", | ||
"inert": "4.x.x", | ||
"lab": "10.x.x", | ||
@@ -48,0 +48,0 @@ "vision": "4.x.x", |
@@ -5,3 +5,3 @@ <img src="https://raw.github.com/hapijs/hapi/master/images/hapi.png" /> | ||
<a href="https://sideway.com"><img src="http://blog.sideway.com/wp-content/uploads/logo-300x114.png" align="right" /></a> | ||
<a href="https://sideway.com"><img src="https://www.sideway.com/sideway.png" align="right" /></a> | ||
@@ -17,5 +17,5 @@ Lead Maintainer: [Eran Hammer](https://github.com/hueniverse) | ||
Development version: **13.4.x** ([release notes](https://github.com/hapijs/hapi/issues?labels=release+notes&page=1&state=closed)) | ||
[![Build Status](https://secure.travis-ci.org/hapijs/hapi.svg)](http://travis-ci.org/hapijs/hapi) | ||
[![Build Status](https://secure.travis-ci.org/hapijs/hapi.svg?branch=master)](http://travis-ci.org/hapijs/hapi) | ||
For the latest updates, [change log](http://hapijs.com/updates), and release information visit [hapijs.com](http://hapijs.com) and follow [@hapijs](https://twitter.com/hapijs) on twitter. If you have questions, please open an issue in the | ||
[discussion forum](https://github.com/hapijs/discuss). |
@@ -53,3 +53,3 @@ 'use strict'; | ||
server.connection({ labels: ['a', 'b', 'a', 'c', 'b'] }); | ||
expect(server.connections[0].settings.labels).to.deep.equal(['a', 'b', 'c']); | ||
expect(server.connections[0].settings.labels).to.equal(['a', 'b', 'c']); | ||
done(); | ||
@@ -590,4 +590,3 @@ }); | ||
expect(err).to.not.exist(); | ||
expect(timer.elapsed()).to.be.at.least(9); | ||
expect(timer.elapsed()).to.be.at.most(19); | ||
expect(timer.elapsed()).to.be.between(9, 19); | ||
done(); | ||
@@ -1639,4 +1638,4 @@ }); | ||
expect(route.path).to.equal('/'); | ||
expect(connection.settings.labels).to.deep.equal(['a']); | ||
expect(srv).to.equal(server); | ||
expect(connection.settings.labels).to.equal(['a']); | ||
expect(srv).to.shallow.equal(server); | ||
done(); | ||
@@ -1753,3 +1752,3 @@ }); | ||
expect(res5.payload).to.equal('delete'); | ||
expect(config.method).to.deep.equal(['GET', 'PUT', 'POST', 'DELETE']); | ||
expect(config.method).to.equal(['GET', 'PUT', 'POST', 'DELETE']); | ||
done(); | ||
@@ -1811,3 +1810,3 @@ }); | ||
expect(table).to.have.length(6); | ||
expect(paths).to.only.deep.include([ | ||
expect(paths).to.only.include([ | ||
{ method: 'get', path: '/api/products' }, | ||
@@ -1814,0 +1813,0 @@ { method: 'get', path: '/api/products/{id}' }, |
@@ -141,6 +141,6 @@ 'use strict'; | ||
server.register(Inert, Hoek.ignore); | ||
server.connection({ routes: { files: { relativeTo: __dirname } } }); | ||
server.connection({ routes: { files: { relativeTo: Path.join(__dirname, '../') } } }); | ||
const handler = function (request, reply) { | ||
return reply.file('../package.json').code(499); | ||
return reply.file('./package.json').code(499); | ||
}; | ||
@@ -507,3 +507,3 @@ | ||
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' }); | ||
expect(res.result).to.equal({ id: '5', name: 'Bob' }); | ||
done(); | ||
@@ -541,3 +541,3 @@ }); | ||
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' }); | ||
expect(res.result).to.equal({ id: '5', name: 'Bob' }); | ||
done(); | ||
@@ -578,3 +578,3 @@ }); | ||
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' }); | ||
expect(res.result).to.equal({ id: '5', name: 'Bob' }); | ||
done(); | ||
@@ -653,3 +653,3 @@ }); | ||
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' }); | ||
expect(res.result).to.equal({ id: '5', name: 'Bob' }); | ||
done(); | ||
@@ -687,3 +687,3 @@ }); | ||
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' }); | ||
expect(res.result).to.equal({ id: '5', name: 'Bob' }); | ||
done(); | ||
@@ -721,3 +721,3 @@ }); | ||
expect(res.result).to.deep.equal({ name: 'Bob' }); | ||
expect(res.result).to.equal({ name: 'Bob' }); | ||
done(); | ||
@@ -755,3 +755,3 @@ }); | ||
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' }); | ||
expect(res.result).to.equal({ id: '5', name: 'Bob' }); | ||
done(); | ||
@@ -789,3 +789,3 @@ }); | ||
expect(res.result).to.deep.equal({ name: 'Bob' }); | ||
expect(res.result).to.equal({ name: 'Bob' }); | ||
done(); | ||
@@ -1050,3 +1050,3 @@ }); | ||
expect(res.result[0].tags).to.deep.equal(['pre', 'method', 'user']); | ||
expect(res.result[0].tags).to.equal(['pre', 'method', 'user']); | ||
expect(res.result[0].internal).to.equal(true); | ||
@@ -1146,3 +1146,3 @@ expect(res.result[0].data.msec).to.exist(); | ||
expect(res.result).to.deep.equal({}); | ||
expect(res.result).to.equal({}); | ||
done(); | ||
@@ -1174,3 +1174,3 @@ }); | ||
expect(res.result).to.deep.equal({ x: 1 }); | ||
expect(res.result).to.equal({ x: 1 }); | ||
done(); | ||
@@ -1205,3 +1205,3 @@ }); | ||
expect(res.result).to.deep.equal({ x: 'get' }); | ||
expect(res.result).to.equal({ x: 'get' }); | ||
done(); | ||
@@ -1208,0 +1208,0 @@ }); |
@@ -203,3 +203,3 @@ 'use strict'; | ||
expect(res.result).to.deep.equal({ id: '5', name: 'Bob' }); | ||
expect(res.result).to.equal({ id: '5', name: 'Bob' }); | ||
done(); | ||
@@ -206,0 +206,0 @@ }); |
@@ -125,6 +125,4 @@ 'use strict'; | ||
const req = Http.request(options, (res) => { | ||
const req = Http.request(options, (res) => { }); | ||
}); | ||
req.write('Hello\n'); | ||
@@ -136,3 +134,3 @@ | ||
expect(err.code).to.equal('ECONNRESET'); | ||
server.stop(done); | ||
server.stop({ timeout: 10 }, done); | ||
}); | ||
@@ -143,3 +141,3 @@ | ||
req.abort(); | ||
}, 15); | ||
}, 50); | ||
}); | ||
@@ -268,3 +266,3 @@ }); | ||
expect(res.result).to.exist(); | ||
expect(res.result).to.deep.equal(message); | ||
expect(res.result).to.equal(message); | ||
done(); | ||
@@ -285,3 +283,3 @@ }); | ||
Fs.unlinkSync(request.payload.path); | ||
expect(receivedContents).to.deep.equal(sourceContents); | ||
expect(receivedContents).to.equal(sourceContents); | ||
return reply(request.payload.bytes); | ||
@@ -387,3 +385,3 @@ }; | ||
expect(res.statusCode).to.equal(200); | ||
expect(res.result).to.deep.equal(null); | ||
expect(res.result).to.equal(null); | ||
done(); | ||
@@ -390,0 +388,0 @@ }); |
@@ -621,3 +621,3 @@ 'use strict'; | ||
expect(res.statusCode).to.equal(200); | ||
expect(res.result).to.deep.equal({ | ||
expect(res.result).to.equal({ | ||
m1: null, | ||
@@ -624,0 +624,0 @@ m2: null |
@@ -331,3 +331,3 @@ 'use strict'; | ||
expect(res.result).to.deep.equal({}); | ||
expect(res.result).to.equal({}); | ||
done(); | ||
@@ -350,3 +350,3 @@ }); | ||
expect(res.result).to.deep.equal({}); | ||
expect(res.result).to.equal({}); | ||
done(); | ||
@@ -672,3 +672,3 @@ }); | ||
expect(errs).to.equal(1); | ||
expect(req.getLog('error')[1].tags).to.deep.equal(['internal', 'error']); | ||
expect(req.getLog('error')[1].tags).to.equal(['internal', 'error']); | ||
done(); | ||
@@ -703,3 +703,3 @@ }); | ||
expect(errs).to.equal(1); | ||
expect(req.getLog('error')[0].tags).to.deep.equal(['internal', 'implementation', 'error']); | ||
expect(req.getLog('error')[0].tags).to.equal(['internal', 'implementation', 'error']); | ||
done(); | ||
@@ -1064,3 +1064,3 @@ }); | ||
expect(event.internal).to.be.false(); | ||
expect(tags).to.deep.equal({ test: true }); | ||
expect(tags).to.equal({ test: true }); | ||
return reply(); | ||
@@ -1067,0 +1067,0 @@ }); |
@@ -5,2 +5,3 @@ 'use strict'; | ||
const Path = require('path'); | ||
const Stream = require('stream'); | ||
@@ -74,3 +75,3 @@ const Boom = require('boom'); | ||
expect(res.headers['content-type']).to.equal('text/plain; something=something, charset=ISO-8859-1'); | ||
expect(res.headers['set-cookie']).to.deep.equal(['abc=123', 'sid=YWJjZGVmZzEyMzQ1Ng==', 'other=something; Secure', 'x=; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT', 'test=123', 'empty=; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/path', 'always=present']); | ||
expect(res.headers['set-cookie']).to.equal(['abc=123', 'sid=YWJjZGVmZzEyMzQ1Ng==', 'other=something; Secure', 'x=; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT', 'test=123', 'empty=; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/path', 'always=present']); | ||
expect(res.headers.vary).to.equal('x-control'); | ||
@@ -170,3 +171,3 @@ expect(res.headers.combo).to.equal('o-k'); | ||
expect(res.statusCode).to.equal(200); | ||
expect(res.headers['set-cookie']).to.deep.equal(['A', 'B']); | ||
expect(res.headers['set-cookie']).to.equal(['A', 'B']); | ||
done(); | ||
@@ -286,3 +287,3 @@ }); | ||
expect(res.result).to.deep.equal({ a: 1 }); | ||
expect(res.result).to.equal({ a: 1 }); | ||
expect(res.statusCode).to.equal(201); | ||
@@ -354,3 +355,3 @@ expect(res.headers.location).to.equal('/special'); | ||
expect(res.statusCode).to.equal(200); | ||
expect(res.headers['set-cookie']).to.deep.equal(['session=; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Secure; Path=/unset']); | ||
expect(res.headers['set-cookie']).to.equal(['session=; Max-Age=0; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Secure; Path=/unset']); | ||
done(); | ||
@@ -742,3 +743,3 @@ }); | ||
expect(res.headers.xcustom).to.equal('other value'); | ||
expect(res.headers['set-cookie']).to.deep.equal(['a=1', 'b=2']); | ||
expect(res.headers['set-cookie']).to.equal(['a=1', 'b=2']); | ||
done(); | ||
@@ -815,6 +816,6 @@ }); | ||
server.register(Inert, Hoek.ignore); | ||
server.connection({ routes: { files: { relativeTo: __dirname } } }); | ||
server.connection({ routes: { files: { relativeTo: Path.join(__dirname, '../') } } }); | ||
const handler = function (request, reply) { | ||
return reply.file('../LICENSE').type('application/example'); | ||
return reply.file('./LICENSE').type('application/example'); | ||
}; | ||
@@ -821,0 +822,0 @@ |
@@ -5,2 +5,3 @@ 'use strict'; | ||
const Path = require('path'); | ||
const Code = require('code'); | ||
@@ -339,6 +340,6 @@ const Hapi = require('..'); | ||
return reply.file('../package.json'); | ||
return reply.file('./package.json'); | ||
}; | ||
server.route({ method: 'GET', path: '/file', handler: handler, config: { files: { relativeTo: __dirname } } }); | ||
server.route({ method: 'GET', path: '/file', handler: handler, config: { files: { relativeTo: Path.join(__dirname, '../') } } }); | ||
@@ -345,0 +346,0 @@ server.inject('/file', (res) => { |
@@ -513,3 +513,3 @@ 'use strict'; | ||
server.connection({ routes: { cors: { origin: ['example.com'] } } }); | ||
expect(server.connections[0].settings.routes.cors.origin).to.deep.equal(['example.com']); | ||
expect(server.connections[0].settings.routes.cors.origin).to.equal(['example.com']); | ||
done(); | ||
@@ -516,0 +516,0 @@ }); |
@@ -193,3 +193,3 @@ 'use strict'; | ||
expect(res.statusCode).to.equal(200); | ||
expect(res.headers['set-cookie']).to.deep.equal(['always=present']); | ||
expect(res.headers['set-cookie']).to.equal(['always=present']); | ||
done(); | ||
@@ -214,3 +214,3 @@ }); | ||
expect(res.statusCode).to.equal(200); | ||
expect(res.headers['set-cookie']).to.deep.equal(['onecookie=yes', 'twocookie=no', 'always=present']); | ||
expect(res.headers['set-cookie']).to.equal(['onecookie=yes', 'twocookie=no', 'always=present']); | ||
done(); | ||
@@ -240,3 +240,3 @@ }); | ||
expect(res.statusCode).to.equal(200); | ||
expect(res.headers['set-cookie']).to.deep.equal(['always=sweet']); | ||
expect(res.headers['set-cookie']).to.equal(['always=sweet']); | ||
done(); | ||
@@ -286,3 +286,3 @@ }); | ||
expect(res.statusCode).to.equal(200); | ||
expect(res.headers['set-cookie']).to.deep.equal(['a=b']); | ||
expect(res.headers['set-cookie']).to.equal(['a=b']); | ||
done(); | ||
@@ -289,0 +289,0 @@ }); |
@@ -548,3 +548,3 @@ 'use strict'; | ||
expect(res.statusCode).to.equal(400); | ||
expect(res.result.validation).to.deep.equal({ | ||
expect(res.result.validation).to.equal({ | ||
source: 'query', | ||
@@ -613,3 +613,3 @@ keys: ['a'] | ||
expect(res.statusCode).to.equal(200); | ||
expect(res.result.data.output.payload.message).to.deep.equal('child "a" fails because ["a" length must be at least 2 characters long]'); | ||
expect(res.result.data.output.payload.message).to.equal('child "a" fails because ["a" length must be at least 2 characters long]'); | ||
done(); | ||
@@ -708,3 +708,3 @@ }); | ||
expect(res.statusCode).to.equal(400); | ||
expect(res.result).to.deep.equal({ | ||
expect(res.result).to.equal({ | ||
statusCode: 400, | ||
@@ -747,3 +747,3 @@ error: 'Bad Request', | ||
expect(res.statusCode).to.equal(400); | ||
expect(res.result.validation).to.deep.equal({ | ||
expect(res.result.validation).to.equal({ | ||
source: 'payload', | ||
@@ -862,3 +862,3 @@ keys: ['a'] | ||
expect(res.statusCode).to.equal(400); | ||
expect(res.result.validation).to.deep.equal({ | ||
expect(res.result.validation).to.equal({ | ||
source: 'payload', | ||
@@ -1101,3 +1101,3 @@ keys: ['value'] | ||
expect(res.statusCode).to.equal(200); | ||
expect(res.result).to.deep.equal({ a: 1 }); | ||
expect(res.result).to.equal({ a: 1 }); | ||
done(); | ||
@@ -1104,0 +1104,0 @@ }); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
1329452