test: refactor common.expectsError

This completely refactors the `expectsError` behavior: so far it's
almost identical to `assert.throws(fn, object)` in case it was used
with a function as first argument. It had a magical property check
that allowed to verify a functions `type` in case `type` was passed
used in the validation object. This pattern is now completely removed
and `assert.throws()` should be used instead.

The main intent for `common.expectsError()` is to verify error cases
for callback based APIs. This is now more flexible by accepting all
validation possibilites that `assert.throws()` accepts as well. No
magical properties exist anymore. This reduces surprising behavior
for developers who are not used to the Node.js core code base.

This has the side effect that `common` is used significantly less
frequent.

PR-URL: https://github.com/nodejs/node/pull/31092
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>

3 files changed, 9 insertions, 9 deletions

diff --git a/test/js-native-api/test_error/test.js b/test/js-native-api/test_error/test.js
index e39038e805..2dc6904c75 100644
--- a/test/js-native-api/test_error/test.js
+++ b/test/js-native-api/test_error/test.js
@@ -69,21 +69,21 @@ assert.throws(() => {
     }
   ));
 
-common.expectsError(
+assert.throws(
   () => test_error.throwErrorCode(),
   {
     code: 'ERR_TEST_CODE',
     message: 'Error [error]'
   });
 
-common.expectsError(
+assert.throws(
   () => test_error.throwRangeErrorCode(),
   {
     code: 'ERR_TEST_CODE',
     message: 'RangeError [range error]'
   });
 
-common.expectsError(
+assert.throws(
   () => test_error.throwTypeErrorCode(),
   {
     code: 'ERR_TEST_CODE',
diff --git a/test/js-native-api/test_general/test.js b/test/js-native-api/test_general/test.js
index 09c0300f85..9b847f4f33 100644
--- a/test/js-native-api/test_general/test.js
+++ b/test/js-native-api/test_general/test.js
@@ -67,8 +67,8 @@ assert.strictEqual(derefItemWasCalled, true,
 // Assert that wrapping twice fails.
 const x = {};
 test_general.wrap(x);
-common.expectsError(() => test_general.wrap(x),
-                    { type: Error, message: 'Invalid argument' });
+assert.throws(() => test_general.wrap(x),
+              { name: 'Error', message: 'Invalid argument' });
 
 // Ensure that wrapping, removing the wrap, and then wrapping again works.
 const y = {};
diff --git a/test/js-native-api/test_general/testFinalizer.js b/test/js-native-api/test_general/testFinalizer.js
index b440ed5e50..d72a4a44a3 100644
--- a/test/js-native-api/test_general/testFinalizer.js
+++ b/test/js-native-api/test_general/testFinalizer.js
@@ -13,12 +13,12 @@ test_general.addFinalizerOnly(finalized, callback);
 test_general.addFinalizerOnly(finalized, callback);
 
 // Ensure attached items cannot be retrieved.
-common.expectsError(() => test_general.unwrap(finalized),
-                    { type: Error, message: 'Invalid argument' });
+assert.throws(() => test_general.unwrap(finalized),
+              { name: 'Error', message: 'Invalid argument' });
 
 // Ensure attached items cannot be removed.
-common.expectsError(() => test_general.removeWrap(finalized),
-                    { type: Error, message: 'Invalid argument' });
+assert.throws(() => test_general.removeWrap(finalized),
+              { name: 'Error', message: 'Invalid argument' });
 finalized = null;
 global.gc();