From 70eba4e2e6af6d65e8694492f4da1b2b050ac023 Mon Sep 17 00:00:00 2001
From: Bart Kalisz <bartlomiej.kalisz@gmail.com>
Date: Mon, 16 Aug 2021 17:20:00 +0200
Subject: [PATCH] Query block test: demo refactor

---
 .../specs/editor/blocks/query.test.js         | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/blocks/query.test.js b/packages/e2e-tests/specs/editor/blocks/query.test.js
index 769abbf76bee3..3a7f4c1375a4c 100644
--- a/packages/e2e-tests/specs/editor/blocks/query.test.js
+++ b/packages/e2e-tests/specs/editor/blocks/query.test.js
@@ -11,7 +11,7 @@ import {
 } from '@wordpress/e2e-test-utils';
 
 const createDemoPosts = async () => {
-	await createNewPost( { postType: 'post', title: `Post 1` } );
+	await createNewPost( { postType: 'post', title: 'Post 1' } );
 	await publishPost();
 };
 
@@ -44,21 +44,19 @@ describe( 'Query block', () => {
 			await page.waitForSelector(
 				'li.pattern-slide.active-slide[aria-label="Query Test 1"]'
 			);
-			const nextPatternButton = await page.waitForSelector(
+			await page.click(
 				'.block-editor-block-pattern-setup__navigation button[aria-label="Next pattern"]'
 			);
-			await nextPatternButton.click();
 			await page.waitForSelector(
 				'li.pattern-slide.active-slide[aria-label="Query Test 2"]'
 			);
 			// Choose the selected pattern.
-			const chooseButton = await page.waitForXPath(
-				'//div[contains(@class, "block-editor-block-pattern-setup__actions")]//button[text()="Choose"]'
+			await page.click(
+				'.block-editor-block-pattern-setup__actions button:text("Choose")'
 			);
-			chooseButton.click();
 			// Wait for pattern setup to go away.
 			await page.waitForSelector( '.block-editor-block-pattern-setup', {
-				hidden: true,
+				state: 'hidden',
 			} );
 			/**
 			 * We can't use `getEditedPostContent` easily for now because
@@ -75,18 +73,16 @@ describe( 'Query block', () => {
 				'.block-editor-block-pattern-setup__display-controls'
 			);
 			// Click the Grid view button.
-			const gridViewButton = await page.waitForSelector(
+			await page.click(
 				'.block-editor-block-pattern-setup__display-controls button[aria-label="Grid view"]'
 			);
-			await gridViewButton.click();
 			// Wait for patterns to be loaded and click the wanted pattern.
-			const gridPattern = await page.waitForXPath(
-				'//div[@class="block-editor-block-pattern-setup-list__item-title" and contains(text(), "Query Test 2")]'
+			await page.click(
+				'.block-editor-block-pattern-setup-list__item-title:text("Query Test 2")'
 			);
-			await gridPattern.click();
 			// Wait for pattern setup to go away.
 			await page.waitForSelector( '.block-editor-block-pattern-setup', {
-				hidden: true,
+				state: 'hidden',
 			} );
 			/**
 			 * We can't use `getEditedPostContent` easily for now because