From 41f807d1e31d7d1f358f3f61a9b7a40c57d72db0 Mon Sep 17 00:00:00 2001
From: Jan Jakes <jan@jakes.pro>
Date: Wed, 3 Dec 2025 14:48:06 +0100
Subject: [PATCH 1/2] Fix flaky phpMyAdmin test

---
 .../website/playwright/e2e/website-ui.spec.ts       | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/playground/website/playwright/e2e/website-ui.spec.ts b/packages/playground/website/playwright/e2e/website-ui.spec.ts
index 0cfa6da669..dee7e849eb 100644
--- a/packages/playground/website/playwright/e2e/website-ui.spec.ts
+++ b/packages/playground/website/playwright/e2e/website-ui.spec.ts
@@ -450,18 +450,31 @@ test.describe('Database panel', () => {
 		await expect(newPage.locator('body')).toContainText('phpMyAdmin');
 		await expect(newPage.locator('body')).toContainText('wp_posts');
 
+		/*
+		 * Before clicking a link in phpMyAdmin, we need to wait for any AJAX
+		 * requests to be done. This prevents flaky tests (mainly in Firefox).
+		 *
+		 * @see https://github.com/phpmyadmin/phpmyadmin/blob/3925c2237701050ee34f5ba79d74fda808673d4f/resources/js/modules/ajax.ts
+		 */
+		const waitForAjaxIdle = async () =>
+			newPage.waitForFunction(() => {
+				return (window as any).AJAX?.active === false;
+			});
+
 		// Browse the "wp_posts" table
 		const wpPostsRow = newPage
 			.locator('tr')
 			.filter({ hasText: 'wp_posts' })
 			.first();
 		await expect(wpPostsRow).toBeVisible({ timeout: 10000 });
+		await waitForAjaxIdle();
 		await wpPostsRow.getByRole('link', { name: 'Browse' }).click();
 		await newPage.waitForLoadState();
 		const pmaRows = newPage.locator('table.table_results tbody tr');
 		await expect(pmaRows.first()).toContainText('Welcome to WordPress.');
 
 		// Click "edit" on a row
+		await waitForAjaxIdle();
 		await pmaRows
 			.first()
 			.getByRole('link', { name: 'Edit' })

From a854ffd7cd775296d4e297663351d56979113a9d Mon Sep 17 00:00:00 2001
From: Jan Jakes <jan@jakes.pro>
Date: Wed, 3 Dec 2025 20:11:39 +0100
Subject: [PATCH 2/2] Clean up phpMyAdmin and Adminer tests

---
 .../website/playwright/e2e/website-ui.spec.ts    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/playground/website/playwright/e2e/website-ui.spec.ts b/packages/playground/website/playwright/e2e/website-ui.spec.ts
index dee7e849eb..a83d4cca36 100644
--- a/packages/playground/website/playwright/e2e/website-ui.spec.ts
+++ b/packages/playground/website/playwright/e2e/website-ui.spec.ts
@@ -360,7 +360,7 @@ test.describe('Database panel', () => {
 
 	test('should load and open Adminer', async ({ website, context }) => {
 		const adminerButton = website.page.getByRole('button', {
-			name: /Open Adminer/i,
+			name: 'Open Adminer',
 		});
 		await expect(adminerButton).toBeVisible();
 		await expect(adminerButton).toBeEnabled();
@@ -432,7 +432,7 @@ test.describe('Database panel', () => {
 
 	test('should load and open phpMyAdmin', async ({ website, context }) => {
 		const phpMyAdminButton = website.page.getByRole('button', {
-			name: /Open phpMyAdmin/i,
+			name: 'Open phpMyAdmin',
 		});
 		await expect(phpMyAdminButton).toBeVisible();
 		await expect(phpMyAdminButton).toBeEnabled();
@@ -466,7 +466,7 @@ test.describe('Database panel', () => {
 			.locator('tr')
 			.filter({ hasText: 'wp_posts' })
 			.first();
-		await expect(wpPostsRow).toBeVisible({ timeout: 10000 });
+		await expect(wpPostsRow).toBeVisible();
 		await waitForAjaxIdle();
 		await wpPostsRow.getByRole('link', { name: 'Browse' }).click();
 		await newPage.waitForLoadState();
@@ -481,14 +481,12 @@ test.describe('Database panel', () => {
 			.first()
 			.click();
 		await newPage.waitForLoadState();
-		const pmaForm = newPage.locator(
-			'form#insertForm, form[name="insertForm"]'
-		);
-		await expect(pmaForm).toBeVisible({ timeout: 10000 });
-		await expect(pmaForm).toContainText('Welcome to WordPress.');
+		const editForm = newPage.locator('form#insertForm');
+		await expect(editForm).toBeVisible();
+		await expect(editForm).toContainText('Welcome to WordPress.');
 
 		// Update the post content
-		const postContentRow = pmaForm
+		const postContentRow = editForm
 			.locator('tr')
 			.filter({ hasText: 'post_content' })
 			.first();