Fix harness tests for verifyProperty

Author: anba

harness/propertyHelper.js

@@ -45,19 +45,6 @@ function verifyProperty(obj, name, desc, options) {
     return true;
   }
 
-  var names = Object.getOwnPropertyNames(desc);
-  for (var i = 0; i < names.length; i++) {
-    assert(
-      names[i] === "value" ||
-        names[i] === "writable" ||
-        names[i] === "enumerable" ||
-        names[i] === "configurable" ||
-        names[i] === "get" ||
-        names[i] === "set",
-      "Invalid descriptor field: " + names[i],
-    );
-  }
-
   assert(
     Object.prototype.hasOwnProperty.call(obj, name),
     "obj should have an own property " + nameStr
@@ -75,14 +62,27 @@ function verifyProperty(obj, name, desc, options) {
     "The desc argument should be an object or undefined, " + String(desc)
   );
 
+  var names = Object.getOwnPropertyNames(desc);
+  for (var i = 0; i < names.length; i++) {
+    assert(
+      names[i] === "value" ||
+        names[i] === "writable" ||
+        names[i] === "enumerable" ||
+        names[i] === "configurable" ||
+        names[i] === "get" ||
+        names[i] === "set",
+      "Invalid descriptor field: " + names[i],
+    );
+  }
+
   var failures = [];
 
   if (Object.prototype.hasOwnProperty.call(desc, 'value')) {
     if (!isSameValue(desc.value, originalDesc.value)) {
       failures.push("descriptor value should be " + desc.value);
     }
     if (!isSameValue(desc.value, obj[name])) {
-      failures.push(failures, "object value should be " + desc.value);
+      failures.push("object value should be " + desc.value);
     }
   }
 

test/harness/verifyProperty-value-error.js

@@ -29,8 +29,8 @@ try {
     );
   }
 
-  if (err.message !== 'descriptor value should be 2') {
-    throw new Error('The error thrown did not define the specified message.');
+  if (err.message !== 'descriptor value should be 2; object value should be 2') {
+    throw new Error('The error thrown did not define the specified message');
   }
 }