Tests: Auto-fix some new 'eslint-plugin-playwright' warnings

test/e2e/specs/admin/font-library.spec.js

@@ -16,19 +16,19 @@ test.describe( 'Font Library', () => {
 			);
 		} );
 
-		test.afterAll( async ( { requestUtils } ) => {
-			await requestUtils.deactivatePlugin(
-				'gutenberg-test-delete-installed-fonts'
-			);
-		} );
-
 		test.beforeEach( async ( { admin } ) => {
 			await admin.visitAdminPage(
 				'admin.php',
 				'page=font-library-wp-admin'
 			);
 		} );
 
+		test.afterAll( async ( { requestUtils } ) => {
+			await requestUtils.deactivatePlugin(
+				'gutenberg-test-delete-installed-fonts'
+			);
+		} );
+
 		test( 'should allow user to add and remove multiple local font files', async ( {
 			page,
 			editor,

test/e2e/specs/editor/blocks/buttons.spec.js

@@ -271,14 +271,14 @@ test.describe( 'Buttons', () => {
 			await requestUtils.activateTheme( 'emptytheme' );
 		} );
 
-		test.afterAll( async ( { requestUtils } ) => {
-			await requestUtils.activateTheme( 'twentytwentyone' );
-		} );
-
 		test.beforeEach( async ( { admin } ) => {
 			await admin.createNewPost();
 		} );
 
+		test.afterAll( async ( { requestUtils } ) => {
+			await requestUtils.activateTheme( 'twentytwentyone' );
+		} );
+
 		test( 'can resize width', async ( { editor, page } ) => {
 			// Mock spacing units to include % for the width control
 			await page.waitForFunction( () => window?.wp?.data );

test/e2e/specs/editor/blocks/classic.spec.js

@@ -18,14 +18,14 @@ test.use( {
 } );
 
 test.describe( 'Classic', () => {
-	test.afterAll( async ( { requestUtils } ) => {
-		await requestUtils.deleteAllMedia();
-	} );
-
 	test.beforeEach( async ( { admin } ) => {
 		await admin.createNewPost();
 	} );
 
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMedia();
+	} );
+
 	test( 'should be inserted', async ( { editor, page } ) => {
 		await editor.insertBlock( { name: 'core/freeform' } );
 		await editor.canvas
@@ -142,7 +142,7 @@ test.describe( 'Classic', () => {
 		await expect( classicBlock ).toBeVisible();
 		await classicBlock.click();
 
-		expect( errors.length ).toBe( 0 );
+		expect( errors ).toHaveLength( 0 );
 		await expect.poll( editor.getEditedPostContent ).toBe( 'test' );
 	} );
 } );

test/e2e/specs/editor/blocks/columns.spec.js

@@ -84,6 +84,7 @@ test.describe( 'Columns', () => {
 		await pageUtils.pressKeys( 'Tab' );
 		await expect( columnsChangeInput ).toHaveValue( '3' );
 	} );
+
 	test( 'Ungroup properly', async ( { editor } ) => {
 		await editor.insertBlock( {
 			name: 'core/columns',

test/e2e/specs/editor/blocks/image.spec.js

@@ -969,14 +969,14 @@ test.describe( 'Image - lightbox', () => {
 		);
 	} );
 
-	test.afterAll( async ( { requestUtils } ) => {
-		await requestUtils.deleteAllMedia();
-	} );
-
 	test.beforeEach( async ( { admin } ) => {
 		await admin.createNewPost();
 	} );
 
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMedia();
+	} );
+
 	test.describe( 'should respect theme.json settings and block overrides', () => {
 		test.describe( 'Theme.json settings - allow editing FALSE, enabled FALSE', () => {
 			test.beforeAll( async ( { requestUtils } ) => {

test/e2e/specs/editor/blocks/navigation-frontend-interactivity.spec.js

@@ -11,16 +11,16 @@ test.describe( 'Navigation block - Frontend interactivity', () => {
 		await requestUtils.deleteAllMenus();
 	} );
 
-	test.afterAll( async ( { requestUtils } ) => {
-		await requestUtils.activateTheme( 'twentytwentyone' );
-	} );
-
 	test.afterEach( async ( { requestUtils } ) => {
 		await requestUtils.deleteAllTemplates( 'wp_template_part' );
 		await requestUtils.deleteAllPages();
 		await requestUtils.deleteAllMenus();
 	} );
 
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
+	} );
+
 	test.describe( 'Overlay menu', () => {
 		test.beforeEach( async ( { admin, editor, requestUtils } ) => {
 			await admin.visitSiteEditor( {

test/e2e/specs/editor/blocks/navigation-submenu-visibility.spec.js

@@ -4,11 +4,6 @@
 const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
 test.describe( 'Navigation block - Submenu Visibility', () => {
-	test.afterAll( async ( { requestUtils } ) => {
-		await requestUtils.deleteAllMenus();
-		await requestUtils.deleteAllPages();
-	} );
-
 	test.beforeEach( async ( { admin, editor, requestUtils } ) => {
 		await admin.createNewPost();
 
@@ -38,6 +33,11 @@ test.describe( 'Navigation block - Submenu Visibility', () => {
 		await editor.selectBlocks( navBlock );
 	} );
 
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMenus();
+		await requestUtils.deleteAllPages();
+	} );
+
 	test( 'When Always is selected, submenus are visible on the page', async ( {
 		editor,
 		page,
@@ -139,6 +139,7 @@ test.describe( 'Navigation block - Submenu Visibility', () => {
 		const pageListBlock = editor.canvas.getByRole( 'document', {
 			name: 'Block: Page List',
 		} );
+
 		await test.step( 'Test setup', async () => {
 			// Create parent and child pages for testing
 			const parentPage = await requestUtils.createPage( {
@@ -206,6 +207,7 @@ test.describe( 'Navigation block - Submenu Visibility', () => {
 
 			await expect( submenuVisibilityGroup ).toBeVisible();
 		} );
+
 		await test.step( 'Set submenu visibility to always', async () => {
 			const settingsPanel = page
 				.getByRole( 'region', { name: 'Editor settings' } )

test/e2e/specs/editor/blocks/query.spec.js

@@ -13,13 +13,6 @@ test.describe( 'Query block', () => {
 		await requestUtils.createPost( { title: 'Post 1', status: 'publish' } );
 	} );
 
-	test.afterAll( async ( { requestUtils } ) => {
-		await Promise.all( [
-			requestUtils.deleteAllPosts(),
-			requestUtils.deactivatePlugin( 'gutenberg-test-query-block' ),
-		] );
-	} );
-
 	test.beforeEach( async ( { admin } ) => {
 		await admin.createNewPost( {
 			postType: 'page',
@@ -31,6 +24,13 @@ test.describe( 'Query block', () => {
 		await requestUtils.deleteAllPages();
 	} );
 
+	test.afterAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.deleteAllPosts(),
+			requestUtils.deactivatePlugin( 'gutenberg-test-query-block' ),
+		] );
+	} );
+
 	test.describe( 'Query block insertion', () => {
 		test( 'List', async ( { page, editor } ) => {
 			await editor.insertBlock( { name: 'core/query' } );

test/e2e/specs/editor/blocks/search.spec.js

@@ -9,17 +9,17 @@ test.describe( 'Search', () => {
 		await admin.createNewPost();
 	} );
 
-	test.afterAll( async ( { requestUtils } ) => {
-		await requestUtils.deleteAllMenus();
-	} );
-
 	test.afterEach( async ( { requestUtils } ) => {
 		await Promise.all( [
 			requestUtils.deleteAllPosts(),
 			requestUtils.deleteAllMenus(),
 		] );
 	} );
 
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllMenus();
+	} );
+
 	test( 'should auto-configure itself to sensible defaults when inserted into a Navigation block', async ( {
 		page,
 		editor,

test/e2e/specs/editor/plugins/block-hooks.spec.js

@@ -45,6 +45,7 @@ test.describe( 'Block Hooks API', () => {
 	].forEach( ( { name, postType, blockType, createMethod } ) => {
 		test.describe( `Hooked blocks in ${ name } (blocks)`, () => {
 			let postObject, containerPost;
+
 			test.beforeAll( async ( { requestUtils } ) => {
 				postObject = await requestUtils[ createMethod ]( {
 					title: name,
@@ -185,6 +186,7 @@ test.describe( 'Block Hooks API', () => {
 
 		test.describe( `Hooked blocks in ${ name } (classic)`, () => {
 			let postObject, containerPost;
+
 			test.beforeAll( async ( { requestUtils } ) => {
 				postObject = await requestUtils[ createMethod ]( {
 					title: name,
@@ -308,6 +310,7 @@ test.describe( 'Block Hooks API', () => {
 
 	test.describe( 'Hooked blocks in Navigation Menu', () => {
 		let postObject, containerPost;
+
 		test.beforeAll( async ( { requestUtils } ) => {
 			postObject = await requestUtils.createNavigationMenu( {
 				title: 'Navigation Menu',

test/e2e/specs/editor/plugins/format-api.spec.js

@@ -8,14 +8,14 @@ test.describe( 'Using Format API', () => {
 		await requestUtils.activatePlugin( 'gutenberg-test-format-api' );
 	} );
 
-	test.afterAll( async ( { requestUtils } ) => {
-		await requestUtils.deactivatePlugin( 'gutenberg-test-format-api' );
-	} );
-
 	test.beforeEach( async ( { admin } ) => {
 		await admin.createNewPost();
 	} );
 
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deactivatePlugin( 'gutenberg-test-format-api' );
+	} );
+
 	test( 'Clicking the control wraps the selected text properly with HTML code', async ( {
 		editor,
 		page,

test/e2e/specs/editor/plugins/hooks-api.spec.js

@@ -9,14 +9,14 @@ test.describe( 'Using Hooks API', () => {
 		await requestUtils.activatePlugin( 'gutenberg-test-hooks-api' );
 	} );
 
-	test.afterAll( async ( { requestUtils } ) => {
-		await requestUtils.deactivatePlugin( 'gutenberg-test-hooks-api' );
-	} );
-
 	test.beforeEach( async ( { admin } ) => {
 		await admin.createNewPost();
 	} );
 
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.deactivatePlugin( 'gutenberg-test-hooks-api' );
+	} );
+
 	test( 'Should contain a reset block button on the sidebar', async ( {
 		page,
 		editor,

test/e2e/specs/editor/plugins/inner-blocks-allowed-blocks.spec.js

@@ -10,16 +10,16 @@ test.describe( 'Allowed Blocks Setting on InnerBlocks', () => {
 		);
 	} );
 
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
 	test.afterAll( async ( { requestUtils } ) => {
 		await requestUtils.deactivatePlugin(
 			'gutenberg-test-innerblocks-allowed-blocks'
 		);
 	} );
 
-	test.beforeEach( async ( { admin } ) => {
-		await admin.createNewPost();
-	} );
-
 	test( 'allows all blocks if the allowed blocks setting was not set', async ( {
 		editor,
 		page,

test/e2e/specs/editor/plugins/server-side-rendered-block.spec.js

@@ -23,6 +23,7 @@ test.describe( 'Server-side rendered block', () => {
 			'gutenberg-test-server-side-rendered-block'
 		);
 	} );
+
 	test.beforeEach( async ( { admin, editor } ) => {
 		await admin.createNewPost();
 		await editor.insertBlock( { name: 'test/server-side-rendered-block' } );
@@ -112,16 +113,16 @@ test.describe( 'PHP-only auto-register blocks', () => {
 		);
 	} );
 
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
 	test.afterAll( async ( { requestUtils } ) => {
 		await requestUtils.deactivatePlugin(
 			'gutenberg-test-server-side-rendered-block'
 		);
 	} );
 
-	test.beforeEach( async ( { admin } ) => {
-		await admin.createNewPost();
-	} );
-
 	test( 'should register blocks with autoRegister flag', async ( {
 		editor,
 	} ) => {

test/e2e/specs/editor/various/autocomplete-and-mentions.spec.js

@@ -47,6 +47,7 @@ const userList = [
 		password: 'sm1lingsmyfavorite',
 	},
 ];
+
 test.describe( 'Autocomplete (@firefox, @webkit)', () => {
 	test.beforeAll( async ( { requestUtils } ) => {
 		await Promise.all(
@@ -61,21 +62,22 @@ test.describe( 'Autocomplete (@firefox, @webkit)', () => {
 		await requestUtils.activatePlugin( 'gutenberg-test-autocompleter' );
 	} );
 
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
 	test.afterAll( async ( { requestUtils } ) => {
 		await requestUtils.deleteAllUsers();
 		await requestUtils.deactivatePlugin( 'gutenberg-test-autocompleter' );
 		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
 
-	test.beforeEach( async ( { admin } ) => {
-		await admin.createNewPost();
-	} );
-
 	[
 		[ 'User Mention', 'mention' ],
 		[ 'Custom Completer', 'option' ],
 	].forEach( ( completerAndOptionType ) => {
 		const [ completer, type ] = completerAndOptionType;
+
 		test( `${ completer }: should insert ${ type }`, async ( {
 			page,
 			editor,

test/e2e/specs/editor/various/background-gradient.spec.js

@@ -10,14 +10,14 @@ test.describe( 'Background gradient block support', () => {
 		await requestUtils.activateTheme( 'emptytheme' );
 	} );
 
-	test.afterAll( async ( { requestUtils } ) => {
-		await requestUtils.activateTheme( 'twentytwentyone' );
-	} );
-
 	test.beforeEach( async ( { admin } ) => {
 		await admin.createNewPost();
 	} );
 
+	test.afterAll( async ( { requestUtils } ) => {
+		await requestUtils.activateTheme( 'twentytwentyone' );
+	} );
+
 	test.describe( 'color.gradient read-through and migration', () => {
 		// A custom gradient that does NOT match any WordPress preset so that
 		// clicking a preset in the picker always performs a fresh selection