Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 39 insertions, 0 deletions

diff --git a/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-121.js b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-121.js
new file mode 100644
index 0000000000..5c0238b707
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Object/defineProperties/15.2.3.7-5-b-121.js
@@ -0,0 +1,39 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es5id: 15.2.3.7-5-b-121
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is own
+    accessor property that overrides an inherited accessor property
+    (8.10.5 step 5.a)
+---*/
+
+var obj = {};
+
+var proto = {};
+
+Object.defineProperty(proto, "value", {
+  get: function() {
+    return "inheritedAccessorProperty";
+  }
+});
+
+var Con = function() {};
+Con.prototype = proto;
+
+var descObj = new Con();
+
+Object.defineProperty(descObj, "value", {
+  get: function() {
+    return "ownAccessorProperty";
+  }
+});
+
+Object.defineProperties(obj, {
+  property: descObj
+});
+
+assert.sameValue(obj.property, "ownAccessorProperty", 'obj.property');
+
+reportCompare(0, 0);