From c366a967f69ce1a80e79660165985e230c2dd75d Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 3 Mar 2022 17:45:23 +0800
Subject: [PATCH] Update e2e test actions and selectors

---
 packages/e2e-test-utils/src/site-editor.js | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/e2e-test-utils/src/site-editor.js b/packages/e2e-test-utils/src/site-editor.js
index 212f11dff64fa8..0f7bfcc980d059 100644
--- a/packages/e2e-test-utils/src/site-editor.js
+++ b/packages/e2e-test-utils/src/site-editor.js
@@ -59,26 +59,32 @@ export async function closeSiteEditorNavigationPanel() {
  * Skips the welcome guide popping up to first time users of the site editor
  */
 export async function disableSiteEditorWelcomeGuide() {
-	const isWelcomeGuideActive = await page.evaluate( () =>
-		wp.data.select( 'core/edit-site' ).isFeatureActive( 'welcomeGuide' )
+	const isWelcomeGuideActive = await page.evaluate(
+		() =>
+			!! wp.data
+				.select( 'core/preferences' )
+				.get( 'core/edit-site', 'welcomeGuide' )
 	);
-	const isWelcomeGuideStyesActive = await page.evaluate( () =>
-		wp.data
-			.select( 'core/edit-site' )
-			.isFeatureActive( 'welcomeGuideStyles' )
+	const isWelcomeGuideStyesActive = await page.evaluate(
+		() =>
+			!! wp.data
+				.select( 'core/preferences' )
+				.get( 'core/edit-site', 'welcomeGuideStyles' )
 	);
 
 	if ( isWelcomeGuideActive ) {
 		await page.evaluate( () =>
-			wp.data.dispatch( 'core/edit-site' ).toggleFeature( 'welcomeGuide' )
+			wp.data
+				.dispatch( 'core/preferences' )
+				.toggle( 'core/edit-site', 'welcomeGuide' )
 		);
 	}
 
 	if ( isWelcomeGuideStyesActive ) {
 		await page.evaluate( () =>
 			wp.data
-				.dispatch( 'core/edit-site' )
-				.toggleFeature( 'welcomeGuideStyles' )
+				.dispatch( 'core/preferences' )
+				.toggle( 'core/edit-site', 'welcomeGuideStyles' )
 		);
 	}
 }