@wordpress/e2e-tests 3.0.5 → 3.0.8

package/specs/editor/various/multi-block-selection.test.js

@@ -10,6 +10,7 @@ import {
 	clickBlockToolbarButton,
 	clickButton,
 	clickMenuItem,
+	openListView,
 	saveDraft,
 	transformBlockTo,
 } from '@wordpress/e2e-test-utils';
@@ -747,4 +748,87 @@ describe( 'Multi-block selection', () => {
 		} );
 		expect( selectedText ).toEqual( 'Post title' );
 	} );
+
+	it( 'should multi-select in the ListView component with shift + click', async () => {
+		// Create four blocks.
+		await clickBlockAppender();
+		await page.keyboard.type( '1' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '2' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '3' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '4' );
+
+		// Open up the list view, and get a reference to each of the list items.
+		await openListView();
+		const navButtons = await page.$$(
+			'.block-editor-list-view-block-select-button'
+		);
+
+		// Clicking on the second list item should result in the second block being selected.
+		await navButtons[ 1 ].click();
+		expect( await getSelectedFlatIndices() ).toEqual( 2 );
+
+		// Shift clicking the fourth list item should result in blocks 2 through 4 being selected.
+		await page.keyboard.down( 'Shift' );
+		await navButtons[ 3 ].click();
+		expect( await getSelectedFlatIndices() ).toEqual( [ 2, 3, 4 ] );
+
+		// With the shift key still held down, clicking the first block should result in
+		// the first two blocks being selected.
+		await navButtons[ 0 ].click();
+		expect( await getSelectedFlatIndices() ).toEqual( [ 1, 2 ] );
+
+		// With the shift key up, clicking the fourth block should result in only that block
+		// being selected.
+		await page.keyboard.up( 'Shift' );
+		await navButtons[ 3 ].click();
+		expect( await getSelectedFlatIndices() ).toEqual( 4 );
+	} );
+
+	it( 'should multi-select in the ListView component with shift + up and down keys', async () => {
+		// Create four blocks.
+		await clickBlockAppender();
+		await page.keyboard.type( '1' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '2' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '3' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '4' );
+
+		// Open up the list view. The fourth block button will be focused.
+		await openListView();
+
+		// Press Up twice to focus over the second block.
+		await pressKeyTimes( 'ArrowUp', 2 );
+
+		// Shift + press Down to select the 2nd and 3rd blocks.
+		await page.keyboard.down( 'Shift' );
+		await page.keyboard.press( 'ArrowDown' );
+		expect( await getSelectedFlatIndices() ).toEqual( [ 2, 3 ] );
+
+		// Press Down once more to also select the 4th block.
+		await page.keyboard.press( 'ArrowDown' );
+		expect( await getSelectedFlatIndices() ).toEqual( [ 2, 3, 4 ] );
+
+		// Press Up three times to adjust the selection to only include the first two blocks.
+		await pressKeyTimes( 'ArrowUp', 3 );
+		expect( await getSelectedFlatIndices() ).toEqual( [ 1, 2 ] );
+
+		// Raise the shift key
+		await page.keyboard.up( 'Shift' );
+
+		// Navigate to the bottom of the list of blocks.
+		await pressKeyTimes( 'ArrowDown', 3 );
+
+		// Shift + press UP to select the 3rd and 4th blocks.
+		// This tests that shift selecting blocks by keyboard that are not adjacent
+		// to an existing selection resets the selection.
+		await page.keyboard.down( 'Shift' );
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.up( 'Shift' );
+		expect( await getSelectedFlatIndices() ).toEqual( [ 3, 4 ] );
+	} );
 } );

package/specs/editor/various/post-editor-template-mode.test.js

