Add calling next for Adding next() call to prepareOutput middleware […

src/middleware/prepareOutput.js

@@ -49,10 +49,20 @@ module.exports = function (options, excludedMap) {
       if (options.postProcess) {
         if (promise && typeof promise.then === 'function') {
           promise.then(() => {
-            options.postProcess(req, res)
+            options.postProcess(req, res);
+            if (options.restify) {
+              next();
+            }
           }).catch(errorHandler(req, res, next))
         } else {
-          options.postProcess(req, res)
+          options.postProcess(req, res);
+          if (options.restify) {
+            next();
+          }
+        }
+      } else {
+        if (options.restify) {
+          next();
         }
       }
     }

test/unit/middleware/prepareOutput.js

@@ -17,6 +17,7 @@ describe('prepareOutput', () => {
     onError.reset()
     outputFn.reset()
     outputFnPromise.reset()
+    postProcess.reset()
     next.reset()
   })
 
@@ -39,23 +40,70 @@ describe('prepareOutput', () => {
     sinon.assert.notCalled(next)
   })
 
-  it('calls outputFn with default options and no post* middleware (async)', () => {
+  it('calls outputFn with default options and no post* middleware and next when restify option', () => {
     let req = {
       method: 'GET',
       erm: {}
     }
 
     let options = {
+      restify: true,
       onError: onError,
-      outputFn: outputFnPromise
+      outputFn: outputFn
     }
 
     prepareOutput(options)(req, {}, next)
 
-    sinon.assert.calledOnce(outputFnPromise)
-    sinon.assert.calledWithExactly(outputFnPromise, req, {})
+    sinon.assert.calledOnce(outputFn)
+    sinon.assert.calledWithExactly(outputFn, req, {})
     sinon.assert.notCalled(onError)
-    sinon.assert.notCalled(next)
+    sinon.assert.calledOnce(next)
+  })
+
+  it('calls outputFn with default options and no post* middleware (async)', (done) => {
+    let req = {
+      method: 'GET',
+      erm: {}
+    }
+
+    let options = {
+      onError: onError,
+      outputFn: outputFnPromise
+    }
+
+    prepareOutput(options)(req, {}, next)
+
+    outputFnPromise().then(() => {
+      sinon.assert.calledTwice(outputFnPromise)
+      sinon.assert.calledWithExactly(outputFnPromise, req, {})
+      sinon.assert.notCalled(onError)
+      sinon.assert.notCalled(next)
+      done()
+    })
+
+  })
+
+  it('calls outputFn with default options and no post* middleware and next when restify option (async)', (done) => {
+    let req = {
+      method: 'GET',
+      erm: {}
+    }
+
+    let options = {
+      restify: true,
+      onError: onError,
+      outputFn: outputFnPromise
+    }
+
+    prepareOutput(options)(req, {}, next)
+
+    outputFnPromise().then(() => {
+      sinon.assert.calledTwice(outputFnPromise)
+      sinon.assert.calledWithExactly(outputFnPromise, req, {})
+      sinon.assert.notCalled(onError)
+      sinon.assert.calledOnce(next)
+      done()
+    });
   })
 
   it('calls postProcess with default options and no post* middleware', () => {
@@ -80,25 +128,77 @@ describe('prepareOutput', () => {
     sinon.assert.notCalled(next)
   })
 
-  it('calls postProcess with default options and no post* middleware (async outputFn)', () => {
+  it('calls postProcess with default options and no post* middleware and next when restify option', () => {
     let req = {
       method: 'GET',
       erm: {}
     }
 
     let options = {
+      restify: true,
       onError: onError,
-      outputFn: outputFnPromise,
+      outputFn: outputFn,
       postProcess: postProcess
     }
 
     prepareOutput(options)(req, {}, next)
 
-    sinon.assert.calledOnce(outputFnPromise)
-    sinon.assert.calledWithExactly(outputFnPromise, req, {})
+    sinon.assert.calledOnce(outputFn)
+    sinon.assert.calledWithExactly(outputFn, req, {})
     sinon.assert.calledOnce(postProcess)
     sinon.assert.calledWithExactly(postProcess, req, {})
     sinon.assert.notCalled(onError)
-    sinon.assert.notCalled(next)
+    sinon.assert.calledOnce(next)
+  })
+
+  it('calls postProcess with default options and no post* middleware (async)', (done) => {
+    let req = {
+      method: 'GET',
+      erm: {}
+    }
+
+    let options = {
+      onError: onError,
+      outputFn: outputFnPromise,
+      postProcess: postProcess
+    }
+
+    prepareOutput(options)(req, {}, next)
+
+    outputFnPromise().then(() => {
+      sinon.assert.calledTwice(outputFnPromise)
+      sinon.assert.calledWithExactly(outputFnPromise, req, {})
+      sinon.assert.calledOnce(postProcess)
+      sinon.assert.calledWithExactly(postProcess, req, {})
+      sinon.assert.notCalled(onError)
+      sinon.assert.notCalled(next)
+      done()
+    });
+  })
+
+  it('calls postProcess with default options and no post* middleware and next with restify option (async)', (done) => {
+    let req = {
+      method: 'GET',
+      erm: {}
+    }
+
+    let options = {
+      restify: true,
+      onError: onError,
+      outputFn: outputFnPromise,
+      postProcess: postProcess
+    }
+
+    prepareOutput(options)(req, {}, next)
+
+    outputFnPromise().then(() => {
+      sinon.assert.calledTwice(outputFnPromise)
+      sinon.assert.calledWithExactly(outputFnPromise, req, {})
+      sinon.assert.calledOnce(postProcess)
+      sinon.assert.calledWithExactly(postProcess, req, {})
+      sinon.assert.notCalled(onError)
+      sinon.assert.calledOnce(next)
+      done()
+    });
   })
 })