Removed last error handler fallback, which makes the error handler th…

…e target method. Instead just throw an error if you get to that point.
bnoguchi · Jun 14, 2011 · c145d60 · c145d60
1 parent 5459a55
commit c145d60
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/hooks.js b/hooks.js
@@ -91,7 +91,6 @@ module.exports = {
         if (errorCb) return errorCb(err);
         if ('function' == typeof lastArg)
           return lastArg(err);
-        if (fn.length > 0) return fn.call(self, err);
         throw err;
       }
       return _next.apply(this, arguments);

diff --git a/test.js b/test.js
@@ -208,7 +208,7 @@ module.exports = {
     counter.should.equal(1);
     should.deepEqual(undefined, a.value);
   },
-  'should fall back last to the hook method as the error handler': function () {
+  'should fall back last to throwing the error': function () {
     var A = function () {};
     _.extend(A, hooks);
     var counter = 0;
@@ -220,26 +220,16 @@ module.exports = {
       next(new Error());
     });
     var a = new A();
-    a.save();
+    var didCatch = false;
-    counter.should.equal(1);
+    try {
-    assert.equal(typeof a.value, 'undefined');
+      a.save();
-  },
+    } catch (e) {
-  'should have access to the object scope when falling back last to the hook method as the error handler': function () {
+      didCatch = true;
-    var A = function () {
+      e.should.be.an.instanceof(Error);
-      this.counter = 0;
+      counter.should.equal(0);
-    };
+      assert.equal(typeof a.value, 'undefined');
-    _.extend(A, hooks);
+    }
-    A.hook('save', function (err) {
+    didCatch.should.be.true;
-      if (err instanceof Error) return this.counter++;
-      this.value = 1;
-    });
-    A.pre('save', true, function (next, done) {
-      next(new Error());
-    });
-    var a = new A();
-    a.save();
-    a.counter.should.equal(1);
-    assert.equal(typeof a.value, 'undefined');
   },
   "should proceed without mutating arguments if `next(null)` is called in a serial pre, and the last argument of the target method is a callback with node-like signature function (err, obj) {...} or function (err) {...}": function () {
     var A = function () {};