Merge pull request #87 from hapijs/async

hueniverse · web-flow · commit 00a2a82eb773 · 2017-09-23T03:06:48.000-07:00
Migrate to async/await
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: node_js
 
 node_js:
-  - "4"
-  - "6"
   - "8"
   - "node"
 
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012-2016, Project contributors
+Copyright (c) 2012-2017, Project contributors
 Copyright (c) 2012-2014, Walmart
 All rights reserved.
 
diff --git a/lib/index.js b/lib/index.js
@@ -40,19 +40,27 @@ internals.options = Joi.object().keys({
 });
 
 
-exports.inject = function (dispatchFunc, options, callback) {
+exports.inject = function (dispatchFunc, options) {
 
     options = (typeof options === 'string' ? { url: options } : options);
 
     if (options.validate !== false) {                                                           // Defaults to true
-        Hoek.assert(typeof dispatchFunc === 'function', 'Invalid dispatch function');
-        Joi.assert(options, internals.options);
+        try {
+            Hoek.assert(typeof dispatchFunc === 'function', 'Invalid dispatch function');
+            Joi.assert(options, internals.options);
+        }
+        catch (err) {
+            return Promise.reject(err);
+        }
     }
 
-    const req = new Request(options);
-    const res = new Response(req, callback);
+    return new Promise((resolve) => {
 
-    return req.prepare(() => dispatchFunc(req, res));
+        const req = new Request(options);
+        const res = new Response(req, resolve);
+
+        req.prepare(() => dispatchFunc(req, res));
+    });
 };
 
 
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shot",
   "description": "Injects a fake HTTP request/response into a node HTTP server",
-  "version": "3.4.2",
+  "version": "4.0.0",
   "repository": "git://github.com/hapijs/shot",
   "main": "lib/index.js",
   "keywords": [
@@ -11,15 +11,15 @@
     "test"
   ],
   "engines": {
-    "node": ">=4.5.0"
+    "node": ">=8.0.0"
   },
   "dependencies": {
     "hoek": "4.x.x",
-    "joi": "10.x.x"
+    "joi": "11.x.x"
   },
   "devDependencies": {
-    "code": "4.x.x",
-    "lab": "13.x.x"
+    "code": "5.x.x",
+    "lab": "14.x.x"
   },
   "scripts": {
     "test": "lab -a code -t 100 -L",
diff --git a/test/index.js b/test/index.js

-Original file line number
+Diff line change
@@ @@ -1,8 +1,6 @@ @@
 language: node_js
 node_js:
 -  - "4"
 -  - "6"
   - "8"
   - "node"
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2012-2016, Project contributors`
	`1`	`+Copyright (c) 2012-2017, Project contributors`
`2`	`2`	`Copyright (c) 2012-2014, Walmart`
`3`	`3`	`All rights reserved.`
`4`	`4`