diff -r 000000000000 -r 6474c204b198 js/src/jit-test/tests/proxy/testDirectProxyValidateProperty3.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jit-test/tests/proxy/testDirectProxyValidateProperty3.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,43 @@
+load(libdir + "asserts.js");
+
+/*
+ * Throw a TypeError if the current descriptor is a data descriptor and the
+ * descriptor returned by the trap is not, or vice versa, and the current
+ * descriptor is non-configurable
+ */
+var target = {};
+Object.defineProperty(target, 'foo', {
+    value: 'bar',
+    configurable: false
+});
+var caught = false;
+assertThrowsInstanceOf(function () { 
+    Object.getOwnPropertyDescriptor(new Proxy(target, {
+        getOwnPropertyDescriptor: function (target, name) {
+            return {
+                get: function () {
+                    return 'bar';
+                },
+                configurable: false
+            };
+        }
+    }), 'foo');
+}, TypeError);
+
+var target = {};
+Object.defineProperty(target, 'foo', {
+    value: function () {
+        return 'bar';
+    },
+    configurable: false
+});
+assertThrowsInstanceOf(function () { 
+    Object.getOwnPropertyDescriptor(new Proxy(target, {
+        getOwnPropertyDescriptor: function (target, name) {
+            return {
+                value: 'bar',
+                configurable: false
+            };
+        }
+    }), 'foo');
+}, TypeError);