Merge pull request #274 from pleerock/fix/res-render

19majkel94 · web-flow · commit daa67127b2c7 · 2017-09-05T11:31:15.000+02:00
fix(ExpressDriver): use response.render to render templates
diff --git a/src/driver/express/ExpressDriver.ts b/src/driver/express/ExpressDriver.ts
@@ -235,7 +235,7 @@ export class ExpressDriver extends BaseDriver implements Driver {
         // set http status code
         if (result === undefined && action.undefinedResultCode && action.undefinedResultCode instanceof Function) {
             throw new (action.undefinedResultCode as any)(options);
-        } 
+        }
         else if (result === null) {
             if (action.nullResultCode) {
                 if (action.nullResultCode instanceof Function) {
@@ -269,7 +269,7 @@ export class ExpressDriver extends BaseDriver implements Driver {
         else if (action.renderedTemplate) { // if template is set then render it
             const renderOptions = result && result instanceof Object ? result : {};
 
-            this.express.render(action.renderedTemplate, renderOptions, (err: any, html: string) => {
+            options.response.render(action.renderedTemplate, renderOptions, (err: any, html: string) => {
                 if (err && action.isJsonTyped) {
                     return options.next(err);
 
@@ -281,7 +281,7 @@ export class ExpressDriver extends BaseDriver implements Driver {
                 }
                 options.next();
             });
-        } 
+        }
         else if (result === undefined) { // throw NotFoundError on undefined response
             const notFoundError = new NotFoundError();
             if (action.undefinedResultCode) {
diff --git a/test/functional/render-decorator.spec.ts b/test/functional/render-decorator.spec.ts
@@ -1,6 +1,7 @@
 import "reflect-metadata";
 import {Controller} from "../../src/decorator/Controller";
 import {Get} from "../../src/decorator/Get";
+import {Res} from "../../src/decorator/Res";
 import {createExpressServer, createKoaServer, getMetadataArgsStorage} from "../../src/index";
 import {assertRequest} from "./test-utils";
 import {Render} from "../../src/decorator/Render";
@@ -24,7 +25,17 @@ describe("template rendering", () => {
                     name: "Routing-controllers"
                 };
             }
-            
+
+            @Get("/locals")
+            @Render("render-test-locals-spec.html")
+            locals(@Res() res: any) {
+                res.locals.myVariable = "my-variable";
+
+                return {
+                    name: "Routing-controllers"
+                };
+            }
+
         }
     });
 
@@ -62,4 +73,16 @@ describe("template rendering", () => {
         });
     });
 
+    describe("Express should render a template with given variables and locals variables", () => {
+        assertRequest([3001], "get", "locals", response => {
+            expect(response).to.have.status(200);
+            expect(response.body).to.contain("<html>");
+            expect(response.body).to.contain("<body>");
+            expect(response.body).to.contain("Routing-controllers");
+            expect(response.body).to.contain("my-variable");
+            expect(response.body).to.contain("</body>");
+            expect(response.body).to.contain("</html>");
+        });
+    });
+
 });
diff --git a/test/resources/render-test-locals-spec.html b/test/resources/render-test-locals-spec.html
@@ -0,0 +1,8 @@
+<html>
+
+<body>
+  {{ name }}
+  {{ myVariable }}
+</body>
+
+</html>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +<html>
++
 +<body>
 +  {{ name }}
 +  {{ myVariable }}
 +</body>
++
 +</html>