one more #541-related fix

zloirock · May 10, 2019 · 417de2a · 417de2a
1 parent 305a701
commit 417de2a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/packages/core-js/internals/object-to-array.js b/packages/core-js/internals/object-to-array.js
@@ -1,3 +1,4 @@
+var DESCRIPTORS = require('../internals/descriptors');
 var objectKeys = require('../internals/object-keys');
 var toIndexedObject = require('../internals/to-indexed-object');
 var propertyIsEnumerable = require('../internals/object-property-is-enumerable').f;
@@ -11,7 +12,11 @@ module.exports = function (it, TO_ENTRIES) {
   var i = 0;
   var result = [];
   var key;
-  while (length > i) if (propertyIsEnumerable.call(O, key = keys[i++])) {
-    result.push(TO_ENTRIES ? [key, O[key]] : O[key]);
-  } return result;
+  while (length > i) {
+    key = keys[i++];
+    if (!DESCRIPTORS || propertyIsEnumerable.call(O, key)) {
+      result.push(TO_ENTRIES ? [key, O[key]] : O[key]);
+    }
+  }
+  return result;
 };
diff --git a/tests/pure/es.object.entries.js b/tests/pure/es.object.entries.js
@@ -7,6 +7,7 @@ QUnit.test('Object.entries', assert => {
   assert.deepEqual(entries({ q: 1, w: 2, e: 3 }), [['q', 1], ['w', 2], ['e', 3]]);
   assert.deepEqual(entries(new String('qwe')), [['0', 'q'], ['1', 'w'], ['2', 'e']]);
   assert.deepEqual(entries(assign(create({ q: 1, w: 2, e: 3 }), { a: 4, s: 5, d: 6 })), [['a', 4], ['s', 5], ['d', 6]]);
+  assert.deepEqual(entries({ valueOf: 42 }), [['valueOf', 42]], 'IE enum keys bug');
   try {
     assert.deepEqual(Function('entries', `
       return entries({ a: 1, get b() {

diff --git a/tests/pure/es.object.values.js b/tests/pure/es.object.values.js
@@ -7,6 +7,7 @@ QUnit.test('Object.values', assert => {
   assert.deepEqual(values({ q: 1, w: 2, e: 3 }), [1, 2, 3]);
   assert.deepEqual(values(new String('qwe')), ['q', 'w', 'e']);
   assert.deepEqual(values(assign(create({ q: 1, w: 2, e: 3 }), { a: 4, s: 5, d: 6 })), [4, 5, 6]);
+  assert.deepEqual(values({ valueOf: 42 }), [42], 'IE enum keys bug');
   try {
     assert.deepEqual(Function('values', `
       return values({ a: 1, get b() {

diff --git a/tests/tests/es.object.entries.js b/tests/tests/es.object.entries.js
@@ -8,6 +8,7 @@ QUnit.test('Object.entries', assert => {
   assert.deepEqual(entries({ q: 1, w: 2, e: 3 }), [['q', 1], ['w', 2], ['e', 3]]);
   assert.deepEqual(entries(new String('qwe')), [['0', 'q'], ['1', 'w'], ['2', 'e']]);
   assert.deepEqual(entries(assign(create({ q: 1, w: 2, e: 3 }), { a: 4, s: 5, d: 6 })), [['a', 4], ['s', 5], ['d', 6]]);
+  assert.deepEqual(entries({ valueOf: 42 }), [['valueOf', 42]], 'IE enum keys bug');
   try {
     assert.deepEqual(Function('entries', `
       return entries({

diff --git a/tests/tests/es.object.values.js b/tests/tests/es.object.values.js
@@ -8,6 +8,7 @@ QUnit.test('Object.values', assert => {
   assert.deepEqual(values({ q: 1, w: 2, e: 3 }), [1, 2, 3]);
   assert.deepEqual(values(new String('qwe')), ['q', 'w', 'e']);
   assert.deepEqual(values(assign(create({ q: 1, w: 2, e: 3 }), { a: 4, s: 5, d: 6 })), [4, 5, 6]);
+  assert.deepEqual(values({ valueOf: 42 }), [42], 'IE enum keys bug');
   try {
     assert.deepEqual(Function('values', `
       return values({ a: 1, get b() {