Added test for issue 884.

dilijev · dilijev · commit 47f8bd8494f8 · 2016-04-28T14:41:35.000-07:00
diff --git a/test/es6/proxy-issue884.baseline b/test/es6/proxy-issue884.baseline
@@ -0,0 +1,7 @@
+has
+has
+has
+has
+has
+has
+PASS
diff --git a/test/es6/proxy-issue884.js b/test/es6/proxy-issue884.js
@@ -0,0 +1,24 @@
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+
+var proxyHandler = {
+    has() { WScript.Echo("has"); return true; }
+};
+var p = new Proxy({}, proxyHandler);
+var obj = {};
+
+try {
+    Object.defineProperty(obj, "x", p);
+} catch (e) {
+    if (e instanceof TypeError) {
+        if (e.message !== "Invalid property descriptor: cannot both specify accessors and a 'value' attribute") {
+            print('FAIL');
+        } else {
+            print('PASS');
+        }
+    } else {
+        print('FAIL');
+    }
+}
diff --git a/test/es6/proxytest9.js b/test/es6/proxytest9.js
@@ -45,7 +45,7 @@ function test2() {
         print('Expected to throw TypeError');
     } catch (e) {
         if (e instanceof TypeError) {
-            if (e.message !== 'Property cannot have both accessors and a value') {
+            if (e.message !== "Invalid property descriptor: cannot both specify accessors and a 'value' attribute") {
                 print('FAIL');
             }
         } else {
diff --git a/test/es6/rlexe.xml b/test/es6/rlexe.xml
@@ -688,6 +688,12 @@
       <compile-flags>-args summary -endargs</compile-flags>
     </default>
   </test>
+  <test>
+    <default>
+      <files>proxy-issue884.js</files>
+      <baseline>proxy-issue884.baseline</baseline>
+    </default>
+  </test>
   <test>
     <default>
       <files>object-is.js</files>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +has
 +has
 +has
 +has
 +has
 +has
 +PASS
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ function test2() {`
`45`	`45`	`print('Expected to throw TypeError');`
`46`	`46`	`} catch (e) {`
`47`	`47`	`if (e instanceof TypeError) {`
`48`		`- if (e.message !== 'Property cannot have both accessors and a value') {`
	`48`	`+ if (e.message !== "Invalid property descriptor: cannot both specify accessors and a 'value' attribute") {`
`49`	`49`	`print('FAIL');`
`50`	`50`	`}`
`51`	`51`	`} else {`