V16 Updated test helper for label for entity actions

lib/helpers/ContentUiHelper.ts

@@ -177,7 +177,7 @@ export class ContentUiHelper extends UiBaseLocators {
     this.saveAndPublishBtn = page.getByLabel('Save And Publish');
     this.publishBtn = page.getByLabel(/^Publish(…)?$/);
     this.unpublishBtn = page.getByLabel(/^Unpublish(…)?$/);
-    this.actionMenuForContentBtn = page.locator('#header [label="Open actions menu"]');
+    this.actionMenuForContentBtn = page.locator('#header #action-modal');
     this.openedModal = page.locator('uui-modal-container[backdrop]');
     this.textstringTxt = page.locator('umb-property-editor-ui-text-box #input');
     this.reloadChildrenThreeDotsBtn = page.getByRole('button', {name: 'Reload children…'});
@@ -300,7 +300,7 @@ export class ContentUiHelper extends UiBaseLocators {
     this.workspaceEditTab = page.locator('umb-content-workspace-view-edit-tab');
     this.blockWorkspaceEditTab = page.locator('umb-block-workspace-view-edit-tab');
     this.workspaceEditProperties = page.locator('umb-content-workspace-view-edit-properties');
-    this.openActionsMenu = page.getByLabel('Open actions menu');
+    this.openActionsMenu = page.locator('#action-menu');
     this.replaceExactBtn = page.getByRole('button', {name: 'Replace', exact: true});
     this.clipboardEntryPicker = page.locator('umb-clipboard-entry-picker');
     this.blockGridAreasContainer = page.locator('umb-block-grid-areas-container');

lib/helpers/CurrentUserProfileUiHelper.ts

@@ -6,7 +6,7 @@ export class CurrentUserProfileUiHelper extends UiBaseLocators {
 
   constructor(page: Page) {
     super(page);
-    this.changePasswordBtn = page.getByLabel('Change password');
+    this.changePasswordBtn = page.getByLabel('Change your password');
   }
 
   async clickChangePasswordButton() {

lib/helpers/DataTypeUiHelper.ts

@@ -298,7 +298,7 @@ export class DataTypeUiHelper extends UiBaseLocators {
     this.tiptapExtensionsConfiguration = this.page.locator('umb-property-editor-ui-tiptap-extensions-configuration');
     this.propertyEditor = this.page.locator('umb-ref-property-editor-ui');
     this.selectIconBtn = page.getByLabel('Select icon');
-    this.dataTypeBtn = this.createOptionActionListModal.locator('[name="New Data Type"]');
+    this.dataTypeBtn = this.createOptionActionListModal.locator('[name="Data Type"]');
     this.dataTypesMenu = page.locator('#menu-item').getByRole('link', {name: 'Data Types'});
     this.tiptapStatusbarConfiguration = this.page.locator('umb-property-editor-ui-tiptap-statusbar-configuration');
 
@@ -308,7 +308,7 @@ export class DataTypeUiHelper extends UiBaseLocators {
   }
 
   async clickActionsMenuForDataType(name: string) {
-    await this.clickActionsMenuForNameInSectionSidebar(name);
+    await this.clickActionsMenuForName(name);
   }
 
   async clickActionsMenuAtRoot() {
@@ -320,7 +320,7 @@ export class DataTypeUiHelper extends UiBaseLocators {
   }
 
   async createDataTypeFolder(folderName: string) {
-    await this.clickActionsMenuCreateButton();
+    await this.clickCreateActionMenuOption();
     await this.clickFolderButton();
     await this.enterFolderName(folderName);
     await this.clickConfirmCreateFolderButton();
@@ -375,13 +375,13 @@ export class DataTypeUiHelper extends UiBaseLocators {
   }
 
   async moveDataTypeToFolder(folderName: string) {
-    await this.clickMoveToButton();
+    await this.clickMoveToActionMenuOption();
     await this.sidebarModal.getByText(folderName, {exact: true}).click();
     await this.chooseModalBtn.click();
   }
 
   async duplicateDataTypeToFolder(folderName: string) {
-    await this.clickDuplicateToButton();
+    await this.clickDuplicateToActionMenuOption();
     await this.sidebarModal.getByText(folderName, {exact: true}).click();
     await this.duplicateBtn.click();
   }

lib/helpers/DictionaryUiHelper.ts

@@ -65,7 +65,7 @@ export class DictionaryUiHelper extends UiBaseLocators {
   }
 
   async deleteDictionary() {
-    await this.clickDeleteButton();
+    await this.clickDeleteActionMenuOption();
     await this.confirmToDeleteBtn.click();
   }
 

lib/helpers/MediaUiHelper.ts

@@ -43,7 +43,7 @@ export class MediaUiHelper extends UiBaseLocators {
     this.bulkTrashBtn = page.locator('umb-entity-bulk-action uui-button').filter({hasText: 'Trash'});
     this.bulkMoveToBtn = page.locator('umb-entity-bulk-action uui-button').filter({hasText: 'Move to'});
     this.mediaHeader = page.getByRole('heading', {name: 'Media'});
-    this.mediaHeaderActionsMenu = page.locator('#header >> [label="Open actions menu"]');
+    this.mediaHeaderActionsMenu = page.locator('#header #action-modal');
     this.emptyRecycleBinBtn = page.locator('[label="Empty Recycle Bin"]').locator('svg');
     this.mediaTreeItem = page.locator('umb-media-tree-item');
     this.mediaPopoverLayout = page.locator('umb-popover-layout');

lib/helpers/MemberUiHelper.ts

@@ -20,6 +20,7 @@ export class MemberUiHelper extends UiBaseLocators {
   private readonly changePasswordBtn: Locator;
   private readonly membersMenu: Locator;
   private readonly infoTab: Locator;
+  private readonly membersCreateBtn: Locator;
 
   constructor(page: Page) {
     super(page);
@@ -40,6 +41,7 @@ export class MemberUiHelper extends UiBaseLocators {
     this.changePasswordBtn = page.getByLabel('Change password', {exact: true});
     this.membersMenu = page.locator('umb-menu').getByLabel('Members', {exact: true});
     this.infoTab = page.locator('uui-tab').filter({hasText: 'Info'}).locator('svg');
+    this.membersCreateBtn = page.locator('umb-create-member-collection-action').getByLabel('Create', {exact: true});
   }
 
   async clickMembersTab() {
@@ -153,4 +155,9 @@ export class MemberUiHelper extends UiBaseLocators {
     await expect(this.infoTab).toBeVisible();
     await this.infoTab.click();
   }
+
+  async clickCreateMembersButton() {
+    await expect(this.membersCreateBtn).toBeVisible();
+    await this.membersCreateBtn.click();
+  }
 }

lib/helpers/PartialViewUiHelper.ts

@@ -65,7 +65,7 @@ export class PartialViewUiHelper extends UiBaseLocators {
   }
 
   async createPartialViewFolder(folderName: string) {
-    await this.clickActionsMenuCreateButton();
+    await this.clickCreateOptionsActionMenuOption();
     await this.newFolderThreeDots.click();
     await this.enterFolderName(folderName);
     await this.clickConfirmCreateFolderButton();

lib/helpers/ScriptUiHelper.ts

@@ -19,7 +19,7 @@ export class ScriptUiHelper extends UiBaseLocators{
   }
 
   async createScriptFolder(folderName: string) {
-    await this.clickActionsMenuCreateButton();
+    await this.clickCreateOptionsActionMenuOption();
     await this.newFolderThreeDots.click();
     await this.enterFolderName(folderName);
     await this.clickConfirmCreateFolderButton();
@@ -41,7 +41,7 @@ export class ScriptUiHelper extends UiBaseLocators{
   async goToScript(scriptName: string) {
     await this.goToSection(ConstantHelper.sections.settings);
     await this.reloadScriptTree();
-    await this.page.getByLabel(scriptName).click();
+    await this.page.getByLabel(scriptName, {exact: true}).click();
   }
 
   async enterScriptName(scriptContent: string) {

lib/helpers/StylesheetUiHelper.ts

@@ -19,7 +19,7 @@ export class StylesheetUiHelper extends UiBaseLocators{
   }
 
   async createStylesheetFolder(folderName: string) {
-    await this.clickActionsMenuCreateButton();
+    await this.clickCreateActionMenuOption();
     await this.clickFolderButton();
     await this.enterFolderName(folderName);
     await this.clickConfirmCreateFolderButton();

lib/helpers/UiBaseLocators.ts

@@ -71,7 +71,6 @@ export class UiBaseLocators {
   public readonly aliasNameTxt: Locator;
   public readonly deleteFolderThreeDotsBtn: Locator;
   public readonly createLink: Locator;
-  public readonly actionMenucreateBtn: Locator;
   public readonly insertValueBtn: Locator;
   public readonly insertPartialViewBtn: Locator;
   public readonly insertDictionaryItemBtn: Locator;
@@ -144,6 +143,8 @@ export class UiBaseLocators {
   public readonly entityItemRef: Locator;
   public readonly validationMessage: Locator;
   public readonly successStateIcon: Locator;
+  public readonly entityAction: Locator;
+  public readonly openEntityAction: Locator;
 
   constructor(page: Page) {
     this.page = page;
@@ -179,7 +180,6 @@ export class UiBaseLocators {
     this.renameModalBtn = page.locator('umb-rename-modal').getByLabel('Rename');
     this.createBtn = page.getByRole('button', {name: /^Create(…)?$/});
     this.actionsMenuContainer = page.locator('uui-scroll-container');
-    this.actionMenucreateBtn = this.actionsMenuContainer.getByRole('button', {name: /^Create(…)?$/});
     this.successState = page.locator('[state="success"]');
     this.chooseModalBtn = this.sidebarModal.locator('[look="primary"]').getByLabel('Choose');
     this.addBtn = page.getByRole('button', {name: 'Add', exact: true});
@@ -288,22 +288,20 @@ export class UiBaseLocators {
     this.entityItemRef = this.confirmActionModalEntityReferences.locator('umb-entity-item-ref');
     this.validationMessage = page.locator('umb-form-validation-message').locator('#messages');
     this.successStateIcon = this.successState.locator('#state');
-  }
-
-  async clickActionsMenuForNameInSectionSidebar(name: string) {
-    await this.sectionSidebar.locator('[label="' + name + '"]').hover();
-    await this.sectionSidebar.locator('[label="' + name + '"] >> [label="Open actions menu"]').first().click();
+    // Entity Action
+    this.entityAction = page.locator('umb-entity-action-list umb-entity-action');
+    this.openEntityAction = page.locator('#action-modal[open]').locator(this.entityAction);
   }
 
   async clickActionsMenuForName(name: string) {
-    await expect(this.page.locator('[label="' + name + '"]')).toBeVisible();
-    await this.page.locator('[label="' + name + '"]').hover();
-    await this.page.locator('[label="' + name + '"] >> [label="Open actions menu"]').first().click();
+    await expect(this.page.locator('uui-menu-item[label="' + name + '"]')).toBeVisible();
+    await this.page.locator('uui-menu-item[label="' + name + '"]').hover();
+    await this.page.locator('uui-menu-item[label="' + name + '"] #action-modal').first().click();
   }
 
   async isActionsMenuForNameVisible(name: string, isVisible = true) {
-    await this.page.locator('[label="' + name + '"]').click();
-    await expect(this.page.locator('[label="' + name + '"] >> [label="Open actions menu"]')).toBeVisible({visible: isVisible});
+    await this.page.locator('uui-menu-item[label="' + name + '"]').click();
+    await expect(this.page.locator('uui-menu-item[label="' + name + '"] #action-modal').first()).toBeVisible({visible: isVisible});
   }
 
   async clickCaretButtonForName(name: string) {
@@ -324,7 +322,7 @@ export class UiBaseLocators {
     await expect(this.page.getByLabel(treeName, {exact: true})).toBeVisible();
     await this.page.waitForTimeout(500);
     await this.clickActionsMenuForName(treeName);
-    await this.clickReloadChildrenButton();
+    await this.clickReloadChildrenActionMenuOption();
 
     const menuItem = this.page.locator('uui-menu-item[label="' + treeName + '"]');
     const isCaretButtonOpen = await menuItem.getAttribute('show-children');
@@ -550,7 +548,7 @@ export class UiBaseLocators {
   }
 
   async createFolder(folderName: string) {
-    await this.clickActionsMenuCreateButton();
+    await this.clickCreateActionMenuOption();
     await this.clickNewFolderThreeDotsButton();
     await this.enterFolderName(folderName);
     await this.clickConfirmCreateFolderButton();
@@ -580,7 +578,7 @@ export class UiBaseLocators {
   }
 
   async deleteFolder() {
-    await this.clickDeleteButton();
+    await this.clickDeleteActionMenuOption();
     await this.clickConfirmToDeleteButton();
   }
 
@@ -660,11 +658,6 @@ export class UiBaseLocators {
     await this.createBtn.click();
   }
 
-  async clickActionsMenuCreateButton() {
-    await expect(this.actionMenucreateBtn).toBeVisible();
-    await this.actionMenucreateBtn.click();
-  }
-
   async clickAddButton() {
     await expect(this.addBtn).toBeVisible();
     await this.addBtn.click();
@@ -801,12 +794,13 @@ export class UiBaseLocators {
   }
 
   async rename(newName: string) {
-    await this.clickRenameButton();
+    await this.clickRenameActionMenuOption();
     await expect(this.newNameTxt).toBeVisible();
     await this.newNameTxt.click();
     await this.newNameTxt.clear();
     await this.newNameTxt.fill(newName);
     await this.renameModalBtn.click();
+    await this.page.waitForTimeout(500);
   }
 
   async isSuccessButtonWithTextVisible(text: string) {
@@ -877,7 +871,7 @@ export class UiBaseLocators {
   }
 
   async clickDeleteAndConfirmButton() {
-    await this.clickDeleteButton();
+    await this.clickDeleteActionMenuOption();
     await this.clickConfirmToDeleteButton();
   }
 
@@ -1206,4 +1200,92 @@ export class UiBaseLocators {
   async isSuccessStateIconVisible() {
     await expect(this.successStateIcon).toBeVisible();
   }
+
+  // Entity Action
+  async clickEntityActionWithName(name: string) {
+    const regex = new RegExp(`^entity-action:.*${name}$`);
+    const entityActionLocator = this.openEntityAction.getByTestId(regex).first();
+    await expect(entityActionLocator).toBeVisible();
+    await entityActionLocator.click();
+  }
+
+  async clickCreateActionMenuOption() {
+    await this.clickEntityActionWithName('Create');
+  }
+
+  async clickTrashActionMenuOption() {
+    await this.clickEntityActionWithName('Trash');
+  }
+
+  async clickMoveToActionMenuOption() {
+    await this.clickEntityActionWithName('MoveTo');
+  }
+
+  async clickCreateBlueprintActionMenuOption() {
+    await this.clickEntityActionWithName('CreateBlueprint');
+  }
+
+  async clickDuplicateToActionMenuOption() {
+    await this.clickEntityActionWithName('DuplicateTo');
+  }
+
+  async clickPublishActionMenuOption() {
+    await this.clickEntityActionWithName('Publish');
+  }
+
+  async clickUnpublishActionMenuOption() {
+    await this.clickEntityActionWithName('Unpublish');
+  }
+
+  async clickRollbackActionMenuOption() {
+    await this.clickEntityActionWithName('Rollback');
+  }
+
+  async clickCultureAndHostnamesActionMenuOption() {
+    await this.clickEntityActionWithName('CultureAndHostnames');
+  }
+
+  async clickPublicAccessActionMenuOption() {
+    await this.clickEntityActionWithName('PublicAccess');
+  }
+
+  async clickSortChildrenActionMenuOption() {
+    await this.clickEntityActionWithName('SortChildrenOf');
+  }
+
+  async clickNotificationsActionMenuOption() {
+    await this.clickEntityActionWithName('Notifications');
+  }
+
+  async clickReloadChildrenActionMenuOption() {
+    await this.clickEntityActionWithName('ReloadChildrenOf');
+  }
+
+  async clickDeleteActionMenuOption() {
+    await this.clickEntityActionWithName('Delete');
+  }
+
+  async clickRestoreActionMenuOption() {
+    await this.clickEntityActionWithName('Restore');
+  }
+
+  async clickRenameActionMenuOption() {
+    await this.clickEntityActionWithName('Rename');
+  }
+
+  async clickCreateOptionsActionMenuOption() {
+    await this.clickEntityActionWithName('CreateOptions');
+  }
+
+  async clickExportActionMenuOption() {
+    await this.clickEntityActionWithName('Export');
+  }
+
+  async clickImportActionMenuOption() {
+    await this.clickEntityActionWithName('Import');
+  }
+
+  async clickUpdateActionMenuOption() {
+    await this.clickEntityActionWithName('Update');
+  }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco/playwright-testhelpers",
-  "version": "16.0.11",
+  "version": "16.0.12",
   "description": "Test helpers for making playwright tests for Umbraco solutions",
   "main": "dist/lib/index.js",
   "files": [