Correctly chain finally on on-error

Author: SkippyZA

src/utils/run-handler-with-middleware.js

@@ -41,8 +41,11 @@ export default function runHandlerWithMiddleware (fn, cb, responseObject, regist
     const runPostExecute = processPluginsForEvent(PluginHook.POST_EXECUTE)
     const runError = processPluginsForEvent(PluginHook.ON_ERROR)
     const runFinally = () => {
-      processPluginsForEvent(PluginHook.FINALLY)
-      delete global.CONTEXT
+      return processPluginsForEvent(PluginHook.FINALLY)()
+        .then(res => {
+          delete global.CONTEXT
+          return res
+        })
     }
 
     // Execute the middleware stack using the above request and response
@@ -57,13 +60,15 @@ export default function runHandlerWithMiddleware (fn, cb, responseObject, regist
       // Execute the callback
       .then(
         () => {
-          runFinally()
-          cb(null, responseObject, callback)
+          return Promise.resolve()
+            .then(() => runFinally())
+            .then(() => cb(null, responseObject, callback))
         },
         err => {
-          runError(err)
-          runFinally()
-          cb(err, responseObject, callback)
+          return Promise.resolve()
+            .then(() => runError(err))
+            .then(() => runFinally())
+            .then(() => cb(err, responseObject, callback))
         }
       )
   }

test/unit/utils/compose-middleware.spec.js

@@ -42,5 +42,23 @@ describe('compose middleware', () => {
           executionCount.should.equal(2)
         })
     })
+
+    it('should reject the promise if middleware throws an error', () => {
+      const middlewareA = (req, res, done) => {
+        req.should.equal('hello')
+        res.should.equal('world')
+        throw new Error('test-error')
+      }
+
+      const middleware = [ middlewareA ]
+
+      return composeMiddleware(middleware)('hello', 'world')
+        .then(() => {
+          throw new Error('Test expected to fail')
+        })
+        .catch(err => {
+          err.message.should.equal('test-error')
+        })
+    })
   })
 })