Blocks E2E: Fix flaky block insertion tests (#47213)

plugins/woocommerce-blocks/tests/e2e/tests/breadcrumbs/breadcrumbs.block_theme.spec.ts

@@ -25,24 +25,6 @@ test.describe( `${ blockData.slug } Block`, () => {
 		);
 	} );
 
-	test( 'block should be already added in the Product Catalog Template', async ( {
-		editorUtils,
-		admin,
-	} ) => {
-		await admin.visitSiteEditor( {
-			postId: 'woocommerce/woocommerce//archive-product',
-			postType: 'wp_template',
-		} );
-		await editorUtils.enterEditMode();
-		const alreadyPresentBlock = await editorUtils.getBlockByName(
-			blockData.slug
-		);
-
-		await expect( alreadyPresentBlock ).toHaveText(
-			'Breadcrumbs / Navigation / Path'
-		);
-	} );
-
 	test( 'block can be inserted in the Site Editor', async ( {
 		admin,
 		requestUtils,
@@ -58,9 +40,10 @@ test.describe( `${ blockData.slug } Block`, () => {
 		await admin.visitSiteEditor( {
 			postId: template.id,
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
 
-		await editorUtils.enterEditMode();
+		await expect( editor.canvas.getByText( 'howdy' ) ).toBeVisible();
 
 		await editor.insertBlock( {
 			name: blockData.slug,

plugins/woocommerce-blocks/tests/e2e/tests/catalog-sorting/catalog-sorting.block_theme.spec.ts

@@ -22,22 +22,6 @@ test.describe( `${ blockData.slug } Block`, () => {
 		);
 	} );
 
-	test( 'block should be already added in the Product Catalog Template', async ( {
-		editorUtils,
-		admin,
-	} ) => {
-		await admin.visitSiteEditor( {
-			postId: 'woocommerce/woocommerce//archive-product',
-			postType: 'wp_template',
-		} );
-		await editorUtils.enterEditMode();
-		const alreadyPresentBlock = await editorUtils.getBlockByName(
-			blockData.slug
-		);
-
-		await expect( alreadyPresentBlock ).toHaveText( 'Default sorting' );
-	} );
-
 	test( 'block can be inserted in the Site Editor', async ( {
 		admin,
 		requestUtils,
@@ -53,9 +37,10 @@ test.describe( `${ blockData.slug } Block`, () => {
 		await admin.visitSiteEditor( {
 			postId: template.id,
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
 
-		await editorUtils.enterEditMode();
+		await expect( editor.canvas.getByText( 'howdy' ) ).toBeVisible();
 
 		await editor.insertBlock( {
 			name: blockData.slug,

plugins/woocommerce-blocks/tests/e2e/tests/product-results-count/product-results-count.block_theme.spec.ts

@@ -22,24 +22,6 @@ test.describe( `${ blockData.slug } Block`, () => {
 		);
 	} );
 
-	test( 'block should be already added in the Product Catalog Template', async ( {
-		editorUtils,
-		admin,
-	} ) => {
-		await admin.visitSiteEditor( {
-			postId: 'woocommerce/woocommerce//archive-product',
-			postType: 'wp_template',
-		} );
-		await editorUtils.enterEditMode();
-		const alreadyPresentBlock = await editorUtils.getBlockByName(
-			blockData.slug
-		);
-
-		await expect( alreadyPresentBlock ).toHaveText(
-			'Showing 1-X of X results'
-		);
-	} );
-
 	test( 'block can be inserted in the Site Editor', async ( {
 		admin,
 		requestUtils,
@@ -55,9 +37,10 @@ test.describe( `${ blockData.slug } Block`, () => {
 		await admin.visitSiteEditor( {
 			postId: template.id,
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
 
-		await editorUtils.enterEditMode();
+		await expect( editor.canvas.getByText( 'howdy' ) ).toBeVisible();
 
 		await editor.insertBlock( {
 			name: blockData.slug,

plugins/woocommerce-blocks/tests/e2e/tests/single-product-details/single-product-details.block_theme.spec.ts

@@ -25,24 +25,6 @@ test.describe( `${ blockData.slug } Block`, () => {
 		);
 	} );
 
-	test( 'block should be already added in the Single Product Template', async ( {
-		editorUtils,
-		admin,
-	} ) => {
-		await admin.visitSiteEditor( {
-			postId: 'woocommerce/woocommerce//single-product',
-			postType: 'wp_template',
-		} );
-		await editorUtils.enterEditMode();
-		const alreadyPresentBlock = await editorUtils.getBlockByName(
-			blockData.slug
-		);
-
-		await expect( alreadyPresentBlock ).toHaveText(
-			/This block lists description, attributes and reviews for a single product./
-		);
-	} );
-
 	test( 'block can be inserted in the Site Editor', async ( {
 		admin,
 		requestUtils,
@@ -59,9 +41,10 @@ test.describe( `${ blockData.slug } Block`, () => {
 		await admin.visitSiteEditor( {
 			postId: template.id,
 			postType: 'wp_template',
+			canvas: 'edit',
 		} );
 
-		await editorUtils.enterEditMode();
+		await expect( editor.canvas.getByText( 'howdy' ) ).toBeVisible();
 
 		await editor.insertBlock( {
 			name: blockData.slug,

plugins/woocommerce/changelog/47213-fix-flaky-e2e-block-insertion-tests

@@ -0,0 +1,4 @@
+Significance: patch
+Type: dev
+
+Blocks E2E: Fix flaky block insertion tests