Skip to content

Fix flaky fetch call-count assertions in MiddlewareTest #91620

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

Closed
duongynhi000005-oss wants to merge 1 commit into from
Closed

Fix flaky fetch call-count assertions in MiddlewareTest #91620

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions tests/unit/MiddlewareTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@ import waitForNetworkPromises from '../utils/waitForNetworkPromises';

type FormDataObject = {body: TestHelper.FormData};

const waitForFetchCallCount = async (expectedCallCount: number, maxAttempts = 5) => {
for (let attempt = 0; attempt < maxAttempts; attempt++) {
if ((global.fetch as jest.Mock).mock.calls.length === expectedCallCount) {
return;
}
await waitForNetworkPromises();
}
expect(global.fetch).toHaveBeenCalledTimes(expectedCallCount);
};

Onyx.init({
keys: ONYXKEYS,
});
Expand Down Expand Up @@ -93,7 +103,7 @@ describe('Middleware', () => {
SequentialQueue.unpause();
await waitForNetworkPromises();

expect(global.fetch).toHaveBeenCalledTimes(2);
await waitForFetchCallCount(2);
expect(global.fetch).toHaveBeenLastCalledWith('https://www.expensify.com.dev/api/AddComment?', expect.anything());
TestHelper.assertFormDataMatchesObject(
{
Expand Down Expand Up @@ -340,7 +350,7 @@ describe('Middleware', () => {
SequentialQueue.unpause();
await waitForBatchedUpdates();

expect(global.fetch).toHaveBeenCalledTimes(2);
await waitForFetchCallCount(2);

const optimisticReportUpdated = await new Promise<OnyxEntry<OnyxReport>>((resolve) => {
const connection = Onyx.connect({
Expand Down