update selectBlockByName

tests/e2e/specs/backend/checkout.test.js

@@ -104,8 +104,8 @@ describe( `${ block.name } Block`, () => {
 		describe( 'shipping address block attributes', () => {
 			beforeEach( async () => {
 				await openDocumentSettingsSidebar();
-				await page.click(
-					'.wp-block-woocommerce-checkout-shipping-address-block'
+				await selectBlockByName(
+					'woocommerce/checkout-shipping-address-block'
 				);
 			} );
 
@@ -153,10 +153,7 @@ describe( `${ block.name } Block`, () => {
 		describe( 'action block attributes', () => {
 			beforeEach( async () => {
 				await openDocumentSettingsSidebar();
-				await page.click(
-					block.class +
-						' .wp-block-woocommerce-checkout-actions-block'
-				);
+				await selectBlockByName( 'woocommerce/checkout-actions-block' );
 			} );
 
 			describe( 'Return to cart link', () => {

tests/utils/select-block-by-name.js

@@ -3,9 +3,20 @@
  */
 import { getAllBlocks, selectBlockByClientId } from '@wordpress/e2e-test-utils';
 
-export const selectBlockByName = async ( name ) => {
-	await selectBlockByClientId(
-		( await getAllBlocks() ).find( ( block ) => block.name === name )
-			.clientId
+export const selectBlockByName = async ( blockName ) => {
+	const blocksInEditor = await getAllBlocks();
+	const flatBlockArray = ( blocks ) =>
+		blocks
+			.map( ( block ) => [
+				{ [ block.name ]: block.clientId },
+				block.innerBlocks ? flatBlockArray( block.innerBlocks ) : [],
+			] )
+			.flat( Infinity );
+	const blocksObject = Object.fromEntries(
+		flatBlockArray( blocksInEditor )
+			.map( ( block ) => Object.entries( block ) )
+			.flat()
 	);
+	const clientId = blocksObject[ blockName ];
+	return selectBlockByClientId( clientId );
 };