11 files changed, 35 insertions, 29 deletions
diff --git a/js/src/tests/test262/built-ins/Object/prototype/hasOwnProperty/name.js b/js/src/tests/test262/built-ins/Object/prototype/hasOwnProperty/name.js
index ae01259e26..35d0280902 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/hasOwnProperty/name.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/hasOwnProperty/name.js
@@ -19,10 +19,11 @@ info: |
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.hasOwnProperty.name, "hasOwnProperty");
-
-verifyNotEnumerable(Object.prototype.hasOwnProperty, "name");
-verifyNotWritable(Object.prototype.hasOwnProperty, "name");
-verifyConfigurable(Object.prototype.hasOwnProperty, "name");
+verifyProperty(Object.prototype.hasOwnProperty, "name", {
+  value: "hasOwnProperty",
+  writable: false,
+  enumerable: false,
+  configurable: true,
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Object/prototype/hasOwnProperty/not-a-constructor.js b/js/src/tests/test262/built-ins/Object/prototype/hasOwnProperty/not-a-constructor.js
index 07d38e779c..33f4aca473 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/hasOwnProperty/not-a-constructor.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/hasOwnProperty/not-a-constructor.js
@@ -29,7 +29,7 @@ assert.sameValue(
 
 assert.throws(TypeError, () => {
   new Object.prototype.hasOwnProperty('');
-}, '`new Object.prototype.hasOwnProperty(\'\')` throws TypeError');
+});
 
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Object/prototype/isPrototypeOf/not-a-constructor.js b/js/src/tests/test262/built-ins/Object/prototype/isPrototypeOf/not-a-constructor.js
index 9de714cba9..e8324db0be 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/isPrototypeOf/not-a-constructor.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/isPrototypeOf/not-a-constructor.js
@@ -29,7 +29,7 @@ assert.sameValue(
 
 assert.throws(TypeError, () => {
   new Object.prototype.isPrototypeOf({});
-}, '`new Object.prototype.isPrototypeOf({})` throws TypeError');
+});
 
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Object/prototype/propertyIsEnumerable/name.js b/js/src/tests/test262/built-ins/Object/prototype/propertyIsEnumerable/name.js
index 9054d1f7a5..b6638e42e3 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/propertyIsEnumerable/name.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/propertyIsEnumerable/name.js
@@ -19,10 +19,11 @@ info: |
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.propertyIsEnumerable.name, "propertyIsEnumerable");
-
-verifyNotEnumerable(Object.prototype.propertyIsEnumerable, "name");
-verifyNotWritable(Object.prototype.propertyIsEnumerable, "name");
-verifyConfigurable(Object.prototype.propertyIsEnumerable, "name");
+verifyProperty(Object.prototype.propertyIsEnumerable, "name", {
+  value: "propertyIsEnumerable",
+  writable: false,
+  enumerable: false,
+  configurable: true,
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Object/prototype/propertyIsEnumerable/not-a-constructor.js b/js/src/tests/test262/built-ins/Object/prototype/propertyIsEnumerable/not-a-constructor.js
index e8bdaf469e..71cb963283 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/propertyIsEnumerable/not-a-constructor.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/propertyIsEnumerable/not-a-constructor.js
@@ -29,7 +29,7 @@ assert.sameValue(
 
 assert.throws(TypeError, () => {
   new Object.prototype.propertyIsEnumerable('');
-}, '`new Object.prototype.propertyIsEnumerable(\'\')` throws TypeError');
+});
 
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Object/prototype/toLocaleString/name.js b/js/src/tests/test262/built-ins/Object/prototype/toLocaleString/name.js
index 5f258165ba..835f5a488b 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/toLocaleString/name.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/toLocaleString/name.js
@@ -19,10 +19,11 @@ info: |
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.toLocaleString.name, "toLocaleString");
-
-verifyNotEnumerable(Object.prototype.toLocaleString, "name");
-verifyNotWritable(Object.prototype.toLocaleString, "name");
-verifyConfigurable(Object.prototype.toLocaleString, "name");
+verifyProperty(Object.prototype.toLocaleString, "name", {
+  value: "toLocaleString",
+  writable: false,
+  enumerable: false,
+  configurable: true,
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Object/prototype/toLocaleString/not-a-constructor.js b/js/src/tests/test262/built-ins/Object/prototype/toLocaleString/not-a-constructor.js
index 49fc0525db..ed9b6d87dc 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/toLocaleString/not-a-constructor.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/toLocaleString/not-a-constructor.js
@@ -29,7 +29,7 @@ assert.sameValue(
 
 assert.throws(TypeError, () => {
   new Object.prototype.toLocaleString('');
-}, '`new Object.prototype.toLocaleString(\'\')` throws TypeError');
+});
 
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Object/prototype/toString/not-a-constructor.js b/js/src/tests/test262/built-ins/Object/prototype/toString/not-a-constructor.js
index 54f974d24f..ca2f1b3d64 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/toString/not-a-constructor.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/toString/not-a-constructor.js
@@ -29,7 +29,7 @@ assert.sameValue(
 
 assert.throws(TypeError, () => {
   new Object.prototype.toString();
-}, '`new Object.prototype.toString()` throws TypeError');
+});
 
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Object/prototype/toString/prop-desc.js b/js/src/tests/test262/built-ins/Object/prototype/toString/prop-desc.js
index 7d3ac0d66b..6ce7d132aa 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/toString/prop-desc.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/toString/prop-desc.js
@@ -16,8 +16,10 @@ info: |
 includes: [propertyHelper.js]
 ---*/
 
-verifyWritable(Object.prototype, "toString");
-verifyNotEnumerable(Object.prototype, "toString");
-verifyConfigurable(Object.prototype, "toString");
+verifyProperty(Object.prototype, "toString", {
+  writable: true,
+  enumerable: false,
+  configurable: true,
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Object/prototype/valueOf/name.js b/js/src/tests/test262/built-ins/Object/prototype/valueOf/name.js
index 7648b4002d..08140e27d9 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/valueOf/name.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/valueOf/name.js
@@ -19,10 +19,11 @@ info: |
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Object.prototype.valueOf.name, "valueOf");
-
-verifyNotEnumerable(Object.prototype.valueOf, "name");
-verifyNotWritable(Object.prototype.valueOf, "name");
-verifyConfigurable(Object.prototype.valueOf, "name");
+verifyProperty(Object.prototype.valueOf, "name", {
+  value: "valueOf",
+  writable: false,
+  enumerable: false,
+  configurable: true,
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Object/prototype/valueOf/not-a-constructor.js b/js/src/tests/test262/built-ins/Object/prototype/valueOf/not-a-constructor.js
index 6db8b1c516..1aaca96dc8 100644
--- a/js/src/tests/test262/built-ins/Object/prototype/valueOf/not-a-constructor.js
+++ b/js/src/tests/test262/built-ins/Object/prototype/valueOf/not-a-constructor.js
@@ -29,7 +29,7 @@ assert.sameValue(
 
 assert.throws(TypeError, () => {
   new Object.prototype.valueOf();
-}, '`new Object.prototype.valueOf()` throws TypeError');
+});
 
 
 reportCompare(0, 0);