@wordpress/e2e-tests 3.0.5 → 3.0.8

package/specs/site-editor/document-settings.test.js

@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import {
-	trashAllPosts,
+	deleteAllTemplates,
 	activateTheme,
 	visitSiteEditor,
 } from '@wordpress/e2e-test-utils';
@@ -26,8 +26,8 @@ async function getDocumentSettingsSecondaryTitle() {
 describe( 'Document Settings', () => {
 	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/multi-entity-editing.test.js

@@ -5,7 +5,7 @@ import {
 	insertBlock,
 	createNewPost,
 	publishPost,
-	trashAllPosts,
+	deleteAllTemplates,
 	activateTheme,
 	canvas,
 	openDocumentSettingsSidebar,
@@ -135,8 +135,8 @@ const removeErrorMocks = () => {
 describe( 'Multi-entity editor states', () => {
 	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 () => {
@@ -185,8 +185,8 @@ describe( 'Multi-entity editor states', () => {
 		const templateName = 'Custom Template';
 
 		beforeAll( async () => {
-			await trashAllPosts( 'wp_template' );
-			await trashAllPosts( 'wp_template_part' );
+			await deleteAllTemplates( 'wp_template' );
+			await deleteAllTemplates( 'wp_template_part' );
 			await createNewPost( {
 				postType: 'wp_template',
 				title: templateName,

package/specs/site-editor/multi-entity-saving.test.js

@@ -13,6 +13,7 @@ import {
 	clickButton,
 	createReusableBlock,
 	visitSiteEditor,
+	deleteAllTemplates,
 } from '@wordpress/e2e-test-utils';
 
 describe( 'Multi-entity save flow', () => {
@@ -43,8 +44,8 @@ describe( 'Multi-entity save flow', () => {
 
 	beforeAll( async () => {
 		await activateTheme( 'emptytheme' );
-		await trashAllPosts( 'wp_template' );
-		await trashAllPosts( 'wp_template_part' );
+		await deleteAllTemplates( 'wp_template' );
+		await deleteAllTemplates( 'wp_template_part' );
 		await trashAllPosts( 'wp_block' );
 
 		// Get the current Site Title and Site Tagline, so that we can reset
@@ -267,7 +268,7 @@ describe( 'Multi-entity save flow', () => {
 			// Select the header template part via list view.
 			await page.click( '.edit-site-header-toolbar__list-view-toggle' );
 			const headerTemplatePartListViewButton = await page.waitForXPath(
-				'//a[contains(@class, "block-editor-list-view-block-select-button")][contains(., "Header")]'
+				'//a[contains(@class, "block-editor-list-view-block-select-button")][contains(., "header")]'
 			);
 			headerTemplatePartListViewButton.click();
 			await page.click( 'button[aria-label="Close List View Sidebar"]' );

package/specs/site-editor/settings-sidebar.test.js

@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import {
-	trashAllPosts,
+	deleteAllTemplates,
 	activateTheme,
 	getAllBlocks,
 	selectBlockByClientId,
@@ -39,12 +39,12 @@ async function getTemplateCard() {
 describe( 'Settings sidebar', () => {
 	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 () => {

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

@@ -9,7 +9,7 @@ import os from 'os';
  * WordPress dependencies
  */
 import {
-	trashAllPosts,
+	deleteAllTemplates,
 	activateTheme,
 	visitSiteEditor,
 	clickOnMoreMenuItem,
@@ -31,8 +31,8 @@ async function waitForFileExists( filePath, timeout = 10000 ) {
 describe( 'Site Editor Templates Export', () => {
 	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 () => {

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' );
 	} );
 
@@ -260,10 +260,10 @@ describe( 'Template Part', () => {
 			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 +273,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 +315,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

@@ -880,6 +880,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