by-property controller middleware handles rejected promises

middlewares/controllers/by-property.js

@@ -2,5 +2,7 @@ const path = require('path')
 
 module.exports = ({dir, propertyName = 'x-swagger-router-controller', delimiter}) => operation => {
     const relativePath = delimiter ? operation[propertyName].replace(delimiter, path.sep) : operation[propertyName]
-    return require(path.join(dir, relativePath))
+    const controller = require(path.join(dir, relativePath))
+    return (req, res, next) =>
+        Promise.resolve(controller(req, res, next)).catch(next)
 }

test/middlewares/controllers/by-property.spec.js

@@ -1,27 +1,58 @@
 const controller = require('../../../middlewares/controllers/by-property')
-const path = require('path')
 
 describe('Controller', () => {
 
-    it('should return middleware', () => {
+    let req, res, next
+
+    beforeEach(() => {
+        req = sinon.spy()
+        res = sinon.spy()
+        next = sinon.spy()
+    })
+
+    it('should build middleware', done => {
+        // given
+        const operation = {'x-swagger-router-controller': 'example'}
+        const middleware = controller({dir: __dirname})(operation)
+
+        // when
+        const result = middleware(req, res, next)
+
+        // then
+        result.then(({req: reqArg, res: resArg, next: nextArg}) => {
+            expect(reqArg).to.eql(req)
+            expect(resArg).to.eql(res)
+            expect(nextArg).to.eql(next)
+        }).then(done)
+    })
+
+    it('should build middleware from nested file', done => {
         // given
-        const operation = {'x-swagger-router-controller': 'package'}
+        const operation = {'x-swagger-router-controller': 'dir.example'}
+        const middleware = controller({dir: __dirname, delimiter: /\./g})(operation)
 
         // when
-        const middleware = controller({dir: path.join(__dirname, '../../..')})(operation)
+        const result = middleware(req, res, next)
 
         // then
-        expect(middleware).to.equal(require('../../../package'))
+        result.then(({req: reqArg, res: resArg, next: nextArg}) => {
+            expect(reqArg).to.eql(req)
+            expect(resArg).to.eql(res)
+            expect(nextArg).to.eql(next)
+        }).then(done)
     })
 
-    it('should return middleware', () => {
+    it('should pass errors from rejected Promises to next', done => {
         // given
-        const operation = {'x-swagger-router-controller': 'test.globals'}
+        const operation = {'x-swagger-router-controller': 'rejected-promise-controller'}
+        const middleware = controller({dir: __dirname})(operation)
 
         // when
-        const middleware = controller({dir: path.join(__dirname, '../../..'), delimiter: /\./g})(operation)
+        const result = middleware(req, res, next)
 
         // then
-        expect(middleware).to.equal(require('../../globals'))
+        result.then(() => {
+            expect(next.calledOnceWith(sinon.match.instanceOf(Error))).to.be.true
+        }).then(done)
     })
 })

test/middlewares/controllers/dir/example.js

@@ -0,0 +1,3 @@
+const example = require('../example')
+
+module.exports = example

test/middlewares/controllers/example.js

@@ -0,0 +1 @@
+module.exports = (req, res, next) => ({req, res, next})

test/middlewares/controllers/rejected-promise-controller.js

@@ -0,0 +1 @@
+module.exports = () => Promise.reject(new Error())