Merge pull request Automattic#8986 from osher/patch-1

fix(errors) - user defines its own r/o err.toJSON
AbdelrahmanHafez · May 12, 2020 · 1bdec38 · 1bdec38
2 parents b293a36 + d05dc13
commit 1bdec38
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/lib/error/validation.js b/lib/error/validation.js
@@ -72,10 +72,14 @@ if (util.inspect.custom) {
 /*!
  * Helper for JSON.stringify
  */
-
-ValidationError.prototype.toJSON = function() {
-  return Object.assign({}, this, { message: this.message });
-};
+Object.defineProperty(ValidationError.prototype, 'toJSON', {
+  enumerable: false,
+  writable: false,
+  configurable: true,
+  value: function() {
+    return Object.assign({}, this, { message: this.message });
+  }
+});
 
 /*!
  * add message

diff --git a/test/errors.validation.test.js b/test/errors.validation.test.js
@@ -232,4 +232,19 @@ describe('ValidationError', function() {
 
     assert.equal(err.message, 'Validation failed');
   });
+
+  describe('when user code defines a r/o Error#toJSON', function() {
+    it('shoud not fail', function() {
+      const err = [];
+      const child = require('child_process')
+        .fork('./test/isolated/project-has-error.toJSON.js', { silent: true });
+
+      child.stderr.on('data', function(buf) { err.push(buf); });
+      child.on('exit', function(code) {
+        const stderr = err.join('');
+        assert.equal(stderr, '');
+        assert.equal(code, 0);
+      });
+    });
+  });
 });
diff --git a/test/isolated/project-has-error.toJSON.js b/test/isolated/project-has-error.toJSON.js
@@ -0,0 +1,9 @@
+'use strict';
+Object.defineProperty(Error.prototype, 'toJSON', {
+  enumerable: false,
+  configurable: false,
+  writable: false,
+  value: () => ({ from: 'Error' })
+});
+
+require('../../');