fix: make error handlers handle errors in pre hooks

Re: Automattic/mongoose#4927
mongoosejs · Feb 3, 2017 · af38033 · af38033
1 parent ddc7aeb
commit af38033
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -239,8 +239,13 @@ Kareem.prototype.wrap = function(name, fn, context, args, options) {
 
   this.execPre(name, context, function(error) {
     if (error) {
-      return _handleWrapError(_this, error, name, context, argsWithoutCb,
-        options, lastArg)
+      var numCallbackParams = options.numCallbackParams || 0;
+      var nulls = [];
+      for (var i = 0; i < numCallbackParams; ++i) {
+        nulls.push(null);
+      }
+      return _handleWrapError(_this, error, name, context, nulls,
+        options, lastArg);
     }
 
     var end = (typeof lastArg === 'function' ? args.length - 1 : args.length);

diff --git a/test/wrap.test.js b/test/wrap.test.js
@@ -130,7 +130,7 @@ describe('wrap()', function() {
       done(new Error('fail'));
     });
 
-    hooks.post('cook', function(error, callback) {
+    hooks.post('cook', function(error, res, callback) {
       callback(new Error('another error occurred'));
     });
 
@@ -148,7 +148,7 @@ describe('wrap()', function() {
       },
       null,
       args,
-      { useErrorHandlers: true });
+      { useErrorHandlers: true, numCallbackParams: 1 });
   });
 
   it('error handlers with no callback', function(done) {