1 files changed, 27 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-12.js b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-12.js
new file mode 100644
index 0000000000..709fc0f123
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Object/defineProperty/15.2.3.6-3-12.js
@@ -0,0 +1,27 @@
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+info: |
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+es5id: 15.2.3.6-3-12
+description: >
+    Object.defineProperty throws TypeError if setter is not callable
+    but not undefined (String)(8.10.5 step 8.b)
+---*/
+
+var o = {};
+
+// dummy setter
+var setter = "abc";
+var desc = {
+  set: setter
+};
+assert.throws(TypeError, function() {
+  Object.defineProperty(o, "foo", desc);
+});
+assert.sameValue(o.hasOwnProperty("foo"), false, 'o.hasOwnProperty("foo")');
+
+reportCompare(0, 0);