diff --git a/e2e/core-beta-args-pill-commit.test.ts b/e2e/core-beta-args-pill-commit.test.ts index 3eb57a291..57a7c527f 100644 --- a/e2e/core-beta-args-pill-commit.test.ts +++ b/e2e/core-beta-args-pill-commit.test.ts @@ -143,6 +143,11 @@ async function openCounted(): Promise { return openStartupArgs() } +async function betaArgsSlot(popup: WebContentsPage): Promise<'pill' | 'loading' | 'empty'> { + if (await popup.exists(`${ARGS_FIELD} .beta-args-loading`)) return 'loading' + return (await pillLabel(popup)) === null ? 'empty' : 'pill' +} + async function expectAnsweredWithNoPill(popup: WebContentsPage, message: string): Promise { await expect .poll(async () => (await getIpcInvocations(ctx.app, 'get-core-beta-args')).length, { @@ -150,10 +155,12 @@ async function expectAnsweredWithNoPill(popup: WebContentsPage, message: string) intervals: [100, 200] }) .toBeGreaterThanOrEqual(2) + await expect + .poll(() => betaArgsSlot(popup), { message, timeout: 15_000, intervals: [100, 200] }) + .toBe('empty') const deadline = Date.now() + 2_000 while (Date.now() < deadline) { - expect(await pillLabel(popup), message).toBeNull() - expect(await popup.exists(`${ARGS_FIELD} .beta-args-loading`), message).toBe(false) + expect(await betaArgsSlot(popup), message).toBe('empty') await new Promise((resolve) => setTimeout(resolve, 200)) } }