mirror of
https://github.com/denoland/deno.git
synced 2024-11-21 15:04:11 -05:00
fix(node/assert): throws not checking error instance (#24466)
The implementation for `assert.throws()` from `node:assert` didn't work when the expected value was an `Error` constructor. In this case the thrown error should checked if it's an instance of said constructor. Fixes https://github.com/denoland/deno/issues/24464
This commit is contained in:
parent
86010bec09
commit
b338b541ac
3 changed files with 24 additions and 2 deletions
|
@ -17,6 +17,9 @@ import {
|
||||||
ERR_MISSING_ARGS,
|
ERR_MISSING_ARGS,
|
||||||
} from "ext:deno_node/internal/errors.ts";
|
} from "ext:deno_node/internal/errors.ts";
|
||||||
import { isDeepEqual } from "ext:deno_node/internal/util/comparisons.ts";
|
import { isDeepEqual } from "ext:deno_node/internal/util/comparisons.ts";
|
||||||
|
import { primordials } from "ext:core/mod.js";
|
||||||
|
|
||||||
|
const { ObjectPrototypeIsPrototypeOf } = primordials;
|
||||||
|
|
||||||
function innerFail(obj: {
|
function innerFail(obj: {
|
||||||
actual?: unknown;
|
actual?: unknown;
|
||||||
|
@ -744,8 +747,8 @@ function validateThrownError(
|
||||||
error = undefined;
|
error = undefined;
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
error instanceof Function && error.prototype !== undefined &&
|
typeof error === "function" &&
|
||||||
error.prototype instanceof Error
|
(error === Error || ObjectPrototypeIsPrototypeOf(Error, error))
|
||||||
) {
|
) {
|
||||||
// error is a constructor
|
// error is a constructor
|
||||||
if (e instanceof error) {
|
if (e instanceof error) {
|
||||||
|
|
|
@ -53,6 +53,7 @@ util::unit_test_factory!(
|
||||||
_fs_writeFile_test = _fs / _fs_writeFile_test,
|
_fs_writeFile_test = _fs / _fs_writeFile_test,
|
||||||
_fs_write_test = _fs / _fs_write_test,
|
_fs_write_test = _fs / _fs_write_test,
|
||||||
async_hooks_test,
|
async_hooks_test,
|
||||||
|
assert_test,
|
||||||
assertion_error_test,
|
assertion_error_test,
|
||||||
buffer_test,
|
buffer_test,
|
||||||
child_process_test,
|
child_process_test,
|
||||||
|
|
18
tests/unit_node/assert_test.ts
Normal file
18
tests/unit_node/assert_test.ts
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
|
||||||
|
import * as assert from "node:assert";
|
||||||
|
|
||||||
|
Deno.test("[node/assert] .throws() compares Error instance", () => {
|
||||||
|
assert.throws(
|
||||||
|
() => {
|
||||||
|
throw new Error("FAIL");
|
||||||
|
},
|
||||||
|
Error,
|
||||||
|
);
|
||||||
|
|
||||||
|
assert.throws(
|
||||||
|
() => {
|
||||||
|
throw new TypeError("FAIL");
|
||||||
|
},
|
||||||
|
TypeError,
|
||||||
|
);
|
||||||
|
});
|
Loading…
Reference in a new issue