From 76a123fac976af69e3bc3c928e2a64ee620c317d Mon Sep 17 00:00:00 2001
From: Timo <6156589+Shik3i@users.noreply.github.com>
Date: Tue, 25 Aug 2026 23:39:31 +0200
Subject: [PATCH] test(sync): isolate relay recovery setup

---
 tests/e2e/extension.spec.mjs | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/extension.spec.mjs b/tests/e2e/extension.spec.mjs
index 08e009b..3bb87d4 100644
--- a/tests/e2e/extension.spec.mjs
+++ b/tests/e2e/extension.spec.mjs
@@ -18,7 +18,9 @@ const NodeWebSocket = require('ws');
 /** Runs code in an extension page, where the privileged chrome.* APIs exist. */
 async function withExtensionPage(context, extensionId, fn) {
     const page = await context.newPage();
-    await page.goto(`chrome-extension://${extensionId}/popup.html`);
+    // popup.html performs normal connection/settings initialization. Using it as
+    // a test transport can race and overwrite a just-seeded custom relay URL.
+    await page.goto(`chrome-extension://${extensionId}/audio-options.html`);
     const result = await fn(page);
     await page.close();
     return result;
@@ -62,6 +64,20 @@ async function getExtensionState(context, extensionId, message) {
     ));
 }
 
+async function expectConnectedRoom(context, extensionId, roomId, expected = {}) {
+    try {
+        await expect.poll(() => getExtensionState(context, extensionId, { type: 'GET_STATUS' }))
+            .toMatchObject({ status: 'connected', roomId, ...expected });
+    } catch (error) {
+        const [status, logs] = await Promise.all([
+            getExtensionState(context, extensionId, { type: 'GET_STATUS' }).catch(() => null),
+            getExtensionState(context, extensionId, { type: 'GET_LOGS' }).catch(() => [])
+        ]);
+        console.error(`Extension connection diagnostics: ${JSON.stringify({ status, logs: logs?.slice?.(0, 20) || logs })}`);
+        throw error;
+    }
+}
+
 async function applyCanonicalMediaState(context, extensionId, tabId, mediaState) {
     return withExtensionPage(context, extensionId, page => page.evaluate(async ({ tabId, mediaState }) => {
         return chrome.tabs.sendMessage(tabId, {
@@ -469,8 +485,7 @@ test('recovers relay ROOM_DATA through background retries into the packed player
             username: 'canonical-receiver'
         }));
 
-        await expect.poll(() => getExtensionState(context, extensionId, { type: 'GET_STATUS' }))
-            .toMatchObject({ status: 'connected', roomId, queuedLogicalEvents: 0 });
+        await expectConnectedRoom(context, extensionId, roomId, { queuedLogicalEvents: 0 });
         await expect.poll(() => page.locator('#player').evaluate(video =>
             Number(video.dataset.koalaCanonicalPlayAttempts || '0')))
             .toBeGreaterThanOrEqual(2);
@@ -544,6 +559,7 @@ test('newer mixed-version playback supersedes an in-flight canonical recovery',
             password: '',
             username: 'current-superseded'
         }));
+        await expectConnectedRoom(context, extensionId, roomId, { queuedLogicalEvents: 0 });
         await expect.poll(() => page.locator('#player').evaluate(video =>
             Number(video.dataset.koalaCanonicalPlayAttempts || '0')))
             .toBe(1);
@@ -592,8 +608,7 @@ test('keeps canonical media state current while the capable extension is solo',
             password: '',
             username: 'current-solo'
         }));
-        await expect.poll(() => getExtensionState(context, extensionId, { type: 'GET_STATUS' }))
-            .toMatchObject({ status: 'connected', roomId });
+        await expectConnectedRoom(context, extensionId, roomId);
 
         expect(await sendServerCommand(context, extensionId, tabId, 'pause', { currentTime: 8 }))
             .toMatchObject({ status: 'ok' });