Cleanup validation and make it optional. Closes #75

lib/index.js

@@ -2,14 +2,52 @@
 
 // Load modules
 
+const Hoek = require('hoek');
 const Joi = require('joi');
 const Request = require('./request');
 const Response = require('./response');
-const Schema = require('./schema');
+
+
+// Declare internals
+
+const internals = {};
+
+
+internals.options = Joi.object().keys({
+    url: Joi.alternatives([
+        Joi.string(),
+        Joi.object().keys({
+            protocol: Joi.string(),
+            hostname: Joi.string(),
+            port: Joi.any(),
+            pathname: Joi.string().required(),
+            query: Joi.any()
+        })
+    ])
+        .required(),
+    headers: Joi.object(),
+    payload: Joi.any(),
+    simulate: {
+        end: Joi.boolean(),
+        split: Joi.boolean(),
+        error: Joi.boolean(),
+        close: Joi.boolean()
+    },
+    authority: Joi.string(),
+    remoteAddress: Joi.string(),
+    method: Joi.string(),
+    validate: Joi.boolean()
+});
+
 
 exports.inject = function (dispatchFunc, options, callback) {
 
-    Joi.assert({ dispatchFunc, options, callback }, Schema);
+    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);
+    }
 
     const req = new Request(options);
     const res = new Response(req, callback);

lib/request.js

@@ -18,10 +18,7 @@ exports = module.exports = internals.Request = function (options) {
 
     // options: method, url, payload, headers, remoteAddress
 
-    options = (typeof options === 'string' ? { url: options } : options);
-
     let url = options.url;
-
     if (typeof url === 'object') {
         url = Url.format(url);
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "shot",
   "description": "Injects a fake HTTP request/response into a node HTTP server",
-  "version": "3.2.1",
+  "version": "3.3.0",
   "repository": "git://github.com/hapijs/shot",
   "main": "lib/index.js",
   "keywords": [

test/index.js

@@ -760,15 +760,12 @@ describe('_read()', () => {
 
     it('errors for invalid input options', (done) => {
 
-        try {
+        expect(() => {
+
             Shot.inject({}, {}, (res) => {});
-        }
-        catch (err) {
+        }).to.throw('Invalid dispatch function');
 
-            expect(err).to.exist();
-            expect(err.isJoi).to.be.true();
-            done();
-        }
+        done();
     });
 
     it('errors for missing url', (done) => {
@@ -795,6 +792,16 @@ describe('_read()', () => {
         }
     });
 
+    it('ignores incorrect simulation object', (done) => {
+
+        expect(() => {
+
+            Shot.inject((req, res) => { }, { url: '/', simulate: 'sample string', validate: false }, (res) => { });
+        }).to.not.throw();
+
+        done();
+    });
+
     it('errors for an incorrect simulation object values', (done) => {
 
         try {