Revert of #251 - turns out this doesn't fix #240

paulmillr · Jun 4, 2014 · e7a0f7a · e7a0f7a
1 parent b146748
commit e7a0f7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/es6-shim.js b/es6-shim.js
@@ -758,7 +758,7 @@
         },
 
         getPropertyNames: function(subject) {
-          var result = Object.keys(subject);
+          var result = Object.getOwnPropertyNames(subject);
           var proto = Object.getPrototypeOf(subject);
 
           var addProperty = function(property) {
@@ -768,7 +768,7 @@
           };
 
           while (proto !== null) {
-            Object.keys(proto).forEach(addProperty);
+            Object.getOwnPropertyNames(proto).forEach(addProperty);
             proto = Object.getPrototypeOf(proto);
           }
           return result;

diff --git a/test/object.js b/test/object.js
@@ -60,8 +60,8 @@ describe('Object', function() {
       expect(Object.getPropertyNames(Object.create(null))).to.eql([]);
       var obj = {};
       expect(Object.getPropertyNames(Object.create(obj))).to.eql(
-          Object.keys(obj).concat(
-            Object.keys(Object.getPrototypeOf(obj))
+        Object.getOwnPropertyNames(obj).concat(
+          Object.getOwnPropertyNames(Object.getPrototypeOf(obj))
         )
       );
     });