Fix a few things

WordPress · May 4, 2022 · b3a4334 · b3a4334
1 parent 3f32c20
commit b3a4334
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 17 deletions.
diff --git a/...ils-playwright/src/page/get-page-error.js → ...ls-playwright/src/admin/get-page-error.ts b/...ils-playwright/src/page/get-page-error.js → ...ls-playwright/src/admin/get-page-error.ts
@@ -1,3 +1,8 @@
+/**
+ * Internal dependencies
+ */
+import type { Admin } from './';
+
 /**
  * Regular expression matching a displayed PHP error within a markup string.
  *
@@ -15,11 +20,12 @@ const REGEXP_PHP_ERROR = /(<b>)?(Fatal error|Recoverable fatal error|Warning|Par
  *
  * @see http://php.net/manual/en/function.error-reporting.php
  *
- * @this {import('./').PageUtils}
+ * @param {Admin} this
+ *
  * @return {Promise<?string>} Promise resolving to a string or null, depending
  *                            whether a page error is present.
  */
-export async function getPageError() {
+export async function getPageError( this: Admin ) {
 	const content = await this.page.content();
 	const match = content.match( REGEXP_PHP_ERROR );
 	return match ? match[ 0 ] : null;

diff --git a/packages/e2e-test-utils-playwright/src/admin/index.ts b/packages/e2e-test-utils-playwright/src/admin/index.ts
@@ -10,6 +10,8 @@ import type { Browser, Page, BrowserContext } from '@playwright/test';
  * Internal dependencies
  */
 import { createNewPost } from './create-new-post';
+import { getPageError } from './get-page-error';
+import { isCurrentURL } from './is-current-url';
 import { visitAdminPage } from './visit-admin-page';
 import { visitSiteEditor } from './visit-site-editor';
 
@@ -25,6 +27,8 @@ export class Admin {
 	}
 
 	createNewPost = createNewPost;
+	getPageError = getPageError;
+	isCurrentURL = isCurrentURL;
 	visitAdminPage = visitAdminPage;
 	visitSiteEditor = visitSiteEditor;
 }
diff --git a/...ils-playwright/src/page/is-current-url.js → ...ls-playwright/src/admin/is-current-url.ts b/...ils-playwright/src/page/is-current-url.js → ...ls-playwright/src/admin/is-current-url.ts
@@ -2,15 +2,16 @@
  * Internal dependencies
  */
 import { WP_BASE_URL } from '../config';
+import type { Admin } from './';
 
 /**
  * Checks if current URL is a WordPress path.
  *
- * @this {import('./').PageUtils}
+ * @param {Admin}  this
  * @param {string} WPPath String to be serialized as pathname.
  * @return {boolean} Boolean represents whether current URL is or not a WordPress path.
  */
-export function isCurrentURL( WPPath ) {
+export function isCurrentURL( this: Admin, WPPath: string ) {
 	const currentURL = new URL( this.page.url() );
 	const expectedURL = new URL( WPPath, WP_BASE_URL );
 

diff --git a/...-playwright/src/admin/visit-admin-page.js → ...-playwright/src/admin/visit-admin-page.ts b/...-playwright/src/admin/visit-admin-page.js → ...-playwright/src/admin/visit-admin-page.ts
@@ -3,14 +3,23 @@
  */
 import { join } from 'path';
 
+/**
+ * Internal dependencies
+ */
+import type { Admin } from './';
+
 /**
  * Visits admin page and handle errors.
  *
- * @this {import('./').PageUtils}
+ * @param {Admin}  this
  * @param {string} adminPath String to be serialized as pathname.
  * @param {string} query     String to be serialized as query portion of URL.
  */
-export async function visitAdminPage( adminPath, query ) {
+export async function visitAdminPage(
+	this: Admin,
+	adminPath: string,
+	query: string
+) {
 	await this.page.goto(
 		join( 'wp-admin', adminPath ) + ( query ? `?${ query }` : '' )
 	);

diff --git a/packages/e2e-test-utils-playwright/src/page/index.ts b/packages/e2e-test-utils-playwright/src/page/index.ts
@@ -6,14 +6,11 @@ import type { Browser, Page, BrowserContext } from '@playwright/test';
 /**
  * Internal dependencies
  */
-import { getPageError } from './get-page-error';
-import { isCurrentURL } from './is-current-url';
 import {
 	setClipboardData,
 	pressKeyWithModifier,
 } from './press-key-with-modifier';
 import { pressKeyTimes } from './press-key-times';
-import { selectBlockByClientId } from '../editor/select-block-by-client-id';
 import { setBrowserViewport } from './set-browser-viewport';
 
 class PageUtils {
@@ -27,13 +24,10 @@ class PageUtils {
 		this.browser = this.context.browser()!;
 	}
 
-	getPageError = getPageError;
-	isCurrentURL = isCurrentURL;
+	pressKeyTimes = pressKeyTimes;
 	pressKeyWithModifier = pressKeyWithModifier;
-	setClipboardData = setClipboardData;
-	selectBlockByClientId = selectBlockByClientId;
 	setBrowserViewport = setBrowserViewport;
-	pressKeyTimes = pressKeyTimes;
+	setClipboardData = setClipboardData;
 }
 
 export { PageUtils };
diff --git a/test/e2e/specs/site-editor/template-part.spec.js b/test/e2e/specs/site-editor/template-part.spec.js
@@ -9,7 +9,7 @@ const {
 
 test.use( {
 	editor: async ( { page }, use ) => {
-		await use( new Editor( { page, isIframe: true } ) );
+		await use( new Editor( { page, hasIframe: true } ) );
 	},
 } );
 
@@ -59,7 +59,7 @@ test.describe( 'Template Part', () => {
 		await expect( paragraph ).toBeVisible();
 	} );
 
-	test.only( 'can detach blocks from a template part', async ( {
+	test( 'can detach blocks from a template part', async ( {
 		admin,
 		editor,
 		page,
@@ -97,7 +97,7 @@ test.describe( 'Template Part', () => {
 			'data-block'
 		);
 		await editor.selectBlockByClientId( templatePartClientId );
-		await canvas.clickBlockOptionsMenuItem(
+		await editor.clickBlockOptionsMenuItem(
 			'Detach blocks from template part'
 		);