@wordpress/e2e-tests 3.0.7 → 3.0.10-next.a55ed9455a.0

package/specs/site-editor/site-editor-inserter.test.js

@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import {
-	trashAllPosts,
+	deleteAllTemplates,
 	activateTheme,
 	visitSiteEditor,
 } from '@wordpress/e2e-test-utils';
@@ -10,8 +10,8 @@ import {
 describe( 'Site Editor Inserter', () => {
 	beforeAll( async () => {
 		await activateTheme( 'emptytheme' );
-		await trashAllPosts( 'wp_template' );
-		await trashAllPosts( 'wp_template_part' );
+		await deleteAllTemplates( 'wp_template' );
+		await deleteAllTemplates( 'wp_template_part' );
 	} );
 	afterAll( async () => {
 		await activateTheme( 'twentytwentyone' );

package/specs/site-editor/template-part.test.js

@@ -3,7 +3,7 @@
  */
 import {
 	insertBlock,
-	trashAllPosts,
+	deleteAllTemplates,
 	activateTheme,
 	getAllBlocks,
 	selectBlockByClientId,
@@ -18,12 +18,12 @@ const templatePartNameInput =
 describe( 'Template Part', () => {
 	beforeAll( async () => {
 		await activateTheme( 'emptytheme' );
-		await trashAllPosts( 'wp_template' );
-		await trashAllPosts( 'wp_template_part' );
+		await deleteAllTemplates( 'wp_template' );
+		await deleteAllTemplates( 'wp_template_part' );
 	} );
 	afterAll( async () => {
-		await trashAllPosts( 'wp_template' );
-		await trashAllPosts( 'wp_template_part' );
+		await deleteAllTemplates( 'wp_template' );
+		await deleteAllTemplates( 'wp_template_part' );
 		await activateTheme( 'twentytwentyone' );
 	} );
 
@@ -138,23 +138,23 @@ describe( 'Template Part', () => {
 			await insertBlock( 'Paragraph' );
 			await page.keyboard.type( 'Header Template Part 789' );
 
-			// Select the paragraph block
+			// Select the paragraph block.
 			const text = await canvas().waitForXPath(
 				'//p[contains(text(), "Header Template Part 789")]'
 			);
 
-			// Highlight all the text in the paragraph block
+			// Highlight all the text in the paragraph block.
 			await text.click( { clickCount: 3 } );
 
-			// Click the convert to link toolbar button
+			// Click the convert to link toolbar button.
 			await page.waitForSelector( 'button[aria-label="Link"]' );
 			await page.click( 'button[aria-label="Link"]' );
 
-			// Enter url for link
+			// Enter url for link.
 			await page.keyboard.type( 'https://google.com' );
 			await page.keyboard.press( 'Enter' );
 
-			// Verify that there is no error
+			// Verify that there is no error.
 			await canvas().click( 'p[data-type="core/paragraph"] a' );
 			const expectedContent = await canvas().$x(
 				'//p[contains(text(), "Header Template Part 789")]'
@@ -184,7 +184,7 @@ describe( 'Template Part', () => {
 			await page.keyboard.type( 'My template part' );
 			await page.keyboard.press( 'Enter' );
 
-			// Wait for creation to finish
+			// Wait for creation to finish.
 			await page.waitForXPath(
 				'//*[contains(@class, "components-snackbar")]/*[text()="Template part created."]'
 			);
@@ -233,7 +233,7 @@ describe( 'Template Part', () => {
 			await page.keyboard.type( 'My multi  template part' );
 			await page.keyboard.press( 'Enter' );
 
-			// Wait for creation to finish
+			// Wait for creation to finish.
 			await page.waitForXPath(
 				'//*[contains(@class, "components-snackbar")]/*[text()="Template part created."]'
 			);
@@ -250,20 +250,21 @@ describe( 'Template Part', () => {
 				finalTemplateParts.length - initialTemplateParts.length
 			).toBe( 1 );
 		} );
+
 		describe( 'Template part placeholder', () => {
 			// Test constants for template part.
 			const testContent = 'some words...';
 
-			// Selectors
+			// Selectors.
 			const entitiesSaveSelector =
 				'.editor-entities-saved-states__save-button';
 			const savePostSelector = '.edit-site-save-button__button';
 			const templatePartSelector = '*[data-type="core/template-part"]';
 			const activatedTemplatePartSelector = `${ templatePartSelector }.block-editor-block-list__layout`;
-			const createNewButtonSelector =
-				'//button[contains(text(), "New template part")]';
+			const startBlockButtonSelector =
+				'//button[contains(text(), "Start blank")]';
 			const chooseExistingButtonSelector =
-				'//button[contains(text(), "Choose existing")]';
+				'//button[contains(text(), "Choose")]';
 			const confirmTitleButtonSelector =
 				'.wp-block-template-part__placeholder-create-new__title-form .components-button.is-primary';
 
@@ -273,13 +274,10 @@ describe( 'Template Part', () => {
 
 				// Create new template part.
 				await insertBlock( 'Template Part' );
-				await siteEditorCanvas.waitForXPath(
-					chooseExistingButtonSelector
-				);
-				const [ createNewButton ] = await siteEditorCanvas.$x(
-					createNewButtonSelector
+				const startBlankButton = await siteEditorCanvas.waitForXPath(
+					startBlockButtonSelector
 				);
-				await createNewButton.click();
+				await startBlankButton.click();
 				const confirmTitleButton = await page.waitForSelector(
 					confirmTitleButtonSelector
 				);
@@ -318,13 +316,16 @@ describe( 'Template Part', () => {
 					chooseExistingButtonSelector
 				);
 				await chooseExistingButton.click();
-				await page.waitForSelector(
-					'.wp-block-template-part__selection-preview-container'
-				);
 				const preview = await page.waitForSelector(
-					'.wp-block-template-part__selection-preview-item[aria-label="Create New"]'
+					'.block-editor-block-patterns-list__item'
 				);
 				await preview.click();
+
+				// Wait for the template parts to load properly.
+				await siteEditorCanvas.waitForSelector(
+					'[data-type="core/template-part"] > p:first-child'
+				);
+
 				// We now have the same template part two times in the page, so check accordingly.
 				const paragraphs = await siteEditorCanvas.$$eval(
 					'[data-type="core/template-part"] > p:first-child',

package/specs/site-editor/template-revert.test.js

@@ -3,15 +3,11 @@
  */
 import {
 	insertBlock,
-	trashAllPosts,
 	activateTheme,
-	switchUserToAdmin,
-	switchUserToTest,
-	visitAdminPage,
+	deleteAllTemplates,
 	visitSiteEditor,
 	getCurrentSiteEditorContent,
 } from '@wordpress/e2e-test-utils';
-import { addQueryArgs } from '@wordpress/url';
 
 const assertSaveButtonIsDisabled = async () =>
 	page.waitForSelector(
@@ -71,30 +67,19 @@ const revertTemplate = async () => {
 	await assertSaveButtonIsEnabled();
 };
 
-const assertTemplatesAreDeleted = async () => {
-	await switchUserToAdmin();
-	const query = addQueryArgs( '', {
-		post_type: 'wp_template',
-	} ).slice( 1 );
-	await visitAdminPage( 'edit.php', query );
-	const element = await page.waitForSelector( '#the-list .no-items' );
-	expect( element ).toBeTruthy();
-	await switchUserToTest();
-};
-
 describe( 'Template Revert', () => {
 	beforeAll( async () => {
 		await activateTheme( 'emptytheme' );
-		await trashAllPosts( 'wp_template' );
-		await trashAllPosts( 'wp_template_part' );
+		await deleteAllTemplates( 'wp_template' );
+		await deleteAllTemplates( 'wp_template_part' );
 	} );
 	afterAll( async () => {
-		await trashAllPosts( 'wp_template' );
-		await trashAllPosts( 'wp_template_part' );
+		await deleteAllTemplates( 'wp_template' );
+		await deleteAllTemplates( 'wp_template_part' );
 		await activateTheme( 'twentytwentyone' );
 	} );
 	beforeEach( async () => {
-		await trashAllPosts( 'wp_template' );
+		await deleteAllTemplates( 'wp_template' );
 		await visitSiteEditor();
 	} );
 
@@ -104,7 +89,12 @@ describe( 'Template Revert', () => {
 		await revertTemplate();
 		await save();
 
-		await assertTemplatesAreDeleted();
+		await page.click( '.edit-site-document-actions__get-info' );
+
+		// The revert button isn't visible anymore.
+		expect(
+			await page.$( '.edit-site-template-details__revert-button' )
+		).toBeNull();
 	} );
 
 	it( 'should show the original content after revert', async () => {

package/specs/widgets/customizing-widgets.test.js

@@ -25,16 +25,17 @@ describe( 'Widgets Customizer', () => {
 		await visitAdminPage( 'customize.php' );
 
 		// Disable welcome guide if it is enabled.
-		const isWelcomeGuideActive = await page.evaluate( () =>
-			wp.data
-				.select( 'core/interface' )
-				.isFeatureActive( 'core/customize-widgets', 'welcomeGuide' )
+		const isWelcomeGuideActive = await page.evaluate(
+			() =>
+				!! wp.data
+					.select( 'core/preferences' )
+					.get( 'core/customize-widgets', 'welcomeGuide' )
 		);
 		if ( isWelcomeGuideActive ) {
 			await page.evaluate( () =>
 				wp.data
-					.dispatch( 'core/interface' )
-					.toggleFeature( 'core/customize-widgets', 'welcomeGuide' )
+					.dispatch( 'core/preferences' )
+					.toggle( 'core/customize-widgets', 'welcomeGuide' )
 			);
 		}
 	} );
@@ -784,7 +785,7 @@ describe( 'Widgets Customizer', () => {
 
 		await waitForPreviewIframe();
 
-		// Click Publish
+		// Click Publish.
 		const publishButton = await find( {
 			role: 'button',
 			name: 'Publish',
@@ -797,7 +798,7 @@ describe( 'Widgets Customizer', () => {
 			disabled: true,
 		} );
 
-		// Select the paragraph block
+		// Select the paragraph block.
 		const paragraphBlock = await find( {
 			role: 'document',
 			name: 'Paragraph block',
@@ -824,7 +825,7 @@ describe( 'Widgets Customizer', () => {
 
 		// Now that we've made a change:
 		// (1) Publish button should be active
-		// (2) We should still be in the "Block Settings" area
+		// (2) We should still be in the "Block Settings" area.
 		await find( {
 			role: 'button',
 			name: 'Publish',
@@ -880,6 +881,10 @@ async function addBlock( blockName ) {
 		}
 	} );
 
+	// Click something so that the block toolbar, which sometimes obscures
+	// buttons in the inserter, goes away.
+	await searchBox.click();
+
 	await searchBox.type( blockName );
 
 	// TODO - remove this timeout when the test plugin for disabling CSS

package/specs/widgets/editing-widgets.test.js

@@ -31,16 +31,17 @@ describe( 'Widgets screen', () => {
 		await visitWidgetsScreen();
 
 		// Disable welcome guide if it is enabled.
-		const isWelcomeGuideActive = await page.evaluate( () =>
-			wp.data
-				.select( 'core/interface' )
-				.isFeatureActive( 'core/edit-widgets', 'welcomeGuide' )
+		const isWelcomeGuideActive = await page.evaluate(
+			() =>
+				!! wp.data
+					.select( 'core/preferences' )
+					.get( 'core/edit-widgets', 'welcomeGuide' )
 		);
 		if ( isWelcomeGuideActive ) {
 			await page.evaluate( () =>
 				wp.data
-					.dispatch( 'core/interface' )
-					.toggleFeature( 'core/edit-widgets', 'welcomeGuide' )
+					.dispatch( 'core/preferences' )
+					.toggle( 'core/edit-widgets', 'welcomeGuide' )
 			);
 		}
 
@@ -811,7 +812,7 @@ describe( 'Widgets screen', () => {
 		// To do: clicking on the Snackbar causes focus loss.
 		await page.focus( '.block-editor-writing-flow' );
 
-		// Undo block deletion and save again
+		// Undo block deletion and save again.
 		await pressKeyWithModifier( 'primary', 'z' );
 		await saveWidgets();