diff options
author | Ruben Bridgewater <ruben@bridgewater.de> | 2019-12-25 18:02:16 +0100 |
---|---|---|
committer | Ruben Bridgewater <ruben@bridgewater.de> | 2019-12-31 15:54:20 +0100 |
commit | e038d6a1cdb2ffbf666d360553c31786acaf70b2 (patch) | |
tree | 214bcc4550360f2497fe82e85154df0859ff35b4 /test/parallel/test-tls-disable-renegotiation.js | |
parent | e66c4deda8c63ca6c1557eed7c09ba01c6284e57 (diff) | |
download | node-new-e038d6a1cdb2ffbf666d360553c31786acaf70b2.tar.gz |
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>
Diffstat (limited to 'test/parallel/test-tls-disable-renegotiation.js')
-rw-r--r-- | test/parallel/test-tls-disable-renegotiation.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/parallel/test-tls-disable-renegotiation.js b/test/parallel/test-tls-disable-renegotiation.js index 3fd6710622..926e2b8a03 100644 --- a/test/parallel/test-tls-disable-renegotiation.js +++ b/test/parallel/test-tls-disable-renegotiation.js @@ -21,7 +21,7 @@ const options = { const server = tls.Server(options, common.mustCall((socket) => { socket.on('error', common.mustCall((err) => { common.expectsError({ - type: Error, + name: 'Error', code: 'ERR_TLS_RENEGOTIATION_DISABLED', message: 'TLS session renegotiation disabled for this socket' })(err); @@ -50,24 +50,24 @@ server.listen(0, common.mustCall(() => { }; const client = tls.connect(options, common.mustCall(() => { - common.expectsError(() => client.renegotiate(), { + assert.throws(() => client.renegotiate(), { code: 'ERR_INVALID_ARG_TYPE', - type: TypeError, + name: 'TypeError', }); - common.expectsError(() => client.renegotiate(common.mustNotCall()), { + assert.throws(() => client.renegotiate(common.mustNotCall()), { code: 'ERR_INVALID_ARG_TYPE', - type: TypeError, + name: 'TypeError', }); - common.expectsError(() => client.renegotiate({}, false), { + assert.throws(() => client.renegotiate({}, false), { code: 'ERR_INVALID_CALLBACK', - type: TypeError, + name: 'TypeError', }); - common.expectsError(() => client.renegotiate({}, null), { + assert.throws(() => client.renegotiate({}, null), { code: 'ERR_INVALID_CALLBACK', - type: TypeError, + name: 'TypeError', }); |