Skip to content

Use Promise.withResolvers to simplify promise handling #11666

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
aduth merged 2 commits into from
Dec 18, 2024
Merged

Use Promise.withResolvers to simplify promise handling #11666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
177b1d4
Use Promise.withResolvers to simplify promise handling
aduth Dec 18, 2024
1b7a4ca
Pass dummy error object to rejected promise
aduth Dec 18, 2024
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
7 changes: 1 addition & 6 deletions app/javascript/packages/analytics/digital-analytics-program.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@ import { pathToFileURL } from 'node:url';

describe('digital analytics program', () => {
it('parses without syntax error', async () => {
// Future: Replace with Promise.withResolvers once supported
// See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/withResolvers
let resolve;
const promise = new Promise((_resolve) => {
resolve = _resolve;
});
const { promise, resolve } = Promise.withResolvers<void>();

// Reference: https://github.com/nodejs/node/issues/30682
const toDataURL = (source: string) =>
Expand Down
32 changes: 5 additions & 27 deletions spec/javascript/packages/document-capture/hooks/use-async-spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,8 @@ describe('document-capture/hooks/use-async', () => {
}

it('returns suspense resource that renders fallback', async () => {
let resolve;
const createPromise = sinon
.stub()
.onCall(0)
.returns(
new Promise((_resolve) => {
resolve = () => {
_resolve();
};
}),
)
.onCall(1)
.throws();
const { promise, resolve } = Promise.withResolvers();
const createPromise = sinon.stub().onCall(0).returns(promise).onCall(1).throws();

const { container, findByText } = render(<Parent createPromise={createPromise} />);

Expand All @@ -47,25 +36,14 @@ describe('document-capture/hooks/use-async', () => {
});

it('returns suspense resource that renders error fallback', async () => {
let reject;
const createPromise = sinon
.stub()
.onCall(0)
.returns(
new Promise((_resolve, _reject) => {
reject = () => {
_reject(new Error());
};
}),
)
.onCall(1)
.throws();
const { promise, reject } = Promise.withResolvers();
const createPromise = sinon.stub().onCall(0).returns(promise).onCall(1).throws();

const { container, findByText } = render(<Parent createPromise={createPromise} />);

expect(container.textContent).to.equal('Loading');

reject();
reject(new Error());

expect(await findByText('Error')).to.be.ok();
expect(console).to.have.loggedError();
Expand Down