Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

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

1 files changed, 37 insertions, 0 deletions

diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-239.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-239.js
new file mode 100644
index 0000000000..03fdde5785
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-239.js
@@ -0,0 +1,37 @@
+// 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.6-3-239
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is own data
+    property that overrides an inherited data property (8.10.5 step
+    8.a)
+---*/
+
+var obj = {};
+var data1 = "data";
+var data2 = "data";
+var proto = {
+  set: function(value) {
+    data1 = value;
+  }
+};
+
+var ConstructFun = function() {};
+ConstructFun.prototype = proto;
+
+var child = new ConstructFun();
+child.set = function(value) {
+  data2 = value;
+};
+
+Object.defineProperty(obj, "property", child);
+
+obj.property = "overrideData";
+
+assert(obj.hasOwnProperty("property"), 'obj.hasOwnProperty("property") !== true');
+assert.sameValue(data1, "data", 'data1');
+assert.sameValue(data2, "overrideData", 'data2');
+
+reportCompare(0, 0);