Fix flaky 'Push to Global Styles' e2e test (#51636)

* Fix flaky 'Push to Global Styles' e2e test
* Simplify beforeAll

test/e2e/specs/site-editor/push-to-global-styles.spec.js

@@ -5,19 +5,18 @@ const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
 test.describe( 'Push to Global Styles button', () => {
 	test.beforeAll( async ( { requestUtils } ) => {
-		await Promise.all( [
-			requestUtils.activateTheme( 'emptytheme' ),
-			requestUtils.deleteAllTemplates( 'wp_template' ),
-			requestUtils.deleteAllTemplates( 'wp_template_part' ),
-		] );
+		await requestUtils.activateTheme( 'emptytheme' );
 	} );
 
 	test.afterAll( async ( { requestUtils } ) => {
 		await requestUtils.activateTheme( 'twentytwentyone' );
 	} );
 
 	test.beforeEach( async ( { admin, editor } ) => {
-		await admin.visitSiteEditor();
+		await admin.visitSiteEditor( {
+			postId: 'emptytheme//index',
+			postType: 'wp_template',
+		} );
 		await editor.canvas.click( 'body' );
 	} );
 
@@ -29,8 +28,10 @@ test.describe( 'Push to Global Styles button', () => {
 		await editor.insertBlock( { name: 'core/heading' } );
 		await page.keyboard.type( 'A heading' );
 
+		const topBar = page.getByRole( 'region', { name: 'Editor top bar' } );
+
 		// Navigate to Styles -> Blocks -> Heading -> Typography
-		await page.getByRole( 'button', { name: 'Styles' } ).click();
+		await topBar.getByRole( 'button', { name: 'Styles' } ).click();
 		await page.getByRole( 'button', { name: 'Blocks styles' } ).click();
 		await page
 			.getByRole( 'button', { name: 'Heading block styles' } )
@@ -42,7 +43,7 @@ test.describe( 'Push to Global Styles button', () => {
 		).toHaveAttribute( 'aria-pressed', 'false' );
 
 		// Go to block settings and open the Advanced panel
-		await page.getByRole( 'button', { name: 'Settings' } ).click();
+		await topBar.getByRole( 'button', { name: 'Settings' } ).click();
 		await page.getByRole( 'button', { name: 'Advanced' } ).click();
 
 		// Push button should be disabled