Merge pull request #315 from yiminghe/definePropertyFix

Shimmed `Object.defineProperty` should not throw for an empty descriptor
es-shims · Jun 24, 2015 · 0b903e9 · 0b903e9
2 parents 373d629 + 3680962
commit 0b903e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/es5-sham.js b/es5-sham.js
@@ -413,7 +413,7 @@ if (!Object.defineProperty || definePropertyFallback) {
                 object[property] = descriptor.value;
             }
         } else {
-            if (!supportsAccessors) {
+            if (!supportsAccessors && (('get' in descriptor) || ('set' in descriptor))) {
                 throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
             }
             // If we got that far then getters and setters can be defined !!

diff --git a/tests/spec/s-object.js b/tests/spec/s-object.js
@@ -180,6 +180,12 @@ describe('Object', function () {
                 Object.defineProperty(42, 'name', {});
             }).toThrow();
         });
+
+        it('should not throw error for empty descriptor', function () {
+            expect(function () {
+                Object.defineProperty({}, 'name', {});
+            }).not.toThrow();
+        });
     });
 
     describe('Object.getOwnPropertyDescriptor', function () {