fix: error message detail does not appear in default and custom error…

… pages Fixes #111
activescott · Sep 26, 2021 · 4bd01a2 · 4bd01a2
1 parent 84cc787
commit 4bd01a2
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 32 deletions.
diff --git a/src/StaticFileHandler.js b/src/StaticFileHandler.js
@@ -175,7 +175,11 @@ class StaticFileHandler {
    */
   async responseAsError(errorText, statusCode) {
     const context = {
-      errorText: errorText,
+      staticFileHandler: {
+        viewData: {
+          errorText: errorText,
+        },
+      },
     }
     if (this.customErrorPagePath) {
       let filePath = path.join(this.clientFilesPath, this.customErrorPagePath)
@@ -199,7 +203,7 @@ class StaticFileHandler {
   </head>
 
   <body>
-    {errorText}
+    {{errorText}}
   </body>
 </html>
 `

diff --git a/src/test/StaticFileHandler.js b/src/test/StaticFileHandler.js
@@ -131,37 +131,59 @@ describe("StaticFileHandler", function () {
       })
     })
 
-    it("should return 404 when no path parameters", function () {
-      const event = mockEvent({ path: "doesntexist.404" })
-      let h = new StaticFileHandler(STATIC_FILES_PATH)
-      const response = h.get(event, null)
-      return expect(response)
-        .to.eventually.haveOwnProperty("statusCode")
-        .that.equals(404)
-    })
+    describe("error response", function () {
+      it("should include viewData in default error page", function () {
+        const event = mockEvent({ path: "doesntexist.404" })
+        let h = new StaticFileHandler(STATIC_FILES_PATH)
+        const response = h.get(event, null)
+        // the default error page mentions page name and "does not exist"
+        return expect(response)
+          .to.eventually.haveOwnProperty("body")
+          .that.matches(/doesntexist\.404 does not exist/)
+      })
 
-    it("should return 404 customErrorPagePath is invalid", function () {
-      const event = mockEvent({ path: "doesntexist.404" })
-      let h = new StaticFileHandler(
-        STATIC_FILES_PATH,
-        "error-page-doesnt-exist-either.html"
-      )
-      const response = h.get(event, null)
-      return expect(response)
-        .to.eventually.haveOwnProperty("statusCode")
-        .that.equals(404)
-    })
+      it("should include viewData in custom error page", function () {
+        const event = mockEvent({ path: "doesntexist.404" })
+        let h = new StaticFileHandler(STATIC_FILES_PATH, "custom-error.html")
+        const response = h.get(event, null)
+        // the default error page mentions page name and "does not exist"
+        return expect(response)
+          .to.eventually.haveOwnProperty("body")
+          .that.matches(/doesntexist\.404 does not exist/)
+      })
 
-    it("should use customErrorPagePath", async function () {
-      const event = mockEvent({ path: "doesntexist.404" })
-      let h = new StaticFileHandler(STATIC_FILES_PATH, "custom-error.html")
-      const response = h.get(event, null)
-      expect(response)
-        .to.eventually.haveOwnProperty("statusCode")
-        .that.equals(404)
-      return expect(response)
-        .to.eventually.haveOwnProperty("body")
-        .that.matches(/<title>CUSTOM<\/title>/)
+      it("should return 404 when no path parameters", function () {
+        const event = mockEvent({ path: "doesntexist.404" })
+        let h = new StaticFileHandler(STATIC_FILES_PATH)
+        const response = h.get(event, null)
+        return expect(response)
+          .to.eventually.haveOwnProperty("statusCode")
+          .that.equals(404)
+      })
+
+      it("should return 404 customErrorPagePath is invalid", function () {
+        const event = mockEvent({ path: "doesntexist.404" })
+        let h = new StaticFileHandler(
+          STATIC_FILES_PATH,
+          "error-page-doesnt-exist-either.html"
+        )
+        const response = h.get(event, null)
+        return expect(response)
+          .to.eventually.haveOwnProperty("statusCode")
+          .that.equals(404)
+      })
+
+      it("should use customErrorPagePath", async function () {
+        const event = mockEvent({ path: "doesntexist.404" })
+        let h = new StaticFileHandler(STATIC_FILES_PATH, "custom-error.html")
+        const response = h.get(event, null)
+        expect(response)
+          .to.eventually.haveOwnProperty("statusCode")
+          .that.equals(404)
+        return expect(response)
+          .to.eventually.haveOwnProperty("body")
+          .that.matches(/<title>CUSTOM<\/title>/)
+      })
     })
 
     /**

diff --git a/src/test/data/testfiles/custom-error.html b/src/test/data/testfiles/custom-error.html
@@ -6,6 +6,6 @@
   </head>
 
   <body>
-    CUSTOM {errorText}
+    CUSTOM {{errorText}}
   </body>
 </html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,6 @@ @@
       </head>
       <body>
-        CUSTOM {errorText}
+        CUSTOM {{errorText}}
       </body>
     </html>