From 7d615cf3ec7433d24a486e01514a9ab68ecee5a6 Mon Sep 17 00:00:00 2001
From: Adrian Moldovan <3854374+adimoldovan@users.noreply.github.com>
Date: Wed, 11 Jan 2023 20:02:36 +0200
Subject: [PATCH] E2E tests: remove check for post page (#28299)

---
 tools/e2e-commons/bin/e2e-env.sh                    | 1 -
 tools/e2e-commons/pages/page-actions.js             | 2 +-
 tools/e2e-commons/pages/postFrontend.js             | 2 +-
 tools/e2e-commons/pages/wp-admin/blocks/word-ads.js | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tools/e2e-commons/bin/e2e-env.sh b/tools/e2e-commons/bin/e2e-env.sh
index b7fcd64689ada..4128ec446489c 100755
--- a/tools/e2e-commons/bin/e2e-env.sh
+++ b/tools/e2e-commons/bin/e2e-env.sh
@@ -70,7 +70,6 @@ configure_wp_env() {
 	fi
 	$BASE_CMD wp option set permalink_structure ""
 	$BASE_CMD wp jetpack module deactivate sso
-	$BASE_CMD wp theme activate twentytwentyone
 
 	echo
 	$BASE_CMD wp plugin status
diff --git a/tools/e2e-commons/pages/page-actions.js b/tools/e2e-commons/pages/page-actions.js
index 01dd157b0225e..0f60b4e0322c9 100644
--- a/tools/e2e-commons/pages/page-actions.js
+++ b/tools/e2e-commons/pages/page-actions.js
@@ -58,7 +58,7 @@ export default class PageActions {
 			await this.waitForDomContentLoaded();
 		}
 
-		if ( checkSelectors ) {
+		if ( checkSelectors && this.selectors ) {
 			for ( const selector of this.selectors ) {
 				await this.waitForElementToBeVisible( selector );
 			}
diff --git a/tools/e2e-commons/pages/postFrontend.js b/tools/e2e-commons/pages/postFrontend.js
index aba8856450dfe..eeb2730afacdc 100644
--- a/tools/e2e-commons/pages/postFrontend.js
+++ b/tools/e2e-commons/pages/postFrontend.js
@@ -4,7 +4,7 @@ import { resolveSiteUrl } from '../helpers/utils-helper.cjs';
 export default class PostFrontendPage extends WpPage {
 	constructor( page ) {
 		const url = resolveSiteUrl();
-		super( page, { expectedSelectors: [ '.post' ], url } );
+		super( page, { url } );
 	}
 
 	/**
diff --git a/tools/e2e-commons/pages/wp-admin/blocks/word-ads.js b/tools/e2e-commons/pages/wp-admin/blocks/word-ads.js
index 16f0ac925b414..0704851bac766 100644
--- a/tools/e2e-commons/pages/wp-admin/blocks/word-ads.js
+++ b/tools/e2e-commons/pages/wp-admin/blocks/word-ads.js
@@ -37,7 +37,7 @@ export default class WordAdsBlock extends PageActions {
 	 */
 	static async isRendered( page ) {
 		// We check for either the ads placeholder div, or the iframes if the ads are loaded.
-		const containerSelector = ".entry-content iframe[src*='wordads'],article .wpa";
+		const containerSelector = ".entry-content iframe[src*='wordads'],main .wpa .wpa-about";
 		await page.waitForSelector( containerSelector );
 	}
 }