Simplify toggleMoreMenu and clickOnMoreMenuItem e2e utils

WordPress · Mar 3, 2022 · 6088be3 · 6088be3
1 parent 0d04d86
commit 6088be3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 46 deletions.
diff --git a/packages/e2e-test-utils/CHANGELOG.md b/packages/e2e-test-utils/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Enhancement
+
+-   The `toggleMoreMenu` and `clickMoreMenuItem` utilities no longer require a second 'context' parameter.
+
 ## 6.0.0 (2022-01-27)
 
 ### Breaking Changes

diff --git a/packages/e2e-test-utils/README.md b/packages/e2e-test-utils/README.md
@@ -106,7 +106,6 @@ Clicks on More Menu item, searches for the button with the text provided and cli
 _Parameters_
 
 -   _buttonLabel_ `string`: The label to search the button for.
--   _context_ `[GutenbergContext]`: Whether to click the button in the post editor or site editor context.
 
 ### clickSiteEditorMenuItem
 
@@ -832,7 +831,6 @@ Toggles the More Menu.
 _Parameters_
 
 -   _waitFor_ `['open' | 'close']`: Whether it should wait for the menu to open or close. If `undefined` it won't wait for anything.
--   _context_ `[GutenbergContext]`: Whether it's toggling in the context of the site editor or post editor.
 
 ### toggleOfflineMode
 

diff --git a/packages/e2e-test-utils/src/click-on-more-menu-item.js b/packages/e2e-test-utils/src/click-on-more-menu-item.js
@@ -8,32 +8,15 @@ import { first } from 'lodash';
  */
 import { toggleMoreMenu } from './toggle-more-menu';
 
-/**
- * @typedef {import("./shared/types").GutenbergContext} GutenbergContext
- */
-
-const SELECTORS = {
-	postEditorMenuContainer:
-		'//*[contains(concat(" ", @class, " "), " interface-more-menu-dropdown__content ")]',
-	siteEditorMenuContainer:
-		'//*[contains(concat(" ", @class, " "), " edit-site-more-menu__content ")]',
-};
-
 /**
  * Clicks on More Menu item, searches for the button with the text provided and clicks it.
  *
- * @param {string}           buttonLabel             The label to search the button for.
- * @param {GutenbergContext} [context='post-editor'] Whether to click the button in the post editor or site editor context.
+ * @param {string} buttonLabel The label to search the button for.
  */
-export async function clickOnMoreMenuItem(
-	buttonLabel,
-	context = 'post-editor'
-) {
-	await toggleMoreMenu( 'open', context );
+export async function clickOnMoreMenuItem( buttonLabel ) {
+	await toggleMoreMenu( 'open' );
 	const moreMenuContainerSelector =
-		context === 'post-editor'
-			? SELECTORS.postEditorMenuContainer
-			: SELECTORS.siteEditorMenuContainer;
+		'//*[contains(concat(" ", @class, " "), " interface-more-menu-dropdown__content ")]';
 
 	const elementToClick = first(
 		await page.$x(

diff --git a/packages/e2e-test-utils/src/toggle-more-menu.js b/packages/e2e-test-utils/src/toggle-more-menu.js
@@ -1,35 +1,16 @@
-/**
- * @typedef {import("./shared/types").GutenbergContext} GutenbergContext
- */
-
-const SELECTORS = {
-	postEditorMenuContent: '.interface-more-menu-dropdown__content',
-	siteEditorMenuContent: '.edit-site-more-menu__content',
-	postEditorMenu: '.interface-more-menu-dropdown [aria-label="Options"]',
-	siteEditorMenu: '.edit-site-more-menu [aria-label="More tools & options"]',
-};
-
 /**
  * Toggles the More Menu.
  *
- * @param {'open' | 'close'} [waitFor]               Whether it should wait for the menu to open or close. If `undefined` it won't wait for anything.
- * @param {GutenbergContext} [context='post-editor'] Whether it's toggling in the context of the site editor or post editor.
+ * @param {'open' | 'close'} [waitFor] Whether it should wait for the menu to open or close. If `undefined` it won't wait for anything.
  */
-export async function toggleMoreMenu( waitFor, context = 'post-editor' ) {
-	const menuSelector =
-		context === 'post-editor'
-			? SELECTORS.postEditorMenu
-			: SELECTORS.siteEditorMenu;
+export async function toggleMoreMenu( waitFor ) {
+	const menuSelector = '.interface-more-menu-dropdown [aria-label="Options"]';
 
 	await page.click( menuSelector );
 
 	if ( waitFor ) {
 		const opts = waitFor === 'close' ? { hidden: true } : {};
-		const menuContentSelector =
-			context === 'post-editor'
-				? SELECTORS.postEditorMenuContent
-				: SELECTORS.siteEditorMenuContent;
-
+		const menuContentSelector = '.interface-more-menu-dropdown__content';
 		await page.waitForSelector( menuContentSelector, opts );
 	}
 }