Merge pull request #16347 from mani-mishra/fix_16323_whitelist_toJSON…

…_from_assertion [BUGFIX release] Adds toJSON to list of descriptorTrap assertion exception
emberjs · Mar 9, 2018 · 7aa662d · 7aa662d
2 parents 596db11 + 6bd74a4
commit 7aa662d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/packages/ember-metal/lib/properties.js b/packages/ember-metal/lib/properties.js
@@ -126,6 +126,7 @@ if (EMBER_METAL_ES5_GETTERS) {
             property === 'toString' ||
             property === 'valueOf' ||
             property === 'inspect' ||
+            property === 'toJSON' ||
             Symbol && property === Symbol.toPrimitive ||
             Symbol && property === Symbol.toStringTag
           ) {
@@ -148,6 +149,7 @@ if (EMBER_METAL_ES5_GETTERS) {
       });
 
       trap.toString = trap.valueOf = () => '[COMPUTED PROPERTY]';
+      trap.toJSON = trap.valueOf = () => '[COMPUTED PROPERTY]';
 
       // Without a proxy, we can only trap the "likely" properties
       ['isDescriptor', 'setup', 'teardown', 'get', '_getter', 'set', '_setter', 'meta'].forEach(property => {