cast non-Errors to a string wrapped in a new Error

fastify · Nov 8, 2017 · f18b396 · f18b396
1 parent 947098d
commit f18b396
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/handleRequest.js b/lib/handleRequest.js
@@ -126,7 +126,11 @@ function preHandlerCallback (err, code) {
         this.reply.send(payload)
       }
     }).catch((err) => {
-      this.reply.send(err)
+      if (err instanceof Error) {
+        this.reply.send(err)
+      } else {
+        this.reply.send(new Error(err || ''))
+      }
     })
   }
 }

diff --git a/test/reply-error.test.js b/test/reply-error.test.js
@@ -371,9 +371,10 @@ test('Error.status property support', t => {
 })
 
 test('Support rejection with values that are not Error instances', t => {
-  t.plan(1)
+  t.plan(2)
   const fastify = Fastify()
   const nonErr = {}
+  nonErr.toString = () => '💩'
 
   fastify.get('/', () => {
     return Promise.reject(nonErr)
@@ -384,5 +385,13 @@ test('Support rejection with values that are not Error instances', t => {
     url: '/'
   }, res => {
     t.strictEqual(res.statusCode, 500)
+    t.deepEqual(
+      {
+        error: statusCodes['500'],
+        message: '💩',
+        statusCode: 500
+      },
+      JSON.parse(res.payload)
+    )
   })
 })