Skip to content

Make rejects and resolves synchronously validate its argument #5364

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
cpojer merged 9 commits into from
Jan 24, 2018
Merged

Make rejects and resolves synchronously validate its argument #5364

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f2a068d
Make `makeRejectMatcher` synchronizable (#5361)
incleaf Jan 22, 2018
a5cdc10
Reorganize code using promise instaed of async/await
Jan 23, 2018
16196d5
Update changelog
Jan 23, 2018
4603328
Move rejectedHandler onto then
incleaf Jan 23, 2018
b4e1884
Make `makeResolveMatcher` synchronizable
incleaf Jan 23, 2018
54f5ac3
Update a snapshot
incleaf Jan 24, 2018
2ef8358
Merge branch 'master' of https://github.com/facebook/jest
incleaf Jan 24, 2018
ec4bbf5
Update CHANGELOG.md
SimenB Jan 24, 2018
8d3de49
Update CHANGELOG.md
SimenB Jan 24, 2018
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
Prev Previous commit
Next Next commit
Reorganize code using promise instaed of async/await
  • Loading branch information
Hyeonsu Lee committed Jan 23, 2018
commit a5cdc1050251c7f0d1417d45ae86eb1eecaf85c9
28 changes: 12 additions & 16 deletions packages/expect/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,22 +172,18 @@ const makeRejectMatcher = (
);
}

return (async () => {
let result;
try {
result = await actual;
} catch (e) {
return makeThrowingMatcher(matcher, isNot, e).apply(null, args);
}

throw new JestAssertionError(
utils.matcherHint(matcherStatement, 'received', '') +
'\n\n' +
`Expected ${utils.RECEIVED_COLOR('received')} Promise to reject, ` +
'instead it resolved to value\n' +
` ${utils.printReceived(result)}`,
);
})();
return actual
.then(v => {
const err = new JestAssertionError(
utils.matcherHint(matcherStatement, 'received', '') +
'\n\n' +
`Expected ${utils.RECEIVED_COLOR('received')} Promise to reject, ` +
'instead it resolved to value\n' +
` ${utils.printReceived(v)}`,
);
return Promise.reject(err);
})
.catch(e => makeThrowingMatcher(matcher, isNot, e).apply(null, args));
Copy link
Member

@SimenB SimenB Jan 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This catch has to be first

Copy link
Member

@SimenB SimenB Jan 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait no, that won't work either. You have to use .then(resolvedHandler, rejectedHandler) to avoid handling the rejection here.

So just move your catch into the second argument of the then.

Copy link
Contributor Author

@incleaf incleaf Jan 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://repl.it/repls/RevolvingEvergreenBlackbuck
Is there any difference between A and B, besides syntax preference? Both a and b pass the test cases.

Copy link
Member

@SimenB SimenB Jan 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case, yes. since we expect it to fail we need to have our catch first so we can resolve the promise with it. But if it does not reject we need to reject it ourselves.

If we add a then after the catch, it's not called. If we add our catch onto a then, we locally catch the rejection we want to bubble up

};

const makeThrowingMatcher = (
Expand Down