From af7a54c9d10737dd97fe0eeb46f98a2ccf343d04 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Wed, 8 Jul 2026 16:16:15 +0900
Subject: [PATCH] fix

---
 packages/frontend/test/e2e/router.spec.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/test/e2e/router.spec.ts b/packages/frontend/test/e2e/router.spec.ts
index 2a07a05a28..4805c31c08 100644
--- a/packages/frontend/test/e2e/router.spec.ts
+++ b/packages/frontend/test/e2e/router.spec.ts
@@ -18,11 +18,18 @@ test.describe('Router transition', () => {
 		await resetState(request);
 		await registerUser(request, 'admin', 'pass', true);
 		await registerUser(request, 'alice', 'alice1234');
+	});
+
+	test.beforeEach(async ({ page }) => {
 		await signIn(page, 'alice', 'alice1234');
 
-		// 表示に時間がかかるのでデフォルト秒数だとタイムアウトする
-		await page.locator('[data-testid="user-setup-dialog"] [data-testid="modal-window-close"]').click({ timeout: 30000 });
-		await page.getByTestId('modal-dialog-ok').click();
+		// 表示に時間がかかるのでデフォルト秒数だとタイムアウトする。少し待つ
+		await page.waitForTimeout(1000);
+
+		if (await page.getByTestId('user-setup-dialog').isVisible()) {
+			await page.locator('[data-testid="user-setup-dialog"] [data-testid="modal-window-close"]').click();
+			await page.getByTestId('modal-dialog-ok').click();
+		}
 	});
 
 	test.describe('Redirect', () => {