@@ -6,11 +6,12 @@ import {
 	createNewPost,
 	insertBlock,
 	saveDraft,
-	trashAllPosts,
 	openPreviewPage,
 	openDocumentSettingsSidebar,
 	activatePlugin,
 	deactivatePlugin,
+	deleteAllTemplates,
+	setBrowserViewport,
 } from '@wordpress/e2e-test-utils';
 
 const openSidebarPanelWithTitle = async ( title ) => {
@@ -56,7 +57,7 @@ const switchToTemplateMode = async () => {
 
 	// Check that we switched properly to edit mode.
 	await page.waitForXPath(
-		'//*[contains(@class, "components-snackbar")]/*[text()="Editing template. Changes made here affect all posts and pages that use the template."]'
+		'//*[text()="Editing template. Changes made here affect all posts and pages that use the template."]'
 	);
 	const title = await page.$eval(
 		'.edit-post-template-top-area',
@@ -92,8 +93,8 @@ const createNewTemplate = async ( templateName ) => {
 describe( 'Post Editor Template mode', () => {
 	beforeAll( async () => {
 		await activatePlugin( 'gutenberg-test-block-templates' );
-		await trashAllPosts( 'wp_template' );
-		await trashAllPosts( 'wp_template_part' );
+		await deleteAllTemplates( 'wp_template' );
+		await deleteAllTemplates( 'wp_template_part' );
 	} );
 
 	afterAll( async () => {
@@ -119,7 +120,6 @@ describe( 'Post Editor Template mode', () => {
 		// there's a template resolution bug forcing us to do so.
 		await saveDraft();
 		await page.reload();
-
 		await switchToTemplateMode();
 
 		// Edit the template
@@ -197,3 +197,180 @@ describe( 'Post Editor Template mode', () => {
 		expect( content ).toMatchSnapshot();
 	} );
 } );
+
+describe( 'Delete Post Template Confirmation Dialog', () => {
+	beforeAll( async () => {
+		await activatePlugin( 'gutenberg-test-block-templates' );
+		await deleteAllTemplates( 'wp_template' );
+		await deleteAllTemplates( 'wp_template_part' );
+		await activateTheme( 'twentytwentyone' );
+		await createNewPost();
+		// Create a random post.
+		await page.type( '.editor-post-title__input', 'Just an FSE Post' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'Hello World' );
+
+		// Save the post
+		// Saving shouldn't be necessary but unfortunately,
+		// there's a template resolution bug forcing us to do so.
+		await saveDraft();
+		await page.reload();
+		// Unselect the blocks.
+		await page.evaluate( () => {
+			wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock();
+		} );
+	} );
+
+	afterAll( async () => {
+		await activateTheme( 'twentytwentyone' );
+		await deactivatePlugin( 'gutenberg-test-block-templates' );
+	} );
+
+	[ 'large', 'small' ].forEach( ( viewport ) => {
+		it( `should retain template if deletion is canceled when the viewport is ${ viewport }`, async () => {
+			await setBrowserViewport( viewport );
+
+			const isWelcomeGuideActive = await page.evaluate( () =>
+				wp.data
+					.select( 'core/edit-post' )
+					.isFeatureActive( 'welcomeGuide' )
+			);
+			if ( isWelcomeGuideActive === true ) {
+				await page.evaluate( () =>
+					wp.data
+						.dispatch( 'core/edit-post' )
+						.toggleFeature( 'welcomeGuide' )
+				);
+				await page.reload();
+				await page.waitForSelector( '.edit-post-layout' );
+			}
+			if ( viewport === 'small' ) {
+				await page.waitForXPath( '//button[@aria-label="Settings"]' );
+				await openDocumentSettingsSidebar();
+			}
+			const templateTitle = `${ viewport } Viewport Deletion Test`;
+
+			await createNewTemplate( templateTitle );
+			// Edit the template
+			if ( viewport === 'small' ) {
+				await page.waitForXPath( `//h2[text()="${ templateTitle }"]` );
+				const closeDocumentSettingsButton = await page.waitForXPath(
+					'//button[@aria-label="Close settings"]'
+				);
+				await closeDocumentSettingsButton.click();
+			}
+			await insertBlock( 'Paragraph' );
+			await page.keyboard.type(
+				'Just a random paragraph added to the template'
+			);
+
+			// Save changes
+			const publishButton = await page.waitForXPath(
+				`//button[contains(text(), 'Publish')]`
+			);
+			await publishButton.click();
+			const saveButton = await page.waitForXPath(
+				`//div[contains(@class, "entities-saved-states__panel-header")]/button[contains(text(), 'Save')]`
+			);
+			await saveButton.click();
+			// Avoid publishing the post
+			// Select the cancel button via parent div's class, because the text `Cancel` is used on another button as well
+			const cancelButton = await page.waitForXPath(
+				`//div[contains(@class,"editor-post-publish-panel__header-cancel-button")]/button[not(@disabled)]`
+			);
+			await cancelButton.click();
+
+			const templateDropdown = await page.waitForXPath(
+				`//button[contains(text(), '${ templateTitle }')]`
+			);
+			await templateDropdown.click();
+			const deleteTemplateButton = await page.waitForXPath(
+				'//button[@role="menuitem"][@aria-label="Delete template"]'
+			);
+			await deleteTemplateButton.click();
+
+			await page.waitForXPath(
+				`//*[text()="Are you sure you want to delete the ${ templateTitle } template? It may be used by other pages or posts."]`
+			);
+			const dialogCancelButton = await page.waitForXPath(
+				'//*[@role="dialog"][not(@id="wp-link-wrap")]//button[text()="Cancel"]'
+			);
+			await dialogCancelButton.click();
+
+			const exitTemplateModeButton = await page.waitForXPath(
+				'//button[text()="Back"]'
+			);
+			await exitTemplateModeButton.click();
+
+			await page.waitForXPath(
+				'//button[@aria-label="Settings"][@aria-expanded="false"]'
+			);
+			await openDocumentSettingsSidebar();
+
+			const element = await page.waitForXPath(
+				'//h2/button[contains(text(), "Template")]/../..//select'
+			);
+			const value = await element.getProperty( 'value' );
+			const currentTemplateSlug = await value.jsonValue();
+
+			expect( currentTemplateSlug ).toBe(
+				`wp-custom-template-${ viewport }-viewport-deletion-test`
+			);
+		} );
+
+		it( `should delete template if deletion is confirmed when the viewport is ${ viewport }`, async () => {
+			const templateTitle = `${ viewport } Viewport Deletion Test`;
+
+			await setBrowserViewport( viewport );
+
+			await switchToTemplateMode();
+			if ( viewport === 'small' ) {
+				const closeDocumentSettingsButton = await page.waitForXPath(
+					'//div[contains(@class,"interface-complementary-area-header__small")]/button[@aria-label="Close settings"]'
+				);
+				await closeDocumentSettingsButton.click();
+			}
+
+			const templateDropdown = await page.waitForXPath(
+				`//button[contains(text(), '${ templateTitle }')]`
+			);
+			await templateDropdown.click();
+
+			const deleteTemplateButton = await page.waitForXPath(
+				'//button[@role="menuitem"][@aria-label="Delete template"]'
+			);
+			await deleteTemplateButton.click();
+
+			await page.waitForXPath(
+				`//*[text()="Are you sure you want to delete the ${ templateTitle } template? It may be used by other pages or posts."]`
+			);
+			const dialogConfirmButton = await page.waitForXPath(
+				'//*[@role="dialog"][not(@id="wp-link-wrap")]//button[text()="OK"]'
+			);
+
+			await dialogConfirmButton.click();
+
+			// Saving isn't technically necessary, but for themes without any specified templates,
+			// the removal of the Templates dropdown is delayed. A save and reload allows for this
+			// delay and prevents flakiness
+			await saveDraft();
+			await page.reload();
+
+			const optionElementHandlers = await page.$x(
+				'//h2/button[contains(text(), "Template")]/../..//select/option'
+			);
+			const availableTemplates = [];
+			for ( const elem of optionElementHandlers ) {
+				const elemName = await elem.getProperty( 'textContent' );
+				const templateName = await elemName.jsonValue();
+				availableTemplates.push( templateName );
+			}
+
+			expect(
+				availableTemplates.includes(
+					`${ viewport } Viewport Deletion Test`
+				)
+			).toBe( false );
+		} );
+	} );
+} );

package/specs/editor/various/post-visibility.test.js

@@ -96,7 +96,7 @@ describe( 'Post visibility', () => {
 		);
 		await (
 			await page.$x(
-				'//td[contains(concat(" ", @class, " "), " CalendarDay ")]/div[contains(concat(" ", @class, " "), " components-datetime__date__day ")][text() = "15"]'
+				'//*[@role="application"][@aria-label="Calendar"]//td[@role="button"]/*[text() = "15"]'
 			)
 		 )[ 0 ].click();
 

package/specs/editor/various/switch-to-draft.test.js

@@ -0,0 +1,254 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	createNewPost,
+	openDocumentSettingsSidebar,
+	publishPost,
+	setBrowserViewport,
+	trashAllPosts,
+} from '@wordpress/e2e-test-utils';
+
+async function prepTestPost( postType, viewport ) {
+	// Create a post
+	await createNewPost( { postType } );
+
+	await page.type(
+		'.editor-post-title__input',
+		`Switch scheduled ${ postType } to draft`
+	);
+	await page.keyboard.press( 'Enter' );
+	await page.keyboard.type(
+		`This will be a scheduled ${ postType } edited in a ${ viewport } viewport`
+	);
+
+	// Unselect the blocks.
+	await page.evaluate( () => {
+		wp.data.dispatch( 'core/block-editor' ).clearSelectedBlock();
+	} );
+}
+
+async function publishTestPost( postType, viewport ) {
+	// Create a post
+	await prepTestPost( postType, viewport );
+
+	// Publish the post
+	await publishPost();
+
+	const publishedSnackBar = await page.waitForXPath(
+		`//*[@aria-label="Dismiss this notice"][@role="button"]/div[contains(text(),"published")]`
+	);
+
+	const snackBarText = await (
+		await publishedSnackBar.getProperty( 'textContent' )
+	 ).jsonValue();
+
+	expect( snackBarText.toLowerCase() ).toBe(
+		`${ postType } published.view ${ postType }`
+	);
+
+	const closePublishingPanel = await page.waitForXPath(
+		'//button[@aria-label="Close panel"]'
+	);
+	await closePublishingPanel.click();
+}
+
+async function scheduleTestPost( postType, viewport ) {
+	// Create a post
+	await prepTestPost( postType, viewport );
+
+	if ( viewport === 'small' ) {
+		await openDocumentSettingsSidebar();
+	}
+	// Set a publish date for the next month.
+	await page.click( '.edit-post-post-schedule__toggle' );
+	await page.click(
+		'div[aria-label="Move forward to switch to the next month."]'
+	);
+
+	await (
+		await page.$x( '//td[@role="button"]/*[text() = "15"]' )
+	 )[ 0 ].click();
+
+	await page.click( '.edit-post-post-schedule__toggle' );
+
+	if ( viewport === 'small' ) {
+		const closeDocumentSettingsButton = await page.waitForXPath(
+			'//div[@aria-label="Editor settings"]//button[@aria-label="Close settings"]'
+		);
+		await closeDocumentSettingsButton.click();
+	}
+
+	// Important: target an ellipsis (…) and not three dots (...)
+	const scheduleButton = await page.waitForXPath(
+		'//button[text()="Schedule…"]'
+	);
+	await scheduleButton.click();
+	const secondScheduleButton = await page.waitForXPath(
+		'//button[text()="Schedule"]'
+	);
+	await secondScheduleButton.click();
+
+	const closePublishingPanel = await page.waitForXPath(
+		'//button[@aria-label="Close panel"]'
+	);
+	await closePublishingPanel.click();
+}
+
+async function verifyRevertToDraft( postType ) {
+	const revertedSnackBar = await page.waitForXPath(
+		`//*[@aria-label="Dismiss this notice"][@role="button"]/div[contains(text(),"reverted")]`
+	);
+
+	const revertedSnackBarText = await (
+		await revertedSnackBar.getProperty( 'textContent' )
+	 ).jsonValue();
+
+	expect( revertedSnackBarText.toLowerCase() ).toBe(
+		`${ postType } reverted to draft.`
+	);
+}
+
+describe( 'Clicking "Switch to draft" on a published post/page', () => {
+	beforeAll( async () => {
+		await trashAllPosts( 'post' );
+		await trashAllPosts( 'page' );
+	} );
+	afterEach( async () => {
+		await setBrowserViewport( 'large' );
+	} );
+
+	[ 'large', 'small' ].forEach( ( viewport ) => {
+		describe( `in a ${ viewport } viewport`, () => {
+			[ 'post', 'page' ].forEach( ( postType ) => {
+				const buttonText =
+					viewport === 'large' ? 'Switch to draft' : 'Draft';
+				beforeEach( async () => {
+					await setBrowserViewport( viewport );
+				} );
+
+				it( `should leave a published ${ postType } published if canceled`, async () => {
+					publishTestPost( postType, viewport );
+
+					const switchToDraftButton = await page.waitForXPath(
+						`//button[contains(text(), "${ buttonText }")]`
+					);
+					await switchToDraftButton.click();
+
+					// Process the ConfirmDialog
+					await page.waitForXPath(
+						'//*[text()="Are you sure you want to unpublish this post?"]'
+					);
+					const [ cancelButton ] = await page.$x(
+						'//*[@role="dialog"][not(@id="wp-link-wrap")]//button[text()="Cancel"]'
+					);
+					await cancelButton.click();
+
+					const postStatus = await page.evaluate( () => {
+						return wp.data
+							.select( 'core/editor' )
+							.getEditedPostAttribute( 'status' );
+					} );
+					expect( postStatus ).toBe( 'publish' );
+				} );
+				it( `should revert a published ${ postType } to a draft if confirmed`, async () => {
+					// Switch to draft
+					const switchToDraftButton = await page.waitForXPath(
+						`//button[contains(text(), "${ buttonText }")]`
+					);
+					await switchToDraftButton.click();
+
+					// Process the ConfirmDialog
+					await page.waitForXPath(
+						'//*[text()="Are you sure you want to unpublish this post?"]'
+					);
+					const [ confirmButton ] = await page.$x(
+						'//*[@role="dialog"]//button[text()="OK"]'
+					);
+					await confirmButton.click();
+
+					await verifyRevertToDraft( postType );
+
+					const postStatus = await page.evaluate( () => {
+						return wp.data
+							.select( 'core/editor' )
+							.getEditedPostAttribute( 'status' );
+					} );
+					expect( postStatus ).toBe( 'draft' );
+				} );
+			} );
+		} );
+	} );
+} );
+describe( 'Clicking "Switch to draft" on a scheduled post/page', () => {
+	beforeAll( async () => {
+		await trashAllPosts( 'post' );
+		await trashAllPosts( 'page' );
+	} );
+	afterEach( async () => {
+		await setBrowserViewport( 'large' );
+	} );
+
+	[ 'large', 'small' ].forEach( ( viewport ) => {
+		describe( `in a ${ viewport } viewport`, () => {
+			[ 'post', 'page' ].forEach( ( postType ) => {
+				const buttonText =
+					viewport === 'large' ? 'Switch to draft' : 'Draft';
+				beforeEach( async () => {
+					await setBrowserViewport( viewport );
+				} );
+
+				it( `should leave a scheduled ${ postType } scheduled if canceled`, async () => {
+					scheduleTestPost( postType, viewport );
+
+					const switchToDraftButton = await page.waitForXPath(
+						`//button[contains(text(), "${ buttonText }")]`
+					);
+					await switchToDraftButton.click();
+
+					// Process the ConfirmDialog
+					await page.waitForXPath(
+						'//*[text()="Are you sure you want to unschedule this post?"]'
+					);
+					const [ cancelButton ] = await page.$x(
+						'//*[@role="dialog"][not(@id="wp-link-wrap")]//button[text()="Cancel"]'
+					);
+					await cancelButton.click();
+
+					// Confirm post is still scheduled
+					const postStatus = await page.evaluate( () => {
+						return wp.data
+							.select( 'core/editor' )
+							.getEditedPostAttribute( 'status' );
+					} );
+					expect( postStatus ).toBe( 'future' );
+				} );
+				it( `should revert a scheduled ${ postType } to a draft if confirmed`, async () => {
+					// Switch to draft
+					const switchToDraftButton = await page.waitForXPath(
+						`//button[contains(text(), "${ buttonText }")]`
+					);
+					await switchToDraftButton.click();
+
+					// Process the ConfirmDialog
+					await page.waitForXPath(
+						'//*[text()="Are you sure you want to unschedule this post?"]'
+					);
+					const [ confirmButton ] = await page.$x(
+						'//*[@role="dialog"]//button[text()="OK"]'
+					);
+					await confirmButton.click();
+
+					await verifyRevertToDraft( postType );
+
+					const postStatus = await page.evaluate( () => {
+						return wp.data
+							.select( 'core/editor' )
+							.getEditedPostAttribute( 'status' );
+					} );
+					expect( postStatus ).toBe( 'draft' );
+				} );
+			} );
+		} );
+	} );
+} );

package/specs/editor/various/writing-flow.test.js

@@ -437,6 +437,44 @@ describe( 'Writing Flow', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
+	it( 'should merge and then split paragraphs', async () => {
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( 'abc' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '123' );
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'Delete' );
+		await page.keyboard.press( 'Enter' );
+
+		expect( await getEditedPostContent() ).toMatchInlineSnapshot( `
+		"<!-- wp:paragraph -->
+		<p>abc</p>
+		<!-- /wp:paragraph -->
+
+		<!-- wp:paragraph -->
+		<p>123</p>
+		<!-- /wp:paragraph -->"
+	` );
+	} );
+
+	it( 'should merge and then soft line break', async () => {
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '1' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '2' );
+		await page.keyboard.press( 'ArrowUp' );
+		await page.keyboard.press( 'Delete' );
+		await page.keyboard.down( 'Shift' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.up( 'Shift' );
+
+		expect( await getEditedPostContent() ).toMatchInlineSnapshot( `
+		"<!-- wp:paragraph -->
+		<p>1<br>2</p>
+		<!-- /wp:paragraph -->"
+	` );
+	} );
+
 	it( 'should merge forwards', async () => {
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.type( '1' );
@@ -449,6 +487,33 @@ describe( 'Writing Flow', () => {
 		expect( await getEditedPostContent() ).toMatchSnapshot();
 	} );
 
+	it( 'should merge forwards properly on multiple triggers', async () => {
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '1' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '2' );
+		await page.keyboard.press( 'Enter' );
+		await page.keyboard.type( '3' );
+		await pressKeyTimes( 'ArrowUp', 2 );
+		await pressKeyTimes( 'Delete', 2 );
+		expect( await getEditedPostContent() ).toMatchInlineSnapshot( `
+		"<!-- wp:paragraph -->
+		<p>1</p>
+		<!-- /wp:paragraph -->
+
+		<!-- wp:paragraph -->
+		<p>3</p>
+		<!-- /wp:paragraph -->"
+	` );
+		await page.keyboard.press( 'Delete' );
+
+		expect( await getEditedPostContent() ).toMatchInlineSnapshot( `
+		"<!-- wp:paragraph -->
+		<p>13</p>
+		<!-- /wp:paragraph -->"
+	` );
+	} );
+
 	it( 'should preserve horizontal position when navigating vertically between blocks', async () => {
 		await page.keyboard.press( 'Enter' );
 		await page.keyboard.type( 'abc' );

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

@@ -8,13 +8,13 @@ import { writeFileSync } from 'fs';
  * WordPress dependencies
  */
 import {
-	trashAllPosts,
 	activateTheme,
 	canvas,
 	createNewPost,
 	visitSiteEditor,
 	saveDraft,
 	insertBlock,
+	deleteAllTemplates,
 } from '@wordpress/e2e-test-utils';
 
 /**
@@ -32,13 +32,12 @@ jest.setTimeout( 1000000 );
 describe( 'Site Editor Performance', () => {
 	beforeAll( async () => {
 		await activateTheme( 'emptytheme' );
-		await trashAllPosts( 'wp_template' );
-		await trashAllPosts( 'wp_template', 'auto-draft' );
-		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' );
 	} );