Merge pull request #110 from hapijs/travis

Added node 6.

Author: cjihrig

.travis.yml

@@ -1,9 +1,7 @@
 language: node_js
 
 node_js:
-  - 4.0
-  - 4
-  - 5
+  - "4"
+  - "6"
 
 sudo: false
-

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 commit -a --amend --no-edit"
   },
   "license": "BSD-3-Clause"
 }

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();
         }