From 9b12e3d78e03001f9a15499a47600b2ce2527db9 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Sun, 25 Oct 2026 12:19:13 -0500
Subject: [PATCH] fix races in ui settings import e2e tests

confirmImport clicked any button named "Import", so when the file parse was slow it hit the Import Settings button before the dialog opened and the page never reloaded. The click is now scoped to the dialog. The legacy layouts test also wrote naturalAspectLayout after the view had already read it, so it reloads the view after the write.
---
 web/e2e/specs/settings/ui-settings-transfer.spec.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/e2e/specs/settings/ui-settings-transfer.spec.ts b/web/e2e/specs/settings/ui-settings-transfer.spec.ts
index 2716482a3c..f199e8cda7 100644
--- a/web/e2e/specs/settings/ui-settings-transfer.spec.ts
+++ b/web/e2e/specs/settings/ui-settings-transfer.spec.ts
@@ -121,9 +121,14 @@ async function confirmImport(page: Page) {
   // route change, so #pageRoot is already present and waiting for it
   // alone can race the navigation. Wait for the "load" event first so
   // the evaluate() calls below run against the post-reload document.
+  // scoped to the dialog: until it opens, a page-wide "Import" match is the
+  // Import Settings button, which only reopens the file chooser
   await Promise.all([
     page.waitForEvent("load"),
-    page.getByRole("button", { name: "Import" }).click(),
+    page
+      .getByRole("dialog")
+      .getByRole("button", { name: "Import", exact: true })
+      .click(),
   ]);
   await page.waitForSelector("#pageRoot");
 }
@@ -270,6 +275,9 @@ test.describe("UI settings import/export @medium", () => {
     // naturalAspectLayout preference must not override that.
     await frigateApp.goto("/settings?page=uiSettings");
     await writeIdb(frigateApp.page, { "naturalAspectLayout:admin": true });
+    // the view reads the setting once on mount, so load it again after the
+    // write
+    await frigateApp.goto("/settings?page=uiSettings");
 
     await chooseImportFile(
       frigateApp.page,