From 5aa9f349bfd327d25cbb7a6e6cee71a0c692ba2a Mon Sep 17 00:00:00 2001
From: Juerg Hunziker <juerg.hunziker@liip.ch>
Date: Mon, 13 Nov 2023 08:02:50 +0100
Subject: [PATCH] fix flaky settings test

---
 playwright/e2e/settings/settings.spec.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/playwright/e2e/settings/settings.spec.ts b/playwright/e2e/settings/settings.spec.ts
index 60b62ce4..c12c3a84 100644
--- a/playwright/e2e/settings/settings.spec.ts
+++ b/playwright/e2e/settings/settings.spec.ts
@@ -1,13 +1,11 @@
 const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
 test.describe( 'Settings page', () => {
-	test.beforeEach( async ( { admin } ) => {
+	test( 'Default values are selected', async ( { admin, page } ) => {
 		await admin.visitAdminPage(
 			'options-general.php?page=wp-bootstrap-blocks_settings'
 		);
-	} );
 
-	test( 'Default values are selected', async ( { page } ) => {
 		expect(
 			await page
 				.locator( '#wp-bootstrap-blocks_bootstrap_version' )
@@ -22,11 +20,15 @@ test.describe( 'Settings page', () => {
 		await expect( enableCssGridCheckbox ).not.toBeDisabled();
 	} );
 
-	test( 'Respects constants', async ( { page, requestUtils } ) => {
+	test( 'Respects constants', async ( { admin, page, requestUtils } ) => {
 		await requestUtils.activatePlugin(
 			'wp-bootstrap-blocks-test-css-grid'
 		);
 
+		await admin.visitAdminPage(
+			'options-general.php?page=wp-bootstrap-blocks_settings'
+		);
+
 		await expect(
 			await page.locator( '#wp-bootstrap-blocks_bootstrap_version' )
 		).toBeDisabled();