Merge d5a8046 into 957929e

nestjs · Jan 13, 2018 · a76cf00 · a76cf00
2 parents 957929e + d5a8046
commit a76cf00
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/core/router/router-execution-context.ts b/src/core/router/router-execution-context.ts
@@ -97,7 +97,7 @@ export class RouterExecutionContext {
         callback,
         handler,
       );
-      isResponseHandled && this.responseController.apply(result, res, httpStatusCode)
+      !isResponseHandled && this.responseController.apply(result, res, httpStatusCode)
     };
   }
 

diff --git a/src/core/test/router/router-execution-context.spec.ts b/src/core/test/router/router-execution-context.spec.ts
@@ -52,7 +52,6 @@ describe('RouterExecutionContext', () => {
       let exchangeKeysForValuesSpy: sinon.SinonSpy;
       beforeEach(() => {
         metadata = {
-          [RouteParamtypes.NEXT]: { index: 0 },
           [RouteParamtypes.BODY]: {
             index: 2,
             data: 'test',
@@ -91,12 +90,7 @@ describe('RouterExecutionContext', () => {
           expect(proxyContext).to.be.a('function');
         });
         describe('when proxy function called', () => {
-          let request;
-          const response = {
-            status: () => response,
-            send: () => response,
-            json: () => response,
-          };
+          let request, response, jsonSpy, sendSpy, statusStub;
           const next = {};
 
           beforeEach(() => {
@@ -105,12 +99,24 @@ describe('RouterExecutionContext', () => {
                 test: 3,
               },
             };
+            jsonSpy = sinon.stub().returns({});
+            sendSpy = sinon.stub().returns({});
+            statusStub = sinon.stub().returns({
+              json: jsonSpy,
+              send: sendSpy
+            });
+            response = {
+              status: statusStub
+            };
           });
           it('should apply expected context and arguments to callback', done => {
             proxyContext(request, response, next).then(() => {
-              const args = [next, null, request.body.test];
+              const args = [null, null, request.body.test];
               expect(applySpy.called).to.be.true;
               expect(applySpy.calledWith(instance, args)).to.be.true;
+              expect(statusStub.called).to.be.true;
+              expect(jsonSpy.called).to.be.true;
+              expect(sendSpy.called).to.be.false;
               done();
             });
           });