@umbraco/playwright-testhelpers 15.0.20 → 15.0.21

package/dist/lib/helpers/ContentUiHelper.d.ts

@@ -134,6 +134,8 @@ export declare class ContentUiHelper extends UiBaseLocators {
     private readonly insertBlockBtn;
     private readonly validationMessage;
     private readonly blockWorkspace;
+    private readonly saveContentBtn;
+    private readonly splitView;
     constructor(page: Page);
     enterContentName(name: string): Promise<void>;
     clickSaveAndPublishButton(): Promise<void>;
@@ -147,6 +149,7 @@ export declare class ContentUiHelper extends UiBaseLocators {
     clickCaretButtonForContentName(name: string): Promise<void>;
     waitForModalVisible(): Promise<void>;
     waitForModalHidden(): Promise<void>;
+    clickSaveButtonForContent(): Promise<void>;
     enterTextstring(text: string): Promise<void>;
     doesContentTreeHaveName(contentName: string): Promise<void>;
     enterRichTextArea(value: string): Promise<void>;
@@ -256,6 +259,7 @@ export declare class ContentUiHelper extends UiBaseLocators {
     clickConfirmEmptyRecycleBinButton(): Promise<void>;
     isDocumentPropertyEditable(propertyName: string, isEditable?: boolean): Promise<void>;
     doesDocumentPropertyHaveValue(propertyName: string, value: string): Promise<void>;
+    clickContentTab(): Promise<void>;
     isDocumentTreeEmpty(): Promise<void>;
     doesDocumentWorkspaceContainName(name: string): Promise<void>;
     doesDocumentWorkspaceHaveText(text: string): Promise<void>;
@@ -283,7 +287,7 @@ export declare class ContentUiHelper extends UiBaseLocators {
     clickManualLinkButton(): Promise<void>;
     clickAddBlockElementButton(): Promise<void>;
     isAddBlockElementButtonVisible(isVisible?: boolean): Promise<void>;
-    isAddBlockElementButtonWithLabelVisible(label: string, isVisible?: boolean): Promise<void>;
+    isAddBlockElementButtonWithLabelVisible(blockName: string, label: string, isVisible?: boolean): Promise<void>;
     doesFormValidationMessageContainText(text: string): Promise<void>;
     doesBlockElementHaveName(name: string): Promise<void>;
     clickAddBlockSettingsTabButton(): Promise<void>;

package/dist/lib/helpers/ContentUiHelper.js

@@ -138,18 +138,21 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
     insertBlockBtn;
     validationMessage;
     blockWorkspace;
+    saveContentBtn;
+    splitView;
     constructor(page) {
         super(page);
+        this.saveContentBtn = page.locator('[data-mark="workspace-action:Umb.WorkspaceAction.Document.Save"]');
         this.closeBtn = page.getByRole('button', { name: 'Close', exact: true });
         this.linkPickerModal = page.locator('umb-link-picker-modal');
         this.contentNameTxt = page.locator('#name-input input');
         this.saveAndPublishBtn = page.getByLabel('Save And Publish');
-        this.publishBtn = page.getByLabel(/^Publish(\.\.\.)?$/);
-        this.unpublishBtn = page.getByLabel(/^Unpublish(\.\.\.)?$/);
+        this.publishBtn = page.getByLabel(/^Publish(…)?$/);
+        this.unpublishBtn = page.getByLabel(/^Unpublish(…)?$/);
         this.actionMenuForContentBtn = page.locator('#header [label="Open actions menu"]');
         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...' });
+        this.reloadChildrenThreeDotsBtn = page.getByRole('button', { name: 'Reload children…' });
         this.contentTree = page.locator('umb-tree[alias="Umb.Tree.Document"]');
         this.richTextAreaTxt = page.frameLocator('iframe[title="Rich Text Area"]').locator('#tinymce');
         this.textAreaTxt = page.locator('umb-property-editor-ui-textarea textarea');
@@ -158,12 +161,13 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
         this.menuItemTree = page.locator('umb-menu-item-tree-default');
         this.confirmToUnpublishBtn = page.locator('umb-document-unpublish-modal').getByLabel('Unpublish');
         this.dropdown = page.locator('select#native');
-        this.setADateTxt = page.getByLabel('Set a date...');
+        this.splitView = page.locator('#splitViews');
+        this.setADateTxt = page.getByLabel('Set a date…');
         this.chooseMediaPickerBtn = page.locator('umb-property-editor-ui-media-picker #btn-add');
         this.chooseMemberPickerBtn = page.locator('umb-property-editor-ui-member-picker #btn-add');
         this.numericTxt = page.locator('umb-property-editor-ui-number input');
         this.addMultiURLPickerBtn = page.locator('umb-property-editor-ui-multi-url-picker #btn-add');
-        this.linkTxt = page.getByLabel('Enter a URL...', { exact: true });
+        this.linkTxt = page.getByLabel('Enter a URL…', { exact: true });
         this.anchorQuerystringTxt = page.getByLabel('#value or ?key=value');
         this.linkTitleTxt = this.linkPickerModal.getByLabel('Title');
         this.tagItems = page.locator('uui-tag');
@@ -197,7 +201,7 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
         this.addTemplateBtn = this.generalItem.filter({ hasText: 'Template' }).locator('#button');
         this.id = this.generalItem.filter({ hasText: 'Id' }).locator('span');
         // Culture and Hostname
-        this.cultureAndHostnamesBtn = page.getByLabel(/^Culture and Hostnames(\.\.\.)?$/);
+        this.cultureAndHostnamesBtn = page.getByLabel(/^Culture and Hostnames(…)?$/);
         this.cultureLanguageDropdownBox = page.locator('[headline="Culture"]').getByLabel('combobox-input');
         this.addNewDomainBtn = page.getByLabel('Add new domain');
         this.domainTxt = page.getByLabel('Domain', { exact: true });
@@ -207,17 +211,17 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
         this.saveModalBtn = this.sidebarModal.getByLabel('Save', { exact: true });
         this.resetFocalPointBtn = this.page.getByLabel('Reset focal point');
         // List View
-        this.enterNameInContainerTxt = this.container.getByLabel('Enter a name...');
+        this.enterNameInContainerTxt = this.container.getByLabel('Enter a name…');
         this.listView = page.locator('umb-document-table-collection-view');
         this.nameBtn = page.getByRole('button', { name: 'Name' });
         this.listViewTableRow = this.listView.locator('uui-table-row');
-        this.publishSelectedListItems = page.getByRole('button', { name: /^Publish(\.\.\.)?$/ });
-        this.unpublishSelectedListItems = page.getByRole('button', { name: /^Unpublish(\.\.\.)?$/ });
-        this.duplicateToSelectedListItems = page.getByRole('button', { name: /^Duplicate to(\.\.\.)?$/ });
-        this.moveToSelectedListItems = page.getByRole('button', { name: /^Move to(\.\.\.)?$/ });
-        this.trashSelectedListItems = page.getByRole('button', { name: /^Trash(\.\.\.)?$/ });
+        this.publishSelectedListItems = page.getByRole('button', { name: /^Publish(…)?$/ });
+        this.unpublishSelectedListItems = page.getByRole('button', { name: /^Unpublish(…)?$/ });
+        this.duplicateToSelectedListItems = page.getByRole('button', { name: /^Duplicate to(…)?$/ });
+        this.moveToSelectedListItems = page.getByRole('button', { name: /^Move to(…)?$/ });
+        this.trashSelectedListItems = page.getByRole('button', { name: /^Trash(…)?$/ });
         this.modalContent = page.locator('umb-tree-picker-modal');
-        this.trashBtn = page.getByLabel(/^Trash(\.\.\.)?$/);
+        this.trashBtn = page.getByLabel(/^Trash(…)?$/);
         this.exactTrashBtn = page.getByRole('button', { name: 'Trash', exact: true });
         this.documentListView = page.locator('umb-document-table-collection-view');
         this.documentGridView = page.locator('umb-document-grid-collection-view');
@@ -232,7 +236,7 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
         this.duplicateBtn = page.getByLabel('Duplicate', { exact: true });
         this.contentTreeRefreshBtn = page.locator('#header').getByLabel('#actions_refreshNode');
         this.sortChildrenBtn = page.getByRole('button', { name: 'Sort children' });
-        this.rollbackBtn = page.getByRole('button', { name: 'Rollback' });
+        this.rollbackBtn = page.getByRole('button', { name: 'Rollback', exact: true });
         this.rollbackContainerBtn = this.container.getByLabel('Rollback');
         this.publicAccessBtn = page.getByRole('button', { name: 'Public Access' });
         this.uuiCheckbox = page.locator('uui-checkbox');
@@ -253,7 +257,7 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
         this.umbDocumentCollection = page.locator('umb-document-collection');
         this.documentTableColumnName = this.listView.locator('umb-document-table-column-name');
         //Block Grid - Block List
-        this.addBlockElementBtn = page.locator('uui-button-group uui-button').first().locator('a#button');
+        this.addBlockElementBtn = page.locator('uui-button-group uui-button').first().filter({ has: page.locator('a#button') });
         this.formValidationMessage = page.locator('#splitViews umb-form-validation-message #messages');
         this.blockName = page.locator('#editor [slot="name"]');
         this.addBlockSettingsTabBtn = page.locator('umb-body-layout').getByRole('tab', { name: 'Settings' });
@@ -283,6 +287,7 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
         await (0, test_1.expect)(this.contentNameTxt).toBeVisible();
         await this.contentNameTxt.clear();
         await this.contentNameTxt.fill(name);
+        await (0, test_1.expect)(this.contentNameTxt).toHaveValue(name);
     }
     async clickSaveAndPublishButton() {
         await (0, test_1.expect)(this.saveAndPublishBtn).toBeVisible();
@@ -321,6 +326,10 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
     async waitForModalHidden() {
         await this.openedModal.waitFor({ state: 'hidden' });
     }
+    async clickSaveButtonForContent() {
+        await (0, test_1.expect)(this.saveContentBtn).toBeVisible();
+        await this.saveContentBtn.click();
+    }
     async enterTextstring(text) {
         await (0, test_1.expect)(this.textstringTxt).toBeVisible();
         await this.textstringTxt.clear();
@@ -461,7 +470,7 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
         await (0, test_1.expect)(this.documentTreeItem.locator('[label="' + parentName + '"]').getByLabel(childName)).toBeVisible({ visible: isVisible });
     }
     async removeContentPicker(contentPickerName) {
-        const contentPickerLocator = this.page.locator('[name="' + contentPickerName + '"]');
+        const contentPickerLocator = this.page.locator('umb-entity-item-ref').filter({ has: this.page.locator('[name="' + contentPickerName + '"]') });
         await contentPickerLocator.hover();
         await contentPickerLocator.getByLabel('Remove').click();
         await this.clickConfirmRemoveButton();
@@ -519,7 +528,9 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
         await this.sidebarModal.getByText(memberName, { exact: true }).click();
     }
     async removeMemberPickerByName(memberName) {
-        await this.page.locator('[name="' + memberName + '"]').getByLabel('Remove').click();
+        const mediaPickerLocator = this.page.locator('umb-entity-item-ref').filter({ has: this.page.locator('[name="' + memberName + '"]') });
+        await mediaPickerLocator.hover();
+        await mediaPickerLocator.getByLabel('Remove').click();
         await this.clickConfirmRemoveButton();
     }
     // Numeric
@@ -540,6 +551,7 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
         await this.enterTagTxt.press('Enter');
     }
     async removeTagByName(tagName) {
+        await (0, test_1.expect)(this.tagItems.filter({ hasText: tagName }).locator('svg')).toBeVisible();
         await this.tagItems.filter({ hasText: tagName }).locator('svg').click();
     }
     // Multi URL Picker
@@ -585,11 +597,13 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
     }
     // Upload
     async clickRemoveFilesButton() {
+        await (0, test_1.expect)(this.removeFilesBtn).toBeVisible();
         await this.removeFilesBtn.click();
     }
     // True/false
     async clickToggleButton() {
-        await this.toggleBtn.click();
+        await (0, test_1.expect)(this.toggleBtn).toBeVisible();
+        await this.toggleBtn.click({ force: true });
     }
     async doesToggleHaveLabel(label) {
         return await (0, test_1.expect)(this.toggleInput).toHaveAttribute('aria-label', label);
@@ -768,6 +782,9 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
         const propertyLocator = this.documentWorkspace.locator(this.property).filter({ hasText: propertyName }).locator('#input');
         await (0, test_1.expect)(propertyLocator).toHaveValue(value);
     }
+    async clickContentTab() {
+        await this.splitView.getByRole('tab', { name: 'Content' }).click();
+    }
     async isDocumentTreeEmpty() {
         await (0, test_1.expect)(this.documentTreeItem).toHaveCount(0);
     }
@@ -898,8 +915,8 @@ class ContentUiHelper extends UiBaseLocators_1.UiBaseLocators {
     async isAddBlockElementButtonVisible(isVisible = true) {
         await (0, test_1.expect)(this.addBlockElementBtn).toBeVisible({ visible: isVisible });
     }
-    async isAddBlockElementButtonWithLabelVisible(label, isVisible = true) {
-        await (0, test_1.expect)(this.addBlockElementBtn.getByLabel(label)).toBeVisible({ visible: isVisible });
+    async isAddBlockElementButtonWithLabelVisible(blockName, label, isVisible = true) {
+        await (0, test_1.expect)(this.property.filter({ hasText: blockName }).locator(this.addBlockElementBtn).filter({ hasText: label })).toBeVisible({ visible: isVisible });
     }
     async doesFormValidationMessageContainText(text) {
         await (0, test_1.expect)(this.formValidationMessage).toContainText(text);