feat: add delete lifecycle

Author: kielllll

tests/e2e/advanced-checks/confirmation-shortcode.test.js

@@ -2,14 +2,12 @@ import { Selector, RequestLogger } from 'testcafe';
 import { baseURL } from '../auth';
 import { link } from '../utilities/page-model/helpers/field';
 import AdvancedCheck from '../utilities/page-model/helpers/advanced-check';
-import Page from '../utilities/page-model/helpers/page';
 // new Page model. Might be used soon as default
-import PagePostType from '../models/Page';
+import Page from '../models/Page';
 
 let shortcodeHolder;
 let downloadUrl;
 const run = new AdvancedCheck();
-const page = new Page();
 const downloadLogger = RequestLogger( downloadUrl, {
 	logResponseBody: true,
 	logResponseHeaders: true,
@@ -87,13 +85,14 @@ test( 'should check if the shortcode confirmation type PAGE is working correctly
 
 	// Create a new page and insert a shortcode block
 	const name = 'Shortcode confrimation type Page';
-	const pagePostType = new PagePostType( name );
-	await pagePostType.add();
-	await pagePostType.insertBlock( 'shortcode', {
+	const page = new Page( name );
+	await page.add();
+	await page.insertBlock( 'shortcode', {
 		target: '.block-editor-plain-text',
 		content: shortcodeHolder,
 	} );
-	await pagePostType.publishChanges();
+	await page.saveChanges();
+	await page.publishChanges();
 
 	// update form settings
 	await run.navigateConfirmationSection(
@@ -150,6 +149,9 @@ test( 'should check if the shortcode confirmation type PAGE is working correctly
 			)
 		)
 		.ok();
+
+	// Cleanup
+	await page.delete();
 } );
 
 test( 'should check if the shortcode confirmation type REDIRECT download is working correctly', async ( t ) => {
@@ -199,15 +201,3 @@ test( 'should check if the shortcode confirmation type REDIRECT download is work
 		)
 		.ok();
 } );
-
-// TODO: make these scenarios as part of the isolated test cases
-// eslint-disable-next-line jest/no-commented-out-tests
-// test( 'reset/clean Page entry for the next test', async ( t ) => {
-// 	// Actions & Assertions
-// 	await page.navigatePage();
-// 	await t
-// 		.hover( link( '#the-list', 'Test-page' ) )
-// 		.click( page.trashLink )
-// 		.expect( link( '#the-list', 'Test-page' ).exists )
-// 		.notOk();
-// } );

tests/e2e/models/Page.js

@@ -1,10 +1,12 @@
 import { Selector, t } from 'testcafe';
 import { link } from '../utilities/page-model/helpers/field';
+import { admin, baseURL } from '../auth';
+import { getQueryParam } from '../utilities/page-model/helpers/search-params';
 
 class Page {
 	constructor( name ) {
+		this.pageId = '';
 		this.pageName = name;
-		this.sortDateColumn = Selector( 'th#date' );
 		this.addNewPageLink = link( '.wrap', 'Add New Page' );
 		this.trashLink = Selector( 'a' ).withAttribute(
 			'aria-label',
@@ -33,6 +35,9 @@ class Page {
 		this.documentPanelCloseButton = Selector(
 			'button.components-button'
 		).withAttribute( 'aria-label', 'Close panel' );
+		this.saveToolbarButton = Selector(
+			'button.components-button'
+		).withText( 'Save' );
 		this.publishToolbarButton = Selector(
 			'.editor-post-publish-button__button'
 		);
@@ -70,6 +75,12 @@ class Page {
 	 * @return {Promise<void>} none
 	 */
 	async delete() {
+		await t
+			.useRole( admin )
+			.navigateTo(
+				`${ baseURL }/wp-admin/post.php?post=${ this.pageId }&action=edit`
+			);
+
 		if ( ! ( await this.documentPanel.exists ) ) {
 			await t.click( this.documentPanelToolbarButton );
 		}
@@ -110,14 +121,17 @@ class Page {
 	 * @return {Promise<void>} none
 	 */
 	async saveChanges() {
-		await t.click( this.publishToolbarButton );
+		await t.click( this.saveToolbarButton );
 	}
 
 	async publishChanges() {
 		await t
 			.click( this.publishToolbarButton )
-			.click( this.confirmPublishButton )
-			.click( this.documentPanelCloseButton );
+			.click( this.confirmPublishButton );
+
+		this.pageId = await getQueryParam( 'post' );
+
+		await t.click( this.documentPanelCloseButton );
 	}
 }
 

tests/e2e/utilities/page-model/helpers/search-params.js

@@ -5,7 +5,7 @@ import { ClientFunction } from 'testcafe';
  *
  * @param { string } param
  *
- * @return { * } param value
+ * @return { string } param value
  */
 export const getQueryParam = ClientFunction( ( param ) => {
 	const urlParams = new URLSearchParams( window.location.search );