fix Automattic/mongoose#2553 - use null instead of undefined for err

mongoosejs · Jan 4, 2015 · 9157b48 · 9157b48
1 parent 92c12a7
commit 9157b48
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/index.js b/index.js
@@ -15,7 +15,7 @@ Kareem.prototype.execPre = function(name, context, callback) {
 
   if (!numPres) {
     return process.nextTick(function() {
-      callback();
+      callback(null);
     });
   }
 
@@ -50,8 +50,8 @@ Kareem.prototype.execPre = function(name, context, callback) {
           }
 
           if (0 === --numAsyncPres) {
-            return callback();
-          } 
+            return callback(null);
+          }
         });
     } else if (pre.fn.length > 0) {
       pre.fn.call(context, function(error) {
@@ -68,7 +68,7 @@ Kareem.prototype.execPre = function(name, context, callback) {
             // Leave parallel hooks to run
             return;
           } else {
-            return callback();
+            return callback(null);
           }
         }
 
@@ -82,7 +82,7 @@ Kareem.prototype.execPre = function(name, context, callback) {
           return;
         } else {
           return process.nextTick(function() {
-            callback()
+            callback(null);
           });
         }
       }
@@ -100,7 +100,7 @@ Kareem.prototype.execPost = function(name, context, args, callback) {
 
   if (!numPosts) {
     return process.nextTick(function() {
-      callback.apply(null, [undefined].concat(args));
+      callback.apply(null, [null].concat(args));
     });
   }
 
@@ -114,7 +114,7 @@ Kareem.prototype.execPost = function(name, context, args, callback) {
         }
 
         if (++currentPost >= numPosts) {
-          return callback.apply(null, [undefined].concat(args));
+          return callback.apply(null, [null].concat(args));
         }
 
         next();
@@ -123,7 +123,7 @@ Kareem.prototype.execPost = function(name, context, args, callback) {
       post.apply(context, args);
 
       if (++currentPost >= numPosts) {
-        return callback.apply(null, [undefined].concat(args));
+        return callback.apply(null, [null].concat(args));
       }
 
       next();

diff --git a/test/examples.test.js b/test/examples.test.js
@@ -74,7 +74,8 @@ describe('pre hooks', function() {
       ++count2;
     });
 
-    hooks.execPre('cook', null, function() {
+    hooks.execPre('cook', null, function(error) {
+      assert.equal(null, error);
       assert.equal(1, count1);
       assert.equal(1, count2);
       done();
@@ -97,7 +98,8 @@ describe('pre hooks', function() {
     var obj = { bacon: 0, eggs: 0 };
 
     // In the pre hooks, `this` will refer to `obj`
-    hooks.execPre('cook', obj, function() {
+    hooks.execPre('cook', obj, function(error) {
+      assert.equal(null, error);
       assert.equal(3, obj.bacon);
       assert.equal(4, obj.eggs);
       done();
@@ -240,6 +242,7 @@ describe('wrap()', function() {
     var args = [obj];
     args.push(function(error, result) {
       assert.ifError(error);
+      assert.equal(null, error);
       assert.equal(3, obj.bacon);
       assert.equal(4, obj.eggs);
       assert.equal(false, obj.waffles);