Merge pull request #363 from strongloop/fix/promise-hooks

Fix support for hooks returning a Promise
strongloop · Oct 4, 2016 · dc6e8c7 · dc6e8c7
2 parents 0f7b264 + 39a75c8
commit dc6e8c7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/remote-objects.js b/lib/remote-objects.js
@@ -483,7 +483,7 @@ RemoteObjects.prototype.execHooks = function(when, method, scope, ctx, next) {
       try {
         var result = cur.call(scope, ctx, execStack, method);
         if (result && typeof result.then === 'function') {
-          result.then(function() { next(); }, next);
+          result.then(function() { execStack(); }, next);
         }
       } catch (err) {
         next(err);

diff --git a/test/rest.test.js b/test/rest.test.js
@@ -1905,13 +1905,21 @@ describe('strong-remoting-rest', function() {
 
     it('should resolve promise returned by a hook', function(done) {
       var method = givenSharedPrototypeMethod();
+      var hooksCalled = [];
       objects.before('**', function(ctx) {
-        return new Promise(function(resolve, reject) {
-          resolve('value-to-ignore');
-        });
+        hooksCalled.push('first');
+        return Promise.resolve();
+      });
+      objects.before('**', function(ctx) {
+        hooksCalled.push('second');
+        return Promise.resolve();
       });
 
-      json(method.url).expect(204).end(done);
+      json(method.url).expect(204, function(err, res) {
+        if (err) return done(err);
+        expect(hooksCalled).to.eql(['first', 'second']);
+        return done();
+      });
     });
 
     it('should handle rejected promise returned by a hook', function(done) {