Do not throw if error messages cannot be munged

Fix #437
tapjs · Jan 22, 2019 · 7d19266 · 7d19266
1 parent 07867c1
commit 7d19266
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 5 deletions.
diff --git a/lib/extra-from-error.js b/lib/extra-from-error.js
@@ -18,17 +18,31 @@ module.exports = function (er, extra, options) {
     : ''
   const addName = er.message || !er.stack
 
-  if (er.message)
-    er.message = ''
+  if (er.message) {
+    try {
+      Object.defineProperty(er, 'message', {
+        value: '',
+        configurable: true
+      })
+    } catch (e) {}
+  }
+
   const st = er.stack
   if (st) {
     const splitst = st.split('\n')
     // parse out the 'at' bit from the first line.
     extra.at = stack.parseLine(splitst[1])
     extra.stack = stack.clean(splitst)
   }
-  if (message)
-    er.message = message
+
+  if (message) {
+    try {
+      Object.defineProperty(er, 'message', {
+        value: message,
+        configurable: true
+      })
+    } catch (e) {}
+  }
 
   if (er.name && er.name !== 'Error')
     extra.type = er.name

diff --git a/test/extra-from-error.js b/test/extra-from-error.js
@@ -1,6 +1,23 @@
 'use strict'
 const t = require('../')
 const extraFromError = require('../lib/extra-from-error.js')
+const assert = require('assert')
+const messageGetter = {
+  get message () {
+    return 'this is your message'
+  },
+  foo: 'bar',
+}
+
+const messageNonConfig = {
+  foo: 'bar',
+}
+Object.defineProperty(messageNonConfig, 'message', {
+  value: 'this is your message',
+  configurable: false,
+  enumerable: false,
+  writable: false
+})
 
 const cases = [
   [new Error('ok'), null, null, {
@@ -41,7 +58,15 @@ const cases = [
   [{ name: 'asdf' }, null, null, {
     type: 'asdf',
     message: null
-  }]
+  }],
+
+  [messageGetter, null, null, {
+    foo: 'bar',
+  }],
+
+  [messageNonConfig, null, null, {
+    foo: 'bar',
+  }],
 ]
 
 cases.forEach(c => t.match(extraFromError(c[0], c[1], c[2]), c[3]))