Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: type check for error instance when used toThrowError method #14576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 27, 2023
Merged

fix: type check for error instance when used toThrowError method #14576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03e5372
fix: add error instance type check to toThrowError
verycosy Sep 27, 2023
0f3a0b4
fix: check the instance of thrown value when it is custom error
verycosy Sep 27, 2023
2d7004f
Update CHANGELOG.md
verycosy Sep 27, 2023
1ab1836
Update CHANGELOG.md
SimenB Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
### Fixes

- `[babel-plugin-jest-hoist]` Use `denylist` instead of the deprecated `blacklist` for Babel 8 support ([#14109](https://github.com/jestjs/jest/pull/14109))
- `[expect]` Check error instance type for `toThrow/toThrowError` ([#14576](https://github.com/jestjs/jest/pull/14576))
- `[jest-circus]` [**BREAKING**] Prevent false test failures caused by promise rejections handled asynchronously ([#14315](https://github.com/jestjs/jest/pull/14315))
- `[@jest/expect-utils]` Fix comparison of `DataView` ([#14408](https://github.com/jestjs/jest/pull/14408))
- `[jest-leak-detector]` Make leak-detector more aggressive when running GC ([#14526](https://github.com/jestjs/jest/pull/14526))
Expand Down
6 changes: 6 additions & 0 deletions packages/expect/src/__tests__/toThrowMatchers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,16 @@ describe.each(['toThrowError', 'toThrow'] as const)('%s', toThrow => {
jestExpect(() => {
throw new Err();
})[toThrow](CustomError);
jestExpect(() => {
throw new SubErr();
})[toThrow](new SubErr());
jestExpect(() => {
throw new Err();
}).not[toThrow](Err2);
jestExpect(() => {}).not[toThrow](Err);
jestExpect(() => {
throw new SubErr();
}).not[toThrow](new SubSubErr());
});

test('did not throw at all', () => {
Expand Down
9 changes: 8 additions & 1 deletion packages/expect/src/toThrowMatchers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,17 @@ const toThrowExpectedObject = (
const expectedMessageAndCause = createMessageAndCause(expected);
const thrownMessageAndCause =
thrown === null ? null : createMessageAndCause(thrown.value);
const isCompareErrorInstance = thrown?.isError && expected instanceof Error;
const isExpectedCustomErrorInstance =
expected.constructor.name !== Error.name;

const pass =
thrown !== null &&
thrown.message === expected.message &&
thrownMessageAndCause === expectedMessageAndCause;
thrownMessageAndCause === expectedMessageAndCause &&
(!isCompareErrorInstance ||
!isExpectedCustomErrorInstance ||
thrown.value instanceof expected.constructor);

const message = pass
? () =>
Expand Down