test: take only an approval window whose approval is still pending (closes #287)

The site-connection tests settle the prompt in a tab while the toolbar
popup for the same approval is still loading. Closing the tab tears that
popup down, chrome.action.openPopup() rejects, and the background opens
its fallback window for the settled approval and removes it again. The
next test took any page at an approval URL, so it could take that
window, which showed the site view and then closed under the wait for
the sign view. The harness now asks the background whether a page's
approval is still pending before taking it.

The blocklist test clicked its self-closing Reject with a plain click;
it now clicks it as the other site Reject does, with the click witnessed.

Model: opus-5-5

tests/e2e/run.js

@@ -2600,15 +2600,42 @@ function dappMessages(page, type) {
     );
 }
 
+// The open approval page whose approval the background still holds, or null.
+//
+// A page at an approval URL is not enough. When a site-connection prompt is
+// settled in the reserved tab (see reserveApprovalTab) before the toolbar popup
+// raised for the same approval has loaded, closing the tab tears that popup
+// down, chrome.action.openPopup() rejects, and src/background/index.js opens
+// its fallback window for the settled approval and then removes it. That window
+// can be up when the next test looks for its prompt; taken for it, it showed
+// the site view and then closed under the wait for the sign view
+// (https://git.eeqj.de/sneak/AutistMask/issues/287).
+async function findPendingApprovalPage(env) {
+    for (const page of env.ctx.pages()) {
+        if (page.isClosed() || !page.url().includes("?approval=")) continue;
+        const id = new URL(page.url()).searchParams.get("approval");
+        const approval = await env.page.evaluate(
+            (approvalId) =>
+                new Promise((resolve) => {
+                    chrome.runtime.sendMessage(
+                        { type: "AUTISTMASK_GET_APPROVAL", id: approvalId },
+                        resolve,
+                    );
+                }),
+            id,
+        );
+        if (approval) return page;
+    }
+    return null;
+}
+
 // The approval window the background opened. Approvals are raised from an
 // RPC call rather than from a user gesture, so the extension opens a real
 // popup window for them; it is an ordinary page in this context.
-async function waitForApprovalWindow(ctx, timeout = 30000) {
+async function waitForApprovalWindow(env, timeout = 30000) {
     const deadline = Date.now() + timeout;
     for (;;) {
-        const page = ctx
-            .pages()
-            .find((p) => !p.isClosed() && p.url().includes("?approval="));
+        const page = await findPendingApprovalPage(env);
         if (page) return page;
         if (Date.now() > deadline) {
             throw new Error(
@@ -2679,9 +2706,7 @@ async function reserveApprovalTab(env) {
 async function openSiteApprovalPopup(env, timeout = 30000) {
     const deadline = Date.now() + timeout;
     for (;;) {
-        const existing = env.ctx
-            .pages()
-            .find((p) => !p.isClosed() && p.url().includes("?approval="));
+        const existing = await findPendingApprovalPage(env);
         if (existing) return existing;
 
         const url = await env.page.evaluate(
@@ -2706,9 +2731,8 @@ async function openSiteApprovalPopup(env, timeout = 30000) {
     }
 }
 
-// Retire every approval page still open. A settled approval whose page is
-// left behind would be found by the next waitForApprovalWindow() and driven
-// as if it were the next approval.
+// Retire every approval page still open, so none outlives the test that
+// raised it.
 async function closeApprovalPages(ctx) {
     for (const page of ctx.pages()) {
         if (!page.isClosed() && page.url().includes("?approval=")) {
@@ -2738,7 +2762,7 @@ async function closeApprovalPages(ctx) {
 //   #btn-reject on the site prompt — NOT self-proving. A page that went away
 //     without the click landing disconnects the approval port, the background
 //     settles that as 4001, and 4001 is exactly what assertUserRejection
-//     accepts. That call site arms the click trace below and asserts it.
+//     accepts. Both call sites arm the click trace below and assert it.
 //
 // A button that is missing or unclickable raises a different error, which is
 // rethrown.
@@ -3124,7 +3148,9 @@ test("a connect request from a blocklisted site is flagged (#219)", async (env)
             // Not remembered: a remembered decision for this origin would
             // outlive the test.
             await popup.uncheck("#approve-remember");
-            await popup.click("#btn-reject");
+            await armClickTrace(env, popup, "#btn-reject");
+            await clickAndClose(popup, "#btn-reject");
+            await assertClickLanded(env, "#btn-reject");
 
             await assertUserRejection(
                 phishingDapp,
@@ -3144,7 +3170,7 @@ test("personal_sign signs, and the signature recovers to the address (#183)", as
         SIGN_HEX,
         env.expectedAddress,
     ]);
-    const popup = await waitForApprovalWindow(env.ctx);
+    const popup = await waitForApprovalWindow(env);
     await visible(popup, "#view-approve-sign");
     const boundary = await watchApprovalBoundary(popup, env);
 
@@ -3221,7 +3247,7 @@ test("personal_sign rejected returns a rejection to the page (#183)", async (env
         SIGN_HEX,
         env.expectedAddress,
     ]);
-    const popup = await waitForApprovalWindow(env.ctx);
+    const popup = await waitForApprovalWindow(env);
     await visible(popup, "#view-approve-sign");
     await clickAndClose(popup, "#btn-reject-sign");
 
@@ -3249,7 +3275,7 @@ test("a personal message is laid out in the order of its bytes (#403)", async (e
         hexlify(toUtf8Bytes(text)),
         env.expectedAddress,
     ]);
-    const popup = await waitForApprovalWindow(env.ctx);
+    const popup = await waitForApprovalWindow(env);
     await visible(popup, "#view-approve-sign");
 
     // The text on screen, marks included, and the left edge of each of its
@@ -3295,7 +3321,7 @@ test("eth_signTypedData_v4 signs, and the signature recovers (#183)", async (env
         env.expectedAddress,
         TYPED_DATA_JSON,
     ]);
-    const popup = await waitForApprovalWindow(env.ctx);
+    const popup = await waitForApprovalWindow(env);
     await visible(popup, "#view-approve-sign");
     const boundary = await watchApprovalBoundary(popup, env);
 
@@ -3382,7 +3408,7 @@ test("eth_signTypedData_v4 rejected returns a rejection to the page (#183)", asy
         env.expectedAddress,
         TYPED_DATA_JSON,
     ]);
-    const popup = await waitForApprovalWindow(env.ctx);
+    const popup = await waitForApprovalWindow(env);
     await visible(popup, "#view-approve-sign");
     await clickAndClose(popup, "#btn-reject-sign");
 
@@ -3401,7 +3427,7 @@ test("eth_sendTransaction signs the approved transaction and broadcasts it (#183
         data: TX_DATA,
     };
     await startRequest(env.dapp, "tx", "eth_sendTransaction", [txParams]);
-    const popup = await waitForApprovalWindow(env.ctx);
+    const popup = await waitForApprovalWindow(env);
     await visible(popup, "#view-approve-tx");
     const boundary = await watchApprovalBoundary(popup, env);
 
@@ -3542,7 +3568,7 @@ test("eth_sendTransaction rejected broadcasts nothing (#183)", async (env) => {
             data: TX_DATA,
         },
     ]);
-    const popup = await waitForApprovalWindow(env.ctx);
+    const popup = await waitForApprovalWindow(env);
     await visible(popup, "#view-approve-tx");
     await clickAndClose(popup, "#btn-reject-tx");