From 5bc8bb7905b69b0ebffb22675ca704abcb6dfe57 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Wed, 7 Jul 2021 09:37:15 +0100
Subject: [PATCH] Fix e2e tests

---
 .../e2e-tests/specs/editor/plugins/cpt-locking.test.js    | 4 ++--
 .../specs/editor/various/inserting-blocks.test.js         | 8 ++++----
 .../e2e-tests/specs/editor/various/writing-flow.test.js   | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js b/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
index aee6398871a9b1..03abfc56d189b8 100644
--- a/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
+++ b/packages/e2e-tests/specs/editor/plugins/cpt-locking.test.js
@@ -123,12 +123,12 @@ describe( 'cpt locking', () => {
 			await page.click(
 				'.wp-block-column .block-editor-button-block-appender'
 			);
-			await page.type( '.block-editor-inserter__search-input', 'image' );
+			await page.type( '.block-editor-inserter__search input', 'image' );
 			await pressKeyTimes( 'Tab', 2 );
 			await page.keyboard.press( 'Enter' );
 			await page.click( '.edit-post-header-toolbar__inserter-toggle' );
 			await page.type(
-				'.block-editor-inserter__search-input',
+				'.block-editor-inserter__search input',
 				'gallery'
 			);
 			await pressKeyTimes( 'Tab', 2 );
diff --git a/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js b/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js
index e4a0e07a13d81d..acc7965c5621d2 100644
--- a/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js
+++ b/packages/e2e-tests/specs/editor/various/inserting-blocks.test.js
@@ -147,7 +147,7 @@ describe( 'Inserting blocks', () => {
 			() =>
 				document.activeElement &&
 				document.activeElement.classList.contains(
-					'block-editor-inserter__search-input'
+					'components-search-control__input'
 				)
 		);
 		await page.keyboard.type( 'para' );
@@ -185,7 +185,7 @@ describe( 'Inserting blocks', () => {
 			() => document.activeElement.classList
 		);
 		expect( Object.values( activeElementClassList ) ).toContain(
-			'block-editor-inserter__search-input'
+			'components-search-control__input'
 		);
 
 		// Try using the up arrow key (vertical navigation triggers the issue described in #9583).
@@ -196,7 +196,7 @@ describe( 'Inserting blocks', () => {
 			() => document.activeElement.classList
 		);
 		expect( Object.values( activeElementClassList ) ).toContain(
-			'block-editor-inserter__search-input'
+			'components-search-control__input'
 		);
 
 		// Tab to the block list
@@ -250,7 +250,7 @@ describe( 'Inserting blocks', () => {
 		);
 
 		// Insert a paragraph block.
-		await page.waitForSelector( '.block-editor-inserter__search-input' );
+		await page.waitForSelector( '.block-editor-inserter__search input' );
 
 		// Search for the paragraph block if it's not in the list of blocks shown.
 		if ( ! page.$( '.editor-block-list-item-paragraph' ) ) {
diff --git a/packages/e2e-tests/specs/editor/various/writing-flow.test.js b/packages/e2e-tests/specs/editor/various/writing-flow.test.js
index 3b8e6746ac866a..566303fabfeaf2 100644
--- a/packages/e2e-tests/specs/editor/various/writing-flow.test.js
+++ b/packages/e2e-tests/specs/editor/various/writing-flow.test.js
@@ -29,7 +29,7 @@ const addParagraphsAndColumnsDemo = async () => {
 	await page.keyboard.press( 'Enter' );
 	await page.click( ':focus [aria-label="Two columns; equal split"]' );
 	await page.click( ':focus .block-editor-button-block-appender' );
-	await page.waitForSelector( ':focus.block-editor-inserter__search-input' );
+	await page.waitForSelector( '.block-editor-inserter__search input:focus' );
 	await page.keyboard.type( 'Paragraph' );
 	await pressKeyTimes( 'Tab', 2 ); // Tab to paragraph result.
 	await page.keyboard.press( 'Enter' ); // Insert paragraph.
@@ -40,7 +40,7 @@ const addParagraphsAndColumnsDemo = async () => {
 	// is a temporary solution.
 	await page.focus( '.wp-block[data-type="core/column"]:nth-child(2)' );
 	await page.click( ':focus .block-editor-button-block-appender' );
-	await page.waitForSelector( ':focus.block-editor-inserter__search-input' );
+	await page.waitForSelector( '.block-editor-inserter__search input:focus' );
 	await page.keyboard.type( 'Paragraph' );
 	await pressKeyTimes( 'Tab', 2 ); // Tab to paragraph result.
 	await page.keyboard.press( 'Enter' ); // Insert paragraph.