From 18e27fdbbb48e6303899aed6260a20ced265243d Mon Sep 17 00:00:00 2001 From: Adam Bretz Date: Fri, 6 May 2016 09:52:39 -0400 Subject: [PATCH 1/2] Added node 6. --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 909f796..c8301bf 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ language: node_js node_js: - - 4.0 - - 4 - - 5 + - "4" + - "6" sudo: false - From 301b7b992102d30c2e2f3f383a1679e6de6f7f1d Mon Sep 17 00:00:00 2001 From: Adam Bretz Date: Fri, 6 May 2016 10:27:48 -0400 Subject: [PATCH 2/2] Updates for node 6 --- package.json | 8 ++++---- test/index.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b937d51..86f2ce3 100644 --- a/package.json +++ b/package.json @@ -12,18 +12,18 @@ "node": ">=4.0.0" }, "dependencies": { - "hoek": "3.x.x" + "hoek": "4.x.x" }, "devDependencies": { "code": "2.x.x", - "lab": "7.x.x", - "markdown-toc": "0.11.x" + "lab": "10.x.x", + "markdown-toc": "0.12.x" }, "scripts": { "test": "lab -a code -t 100 -L", "test-cov-html": "lab -a code -r html -o coverage.html -L", "toc": "node generate-toc.js", - "version": "npm run toc && git add README.md" + "postversion": "npm run toc && git add README.md" }, "license": "BSD-3-Clause" } diff --git a/test/index.js b/test/index.js index 8660b1f..dd3e0d9 100755 --- a/test/index.js +++ b/test/index.js @@ -582,11 +582,11 @@ describe('internal()', () => { it('returns an error with composite message', (done) => { try { - JSON.parse('{'); + x.foo(); } catch (err) { const boom = Boom.internal('Someting bad', err); - expect(boom.message).to.equal('Someting bad: Unexpected end of input'); + expect(boom.message).to.equal('Someting bad: x is not defined'); expect(boom.isServer).to.be.true(); done(); }