diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts index ece6df083a..07abe03401 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/da.ts @@ -62,8 +62,9 @@ export default { unlock: 'Lås op', createblueprint: 'Opret indholdsskabelon', resendInvite: 'Gensend Invitation', - editContent: 'Edit content', - chooseWhereToImport: 'Choose where to import', + editContent: 'Rediger indhold', + chooseWhereToImport: 'Vælg hvor du vil importere', + viewActionsFor: (name) => (name ? `Se handlinger for '${name}'` : 'Se handlinger'), }, actionCategories: { content: 'Indhold', diff --git a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts index b98a778667..847784b65d 100644 --- a/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts +++ b/src/Umbraco.Web.UI.Client/src/assets/lang/en.ts @@ -72,6 +72,7 @@ export default { wasCopiedTo: 'was copied to', wasDeleted: 'was deleted', wasMovedTo: 'was moved to', + viewActionsFor: (name) => (name ? `View actions for '${name}'` : 'View actions'), }, actionCategories: { content: 'Content', diff --git a/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts index 0f0185994a..c5c98d5f1a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/clipboard/clipboard-entry/picker/clipboard-entry-picker.element.ts @@ -150,7 +150,7 @@ export class UmbClipboardEntryPickerElement extends UmbLitElement { slot="actions" .entityType=${item.entityType} .unique=${item.unique} - .label=${item.name}> + .label=${this.localize.term('actions_viewActionsFor', [item.name])}> `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/dropdown/dropdown.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/dropdown/dropdown.element.ts index a9a064d6d3..64abf28442 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/dropdown/dropdown.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/dropdown/dropdown.element.ts @@ -18,7 +18,7 @@ export class UmbDropdownElement extends UmbLitElement { open = false; @property() - label = ''; + label?: string; @property() look: UUIInterfaceLook = 'default'; @@ -64,9 +64,10 @@ export class UmbDropdownElement extends UmbLitElement { ${when( diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts index 1467fee2b9..3b0b44f80b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.ts @@ -95,25 +95,33 @@ export class UmbEntityActionsBundleElement extends UmbLitElement { if (this._numberOfActions === 1) return nothing; return html` - - + + + .unique=${this.unique} + .label=${this.label}> `; } #renderFirstAction() { - if (!this._firstActionApi) return nothing; + if (!this._firstActionApi || !this._firstActionManifest) return nothing; return html` - + `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/entity-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/entity-action.element.ts index daccf37e70..d1089358ff 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/entity-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/default/entity-action.element.ts @@ -66,17 +66,18 @@ export class UmbEntityActionDefaultElement< } override render() { - const label = this.manifest?.meta.label ? this.localize.string(this.manifest.meta.label) : this.manifest?.name; + if (!this.manifest) return nothing; + + const label = this.manifest.meta.label ? this.localize.string(this.manifest.meta.label) : this.manifest.name; return html` - ${this.manifest?.meta.icon - ? html`` - : nothing} + ${this.manifest.meta.icon ? html`` : nothing} `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/entity-actions-table-column-view/entity-actions-table-column-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/entity-actions-table-column-view/entity-actions-table-column-view.element.ts index f1b112ff09..d2ca007786 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/entity-actions-table-column-view/entity-actions-table-column-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/global-components/entity-actions-table-column-view/entity-actions-table-column-view.element.ts @@ -1,17 +1,20 @@ -import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity'; +import type { UmbEntityModel, UmbNamedEntityModel } from '@umbraco-cms/backoffice/entity'; import { html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-entity-actions-table-column-view') export class UmbEntityActionsTableColumnViewElement extends UmbLitElement { @property({ attribute: false }) - value?: UmbEntityModel; + value?: UmbEntityModel | UmbNamedEntityModel; override render() { if (!this.value) return nothing; return html` - + `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item-layout/menu-item-layout.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item-layout/menu-item-layout.element.ts index c836c99aad..fdc2c07b7a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item-layout/menu-item-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/components/menu-item-layout/menu-item-layout.element.ts @@ -85,7 +85,7 @@ export class UmbMenuItemLayoutElement extends UmbLitElement { slot="actions" .entityType=${this.entityType} .unique=${null} - .label=${this.label}> + .label=${this.localize.term('actions_viewActionsFor', [this.label])}> ` : ''} diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/menu/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/menu/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts index 4fbe32d815..84d46fe2a3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/menu/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/menu/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.ts @@ -42,7 +42,7 @@ export class UmbSectionSidebarMenuWithEntityActionsElement extends UmbSectionSid slot="actions" .unique=${this._unique} .entityType=${this.manifest?.meta.entityType} - .label=${this.manifest?.meta.label}> + .label=${this.localize.term('actions_viewActionsFor', [this.manifest?.meta.label])}> `; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts index 2827c932ce..db81eab555 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-action/components/property-action-menu/property-action-menu.element.ts @@ -44,7 +44,12 @@ export class UmbPropertyActionMenuElement extends UmbLitElement { override render() { if (!this._actions?.length) return nothing; return html` - + diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts index d5be31e98c..ee32a706f0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/tree-item/tree-item-base/tree-item-element-base.ts @@ -13,6 +13,7 @@ export abstract class UmbTreeItemElementBase< this._item = newVal; if (this._item) { + this._label = this.localize.string(this._item?.name ?? ''); this.#initTreeItem(); } } @@ -21,6 +22,9 @@ export abstract class UmbTreeItemElementBase< } protected _item?: TreeItemModelType; + @state() + _label?: string; + @property({ type: Object, attribute: false }) public set api(value: TreeItemContextType | undefined) { this.#api = value; @@ -119,7 +123,6 @@ export abstract class UmbTreeItemElementBase< // Note: Currently we want to prevent opening when the item is in a selectable context, but this might change in the future. // If we like to be able to open items in selectable context, then we might want to make it as a menu item action, so you have to click ... and chose an action called 'Edit' override render() { - const label = this.localize.string(this._item?.name ?? ''); return html` ${this.renderIconContainer()} ${this.renderLabel()} ${this.#renderActions()} ${this.#renderChildItems()} @@ -187,7 +190,7 @@ export abstract class UmbTreeItemElementBase< slot="actions" .entityType=${this.#api.entityType} .unique=${this.#api.unique} - .label=${this._item.name}> + .label=${this.localize.term('actions_viewActionsFor', [this._label])}> `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/tree-item-children/collection/views/data-type-tree-item-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/tree-item-children/collection/views/data-type-tree-item-table-collection-view.element.ts index 608d7e2ffc..09ee3671e6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/tree-item-children/collection/views/data-type-tree-item-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/tree-item-children/collection/views/data-type-tree-item-table-collection-view.element.ts @@ -94,6 +94,7 @@ export class UmbDataTypeTreeItemTableCollectionViewElement extends UmbLitElement .value=${{ entityType: item.entityType, unique: item.unique, + name: item.name, }}>`, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/tree-item-children/collection/views/document-type-tree-item-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/tree-item-children/collection/views/document-type-tree-item-table-collection-view.element.ts index d2a698f37b..6717fc58c9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/tree-item-children/collection/views/document-type-tree-item-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/tree-item-children/collection/views/document-type-tree-item-table-collection-view.element.ts @@ -103,6 +103,7 @@ export class UmbDocumentTypeTreeItemTableCollectionViewElement extends UmbLitEle .value=${{ entityType: item.entityType, unique: item.unique, + name: item.name, }}>`, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/column-layouts/document-entity-actions-table-column-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/column-layouts/document-entity-actions-table-column-view.element.ts index 3a67955958..70f2852aae 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/column-layouts/document-entity-actions-table-column-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/collection/views/table/column-layouts/document-entity-actions-table-column-view.element.ts @@ -21,6 +21,7 @@ export class UmbDocumentEntityActionsTableColumnViewElement extends UmbLitElemen override render() { if (!this._value) return nothing; + // TODO: Missing name to parse on return html` diff --git a/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/table/extension-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/table/extension-table-collection-view.element.ts index 34017d758a..f00b4234c7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/table/extension-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/extension-insights/collection/views/table/extension-table-collection-view.element.ts @@ -84,6 +84,7 @@ export class UmbExtensionTableCollectionViewElement extends UmbLitElement { .value=${{ entityType: extension.entityType, unique: extension.unique, + name: extension.name, }}>`, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/language-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/language-table-collection-view.element.ts index c7a379909a..b347db3e81 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/language-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/collection/views/table/language-table-collection-view.element.ts @@ -100,6 +100,7 @@ export class UmbLanguageTableCollectionViewElement extends UmbLitElement { .value=${{ entityType: language.entityType, unique: language.unique, + name: language.name, }}>`, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/tree-item-children/collection/views/media-type-tree-item-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/tree-item-children/collection/views/media-type-tree-item-table-collection-view.element.ts index 8ae49c7691..cce4f835c8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/tree-item-children/collection/views/media-type-tree-item-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/tree/tree-item-children/collection/views/media-type-tree-item-table-collection-view.element.ts @@ -94,6 +94,7 @@ export class UmbMediaTypeTreeItemTableCollectionViewElement extends UmbLitElemen .value=${{ entityType: item.entityType, unique: item.unique, + name: item.name, }}>`, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/views/table/media-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/views/table/media-table-collection-view.element.ts index d7b59b22ed..c027c36009 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/views/table/media-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/collection/views/table/media-table-collection-view.element.ts @@ -144,6 +144,7 @@ export class UmbMediaTableCollectionViewElement extends UmbLitElement { .value=${{ entityType: item.entityType, unique: item.unique, + name: item.name, }}>`, }; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/views/table/member-group-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/views/table/member-group-table-collection-view.element.ts index 95e1e3399f..2ad0df8c20 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/views/table/member-group-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-group/collection/views/table/member-group-table-collection-view.element.ts @@ -63,6 +63,7 @@ export class UmbMemberGroupTableCollectionViewElement extends UmbLitElement { .value=${{ entityType: memberGroup.entityType, unique: memberGroup.unique, + name: memberGroup.name, }}>`, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/views/table/member-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/views/table/member-table-collection-view.element.ts index 02f8cb5643..b228d62127 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/views/table/member-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/collection/views/table/member-table-collection-view.element.ts @@ -108,6 +108,7 @@ export class UmbMemberTableCollectionViewElement extends UmbLitElement { .value=${{ entityType: member.entityType, unique: member.unique, + name: member.variants[0].name, }}>`, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts index 9015d2a72d..460309055d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/collection/views/user-group-table-collection-view.element.ts @@ -155,6 +155,7 @@ export class UmbUserGroupCollectionTableViewElement extends UmbLitElement { .value=${{ entityType: userGroup.entityType, unique: userGroup.unique, + name: userGroup.name, }}>`, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts index 9d259b1151..3c1915636e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/collection/views/table/user-table-collection-view.element.ts @@ -151,6 +151,7 @@ export class UmbUserTableCollectionViewElement extends UmbLitElement { .value=${{ entityType: user.entityType, unique: user.unique, + name: user.name, }}>`, }, ], diff --git a/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/collection/views/table/webhook-table-collection-view.element.ts b/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/collection/views/table/webhook-table-collection-view.element.ts index b65fc8d32b..c9810c2bf3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/collection/views/table/webhook-table-collection-view.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/webhook/webhook/collection/views/table/webhook-table-collection-view.element.ts @@ -109,6 +109,7 @@ export class UmbWebhookTableCollectionViewElement extends UmbLitElement { .value=${{ entityType: webhook.entityType, unique: webhook.unique, + name: webhook.name, }}>`, }, ], diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json index e7ca8508f0..39970bceb8 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json @@ -8,7 +8,7 @@ "hasInstallScript": true, "dependencies": { "@umbraco/json-models-builders": "^2.0.33", - "@umbraco/playwright-testhelpers": "^16.0.11", + "@umbraco/playwright-testhelpers": "^16.0.13", "camelize": "^1.0.0", "dotenv": "^16.3.1", "node-fetch": "^2.6.7" @@ -66,10 +66,9 @@ } }, "node_modules/@umbraco/playwright-testhelpers": { - "version": "16.0.11", - "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.11.tgz", - "integrity": "sha512-jduJC8xqtqQ78Sata3GhafDLavRv0ZaKHKFwz3KdLw0VmLNxgDMABAV0SMFGU9sABGzi3MjEUeVQ4ntH1nvA3w==", - "license": "MIT", + "version": "16.0.13", + "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.13.tgz", + "integrity": "sha512-Soy6nLXMb0Ue1LUaFKTz/uwAh7FCZRWFQ3o+HSo+N8XGp9uQ/9D0s58DnDP5qAV+hyZMvdbQo2mHi8MOwasf8A==", "dependencies": { "@umbraco/json-models-builders": "2.0.33", "node-fetch": "^2.6.7" diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json index 460c45b9b7..e974ef3afe 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/package.json +++ b/tests/Umbraco.Tests.AcceptanceTest/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@umbraco/json-models-builders": "^2.0.33", - "@umbraco/playwright-testhelpers": "^16.0.11", + "@umbraco/playwright-testhelpers": "^16.0.13", "camelize": "^1.0.0", "dotenv": "^16.3.1", "node-fetch": "^2.6.7" diff --git a/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts b/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts index 5a784172c2..b7f9fc6ac8 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/playwright.config.ts @@ -33,6 +33,7 @@ export default defineConfig({ // When working locally it can be a good idea to use trace: 'on-first-retry' instead of 'retain-on-failure', it can cut the local test times in half. trace: 'retain-on-failure', ignoreHTTPSErrors: true, + testIdAttribute: 'data-mark' }, /* Configure projects for major browsers */ diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/ContentWithBlockGrid.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/ContentWithBlockGrid.spec.ts index 9b7707009d..6643c93cd9 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/ContentWithBlockGrid.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockGrid/ContentWithBlockGrid.spec.ts @@ -33,7 +33,7 @@ test('can create content with an empty block grid', async ({umbracoApi, umbracoU // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -57,7 +57,7 @@ test('can publish content with an empty block grid', async ({umbracoApi, umbraco // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveAndPublishButton(); @@ -283,7 +283,7 @@ test('can create content with a block grid with the inline editing mode enabled' // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockList/ContentWithBlockList.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockList/ContentWithBlockList.spec.ts index e06dbcd721..f7df86fb98 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockList/ContentWithBlockList.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/BlockList/ContentWithBlockList.spec.ts @@ -33,7 +33,7 @@ test('can create content with an empty block list', async ({umbracoApi, umbracoU // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -57,7 +57,7 @@ test('can publish content with an empty block list', async ({umbracoApi, umbraco // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveAndPublishButton(); @@ -232,7 +232,7 @@ test('can create content with a block list with the inline editing mode enabled' // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts index 1a4e1495f7..7cca397f75 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ChildrenContent.spec.ts @@ -31,7 +31,7 @@ test('can create child node', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) = // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(childDocumentTypeName); await umbracoUi.content.enterContentName(childContentName); await umbracoUi.content.clickSaveButton(); @@ -44,7 +44,7 @@ test('can create child node', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) = expect(childData[0].variants[0].name).toBe(childContentName); // verify that the child content displays in the tree after reloading children await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickReloadChildrenButton(); + await umbracoUi.content.clickReloadChildrenActionMenuOption(); await umbracoUi.content.clickCaretButtonForContentName(contentName); await umbracoUi.content.doesContentTreeHaveName(childContentName); @@ -70,7 +70,7 @@ test('can create child node in child node', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickCaretButtonForContentName(contentName); await umbracoUi.content.clickActionsMenuForContent(childContentName); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(childOfChildDocumentTypeName); // This wait is needed await umbracoUi.content.enterContentName(childOfChildContentName); @@ -102,7 +102,7 @@ test('cannot publish child if the parent is not published', async ({umbracoApi, // Act await umbracoUi.content.clickCaretButtonForContentName(contentName); await umbracoUi.content.clickActionsMenuForContent(childContentName); - await umbracoUi.content.clickPublishButton(); + await umbracoUi.content.clickPublishActionMenuOption(); await umbracoUi.content.clickConfirmToPublishButton(); // Assert @@ -122,7 +122,7 @@ test('can publish content with child node', {tag: '@smoke'}, async ({umbracoApi, // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickPublishButton(); + await umbracoUi.content.clickPublishActionMenuOption(); await umbracoUi.content.clickConfirmToPublishButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts index 4bd1f27409..6c98206c2e 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/Content.spec.ts @@ -26,7 +26,7 @@ test('can create empty content', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -48,7 +48,7 @@ test('can save and publish empty content', {tag: '@smoke'}, async ({umbracoApi, // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveAndPublishButton(); @@ -71,7 +71,7 @@ test('can create content', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.enterTextstring(contentText); @@ -138,7 +138,7 @@ test('can publish invariant content node', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickPublishButton(); + await umbracoUi.content.clickPublishActionMenuOption(); await umbracoUi.content.clickConfirmToPublishButton(); // Assert @@ -158,7 +158,7 @@ test('can unpublish content', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) = // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickUnpublishButton(); + await umbracoUi.content.clickUnpublishActionMenuOption(); await umbracoUi.content.clickConfirmToUnpublishButton(); // Assert @@ -177,7 +177,7 @@ test('can publish variant content node', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickPublishButton(); + await umbracoUi.content.clickPublishActionMenuOption(); await umbracoUi.content.clickConfirmToPublishButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithApprovedColor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithApprovedColor.spec.ts index 9a785f6549..71be717fd3 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithApprovedColor.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithApprovedColor.spec.ts @@ -25,7 +25,7 @@ test('can create content with the approved color data type', async ({umbracoApi, // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts index 99a919cfe2..8e45afe741 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCheckboxList.spec.ts @@ -28,7 +28,7 @@ test('can create content with the checkbox list data type', async ({umbracoApi, // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts index 2fe3f6cec6..d34d387baa 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithContentPicker.spec.ts @@ -32,7 +32,7 @@ test('can create content with the content picker datatype', {tag: '@smoke'}, asy // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.addContentPicker(contentPickerName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts index 2a6ed55a13..4f9ee87372 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithCustomDataType.spec.ts @@ -26,7 +26,7 @@ test('can create content with the custom data type with email address property e // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -73,7 +73,7 @@ test('can create content with the custom data type with decimal property editor' // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -121,7 +121,7 @@ test.skip('can create content with the custom data type with code editor propert // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -168,7 +168,7 @@ test('can create content with the custom data type with markdown editor property // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -215,7 +215,7 @@ test('can create content with the custom data type with multiple text string pro // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -263,7 +263,7 @@ test('can create content with the custom data type with slider property editor', // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowAtRoot.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowAtRoot.spec.ts index cc1b17b9a4..0d450f08f1 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowAtRoot.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowAtRoot.spec.ts @@ -18,7 +18,7 @@ test('cannot create content if allow at root is disabled', async ({umbracoApi, u // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); // Assert await umbracoUi.content.isDocumentTypeNameVisible(documentTypeName, false); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowVaryByCulture.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowVaryByCulture.spec.ts index cd90e4500c..5c15a56eb6 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowVaryByCulture.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowVaryByCulture.spec.ts @@ -26,7 +26,7 @@ test('can create content with allow vary by culture enabled', async ({umbracoApi // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButtonForContent(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts index bce562e334..6e43246c17 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedChildNodes.spec.ts @@ -25,7 +25,7 @@ test('can create content with allowed child node enabled', async ({umbracoApi, u // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -48,7 +48,7 @@ test('cannot create child content if allowed child node is disabled', async ({um // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); // Assert await umbracoUi.content.isDocumentTypeNameVisible(documentTypeName, false); @@ -70,7 +70,7 @@ test('can create multiple child nodes with different document types', async ({um // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(secondChildDocumentTypeName); await umbracoUi.content.enterContentName(secondChildContentName); await umbracoUi.content.clickSaveButton(); @@ -85,7 +85,7 @@ test('can create multiple child nodes with different document types', async ({um expect(childData[1].variants[0].name).toBe(secondChildContentName); // verify that the child content displays in the tree after reloading children await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickReloadChildrenButton(); + await umbracoUi.content.clickReloadChildrenActionMenuOption(); await umbracoUi.content.clickCaretButtonForContentName(contentName); await umbracoUi.content.doesContentTreeHaveName(firstChildContentName); await umbracoUi.content.doesContentTreeHaveName(secondChildContentName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedTemplates.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedTemplates.spec.ts index 73abbe9caf..df544f016f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedTemplates.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithAllowedTemplates.spec.ts @@ -27,7 +27,7 @@ test('can create content with an allowed template', async ({umbracoApi, umbracoU // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -51,7 +51,7 @@ test('can create content with multiple allowed templates', async ({umbracoApi, u // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts index c0eec3f876..425a2e6451 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDocumentTypeProperties/ContentWithCollections.spec.ts @@ -28,7 +28,7 @@ test('can create content configured as a collection', async ({umbracoApi, umbrac // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -52,7 +52,7 @@ test('can create child content in a collection', async ({umbracoApi, umbracoUi}) // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(childDocumentTypeName); await umbracoUi.content.enterContentName(firstChildContentName); await umbracoUi.content.clickSaveButton(); @@ -63,7 +63,7 @@ test('can create child content in a collection', async ({umbracoApi, umbracoUi}) expect(childData[0].variants[0].name).toBe(firstChildContentName); // verify that the child content displays in collection list after reloading tree await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickReloadChildrenButton(); + await umbracoUi.content.clickReloadChildrenActionMenuOption(); await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.doesDocumentTableColumnNameValuesMatch(expectedNames); @@ -84,7 +84,7 @@ test('can create multiple child nodes in a collection', async ({umbracoApi, umbr // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(childDocumentTypeName); await umbracoUi.content.enterContentName(secondChildContentName); await umbracoUi.content.clickSaveButton(); @@ -96,7 +96,7 @@ test('can create multiple child nodes in a collection', async ({umbracoApi, umbr expect(childData[1].variants[0].name).toBe(secondChildContentName); // verify that the child content displays in collection list after reloading tree await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickReloadChildrenButton(); + await umbracoUi.content.clickReloadChildrenActionMenuOption(); await umbracoUi.content.goToContentWithName(contentName); await umbracoUi.content.doesDocumentTableColumnNameValuesMatch(expectedNames); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts index 8286173624..9d234294c2 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithDropdown.spec.ts @@ -29,7 +29,7 @@ for (const dataTypeName of dataTypeNames) { // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts index 7d69687595..26e0099cd5 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageCropper.spec.ts @@ -31,7 +31,7 @@ test('can create content with the image cropper data type', {tag: '@smoke'}, asy // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.uploadFile(imageFilePath); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageMediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageMediaPicker.spec.ts index aa003decf9..a45b146cc6 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageMediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithImageMediaPicker.spec.ts @@ -28,7 +28,7 @@ test('can save content with a image media picker', async ({umbracoApi, umbracoUi // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithListViewContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithListViewContent.spec.ts index 6e678eae80..8ccc85b342 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithListViewContent.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithListViewContent.spec.ts @@ -34,7 +34,7 @@ test.fixme('can create content with the list view data type', async ({umbracoApi // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -168,7 +168,7 @@ test('child is removed from list after child content is deleted', async ({umbrac // Act await umbracoUi.content.clickCaretButtonForContentName(contentName); await umbracoUi.content.clickActionsMenuForContent(childContentName); - await umbracoUi.content.clickTrashButton(); + await umbracoUi.content.clickTrashActionMenuOption(); await umbracoUi.content.clickConfirmTrashButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts index 9668649b5f..2d50c1b255 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMediaPicker.spec.ts @@ -31,7 +31,7 @@ test('can create content with the media picker data type', {tag: '@smoke'}, asyn // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickChooseButtonAndSelectMediaWithName(mediaFileName); @@ -61,7 +61,7 @@ test('can publish content with the media picker data type', async ({umbracoApi, // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickChooseButtonAndSelectMediaWithName(mediaFileName); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMemberPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMemberPicker.spec.ts index 5718d526aa..38bd38fde4 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMemberPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMemberPicker.spec.ts @@ -35,7 +35,7 @@ test('can create content with the member picker data type', {tag: '@smoke'}, asy // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickChooseMemberPickerButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts index b8c53efdac..25e3f113ec 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultiURLPicker.spec.ts @@ -33,7 +33,7 @@ test('can create content with the document link', {tag: '@smoke'}, async ({umbra // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickAddMultiURLPickerButton(); @@ -375,7 +375,7 @@ test.skip('can create content with the link to an unpublished document', async ( // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickAddMultiURLPickerButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleImageMediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleImageMediaPicker.spec.ts index f5644dd560..8a225b6e8d 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleImageMediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleImageMediaPicker.spec.ts @@ -36,7 +36,7 @@ test('can create content with multiple image media picker data type', async ({um // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts index ab669937bc..41041ff70c 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithMultipleMediaPicker.spec.ts @@ -37,7 +37,7 @@ test('can create content with multiple media picker data type', async ({umbracoA // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithNumeric.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithNumeric.spec.ts index 25f9abd5b5..a22a03affd 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithNumeric.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithNumeric.spec.ts @@ -26,7 +26,7 @@ test('can create content with the numeric data type', async ({umbracoApi, umbrac // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.enterNumeric(number); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts index c771c0bb64..e91e525c6f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithPropertyEditors.spec.ts @@ -26,7 +26,7 @@ test.skip('can create content with the Rich Text Editor datatype', {tag: '@smoke // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.enterRichTextArea(contentText); @@ -52,7 +52,7 @@ test.skip('can create content with the upload file datatype', async ({umbracoApi // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.uploadFile('./fixtures/mediaLibrary/' + uploadFilePath); @@ -79,7 +79,7 @@ test.skip('can create content with the list view - content datatype', async ({um // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); // TODO: add step to interact with the list diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts index 6aafa7b7e0..7a4e148880 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithRadiobox.spec.ts @@ -29,7 +29,7 @@ test('can create content with the radiobox data type', async ({umbracoApi, umbra // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTags.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTags.spec.ts index fc72f4f236..ff316715ed 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTags.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTags.spec.ts @@ -26,7 +26,7 @@ test('can create content with one tag', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickPlusIconButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts index 87cbe2ac82..9bf1dae55c 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextarea.spec.ts @@ -27,7 +27,7 @@ test('can create content with the textarea data type', async ({umbracoApi, umbra // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextstring.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextstring.spec.ts index d55ca01285..0b66c82fff 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextstring.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTextstring.spec.ts @@ -27,7 +27,7 @@ test('can create content with the textstring data type', async ({umbracoApi, umb // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts index 504dfea783..a479b96e5b 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithTrueFalse.spec.ts @@ -26,7 +26,7 @@ test('can create content with the true/false data type', async ({umbracoApi, umb // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -93,7 +93,7 @@ test('can toggle the true/false value with the initial state enabled', async ({u // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickToggleButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadArticle.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadArticle.spec.ts index 05731bfde1..2d255fdc03 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadArticle.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadArticle.spec.ts @@ -26,7 +26,7 @@ test('can create content with the upload article data type', async ({umbracoApi, // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadAudio.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadAudio.spec.ts index 7d6ebc23f1..f3e7064557 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadAudio.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadAudio.spec.ts @@ -26,7 +26,7 @@ test('can create content with the upload audio data type', async ({umbracoApi, u // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadFile.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadFile.spec.ts index 8b6477a6e3..a6f45b6ad4 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadFile.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadFile.spec.ts @@ -26,7 +26,7 @@ test('can create content with the upload file data type', async ({umbracoApi, um // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVectorGraphics.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVectorGraphics.spec.ts index 7a46b05420..da8557d514 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVectorGraphics.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVectorGraphics.spec.ts @@ -26,7 +26,7 @@ test('can create content with the upload vector graphics data type', async ({umb // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVideo.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVideo.spec.ts index e109e9b970..da8ea468e7 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVideo.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/ContentWithUploadVideo.spec.ts @@ -26,7 +26,7 @@ test('can create content with the upload video data type', async ({umbracoApi, u // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts index 8a22f75359..28370e69ea 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts @@ -35,7 +35,7 @@ test.afterEach(async ({umbracoApi}) => { test('can add a culture', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickCultureAndHostnamesButton(); + await umbracoUi.content.clickCultureAndHostnamesActionMenuOption(); await umbracoUi.content.selectCultureLanguageOption(languageName); await umbracoUi.content.clickSaveModalButton(); @@ -50,7 +50,7 @@ test('can add a culture', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { test('can add a domain', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickCultureAndHostnamesButton(); + await umbracoUi.content.clickCultureAndHostnamesActionMenuOption(); await umbracoUi.content.clickAddNewDomainButton(); await umbracoUi.waitForTimeout(500); await umbracoUi.content.enterDomain(domainName); @@ -78,7 +78,7 @@ test('can update culture and hostname', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickCultureAndHostnamesButton(); + await umbracoUi.content.clickCultureAndHostnamesActionMenuOption(); await umbracoUi.content.enterDomain(updatedDomainName); await umbracoUi.content.clickSaveModalButton(); @@ -98,7 +98,7 @@ test('can delete culture and hostname', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickCultureAndHostnamesButton(); + await umbracoUi.content.clickCultureAndHostnamesActionMenuOption(); await umbracoUi.content.clickDeleteDomainButton(); await umbracoUi.content.clickSaveModalButton(); @@ -119,7 +119,7 @@ test('can add culture and hostname for multiple languages', async ({umbracoApi, // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickCultureAndHostnamesButton(); + await umbracoUi.content.clickCultureAndHostnamesActionMenuOption(); await umbracoUi.content.clickAddNewDomainButton(); await umbracoUi.content.enterDomain(domainName, 0); await umbracoUi.content.selectDomainLanguageOption(languageName, 0); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RedirectManagement.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RedirectManagement.spec.ts index ee154c1cdb..36d834f67f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RedirectManagement.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RedirectManagement.spec.ts @@ -19,7 +19,7 @@ test.beforeEach(async ({umbracoApi, umbracoUi}) => { // Publish the content await umbracoUi.content.goToSection(ConstantHelper.sections.content); await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickPublishButton(); + await umbracoUi.content.clickPublishActionMenuOption(); await umbracoUi.content.clickConfirmToPublishButton(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/ContentWithTiptap.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/ContentWithTiptap.spec.ts index 4bc167f795..642b7caf3d 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/ContentWithTiptap.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/RichTextEditor/ContentWithTiptap.spec.ts @@ -27,7 +27,7 @@ test('can create content with empty RTE Tiptap property editor', async ({umbraco // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.clickSaveButton(); @@ -51,7 +51,7 @@ test('can create content with non-empty RTE Tiptap property editor', async ({umb // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(contentName); await umbracoUi.content.enterRTETipTapEditor(inputText); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/TrashContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/TrashContent.spec.ts index c008ea38ba..d1357b88ac 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/TrashContent.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/TrashContent.spec.ts @@ -31,7 +31,7 @@ test('can trash an invariant content node', {tag: '@smoke'}, async ({umbracoApi, // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickTrashButton(); + await umbracoUi.content.clickTrashActionMenuOption(); // Verify the references list not displayed await umbracoUi.content.isReferenceHeadlineVisible(false); await umbracoUi.content.clickConfirmTrashButton(); @@ -52,7 +52,7 @@ test('can trash a variant content node', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickTrashButton(); + await umbracoUi.content.clickTrashActionMenuOption(); // Verify the references list not displayed await umbracoUi.content.isReferenceHeadlineVisible(false); await umbracoUi.content.clickConfirmTrashButton(); @@ -74,7 +74,7 @@ test('can trash a published content node', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickTrashButton(); + await umbracoUi.content.clickTrashActionMenuOption(); // Verify the references list not displayed await umbracoUi.content.isReferenceHeadlineVisible(false); await umbracoUi.content.clickConfirmTrashButton(); @@ -99,7 +99,7 @@ test('can trash an invariant content node that references one item', async ({umb // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickTrashButton(); + await umbracoUi.content.clickTrashActionMenuOption(); // Verify the references list await umbracoUi.content.doesReferenceHeadlineHaveText(referenceHeadline); await umbracoUi.content.doesReferenceItemsHaveCount(1); @@ -126,7 +126,7 @@ test('can trash a variant content node that references one item', async ({umbrac // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickTrashButton(); + await umbracoUi.content.clickTrashActionMenuOption(); // Verify the references list await umbracoUi.content.doesReferenceHeadlineHaveText(referenceHeadline); await umbracoUi.content.doesReferenceItemsHaveCount(1); @@ -159,7 +159,7 @@ test('can trash an invariant content node that references more than 3 items', as // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickTrashButton(); + await umbracoUi.content.clickTrashActionMenuOption(); // Verify the references list has 3 items and has the text '...and one more item' await umbracoUi.content.doesReferenceHeadlineHaveText(referenceHeadline); await umbracoUi.content.doesReferenceItemsHaveCount(3); @@ -200,7 +200,7 @@ test('can trash a variant content node that references more than 3 items', async // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickTrashButton(); + await umbracoUi.content.clickTrashActionMenuOption(); // Verify the references list has 3 items and has the text '...and one more item' await umbracoUi.content.doesReferenceHeadlineHaveText(referenceHeadline); await umbracoUi.content.doesReferenceItemsHaveCount(3); @@ -239,7 +239,7 @@ test('can trash a content node with multiple cultures that references one item', // Act await umbracoUi.content.clickActionsMenuForContent(contentName); - await umbracoUi.content.clickTrashButton(); + await umbracoUi.content.clickTrashActionMenuOption(); // Verify the references list await umbracoUi.content.doesReferenceHeadlineHaveText(referenceHeadline); await umbracoUi.content.doesReferenceItemsHaveCount(1); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts index 97f8d8303c..7a0ade2d58 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockGrid/BlockGridEditor.spec.ts @@ -24,7 +24,7 @@ test('can create a block grid editor', {tag: '@smoke'}, async ({umbracoApi, umbr // Act await umbracoUi.dataType.clickActionsMenuAtRoot(); - await umbracoUi.dataType.clickActionsMenuCreateButton(); + await umbracoUi.dataType.clickCreateActionMenuOption(); await umbracoUi.dataType.clickDataTypeButton(); await umbracoUi.dataType.enterDataTypeName(blockGridEditorName); await umbracoUi.dataType.clickSelectAPropertyEditorButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts index e41a8da3bd..874974ab9e 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/BlockListEditor/BlockListEditor.spec.ts @@ -24,7 +24,7 @@ test('can create a block list editor', {tag: '@smoke'}, async ({umbracoApi, umbr // Act await umbracoUi.dataType.clickActionsMenuAtRoot(); - await umbracoUi.dataType.clickActionsMenuCreateButton(); + await umbracoUi.dataType.clickCreateActionMenuOption(); await umbracoUi.dataType.clickDataTypeButton(); await umbracoUi.dataType.enterDataTypeName(blockListEditorName); await umbracoUi.dataType.clickSelectAPropertyEditorButton(); @@ -64,7 +64,7 @@ test('can delete a block list editor', {tag: '@smoke'}, async ({umbracoApi, umbr // Act await umbracoUi.dataType.clickRootFolderCaretButton(); await umbracoUi.dataType.clickActionsMenuForDataType(blockListEditorName); - await umbracoUi.dataType.clickDeleteButton(); + await umbracoUi.dataType.clickDeleteActionMenuOption(); await umbracoUi.dataType.clickConfirmToDeleteButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts index 7b1229a0c9..5cc6841c5b 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataType.spec.ts @@ -16,7 +16,7 @@ test.afterEach(async ({umbracoApi}) => { test('can create a data type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.dataType.clickActionsMenuAtRoot(); - await umbracoUi.dataType.clickActionsMenuCreateButton(); + await umbracoUi.dataType.clickCreateActionMenuOption(); await umbracoUi.dataType.clickDataTypeButton(); await umbracoUi.dataType.enterDataTypeName(dataTypeName); await umbracoUi.dataType.clickSelectAPropertyEditorButton(); @@ -94,7 +94,7 @@ test('can change property editor in a data type', {tag: '@smoke'}, async ({umbra test('cannot create a data type without selecting the property editor', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.dataType.clickActionsMenuAtRoot(); - await umbracoUi.dataType.clickActionsMenuCreateButton(); + await umbracoUi.dataType.clickCreateActionMenuOption(); await umbracoUi.dataType.clickDataTypeButton(); await umbracoUi.dataType.enterDataTypeName(dataTypeName); await umbracoUi.dataType.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts index b9c28c70ac..95a8c5fc87 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts @@ -38,7 +38,7 @@ test('can rename a data type folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.dataType.clickRootFolderCaretButton(); await umbracoUi.dataType.clickActionsMenuForDataType(wrongDataTypeFolderName); - await umbracoUi.dataType.clickRenameFolderButton(); + await umbracoUi.dataType.clickRenameActionMenuOption(); await umbracoUi.dataType.enterFolderName(dataTypeFolderName); await umbracoUi.dataType.clickConfirmRenameButton(); @@ -73,7 +73,7 @@ test('can create a data type in a folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.dataType.clickRootFolderCaretButton(); await umbracoUi.dataType.clickActionsMenuForDataType(dataTypeFolderName); - await umbracoUi.dataType.clickActionsMenuCreateButton(); + await umbracoUi.dataType.clickCreateActionMenuOption(); await umbracoUi.dataType.clickDataTypeButton(); await umbracoUi.dataType.enterDataTypeName(dataTypeName); await umbracoUi.dataType.clickSelectAPropertyEditorButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts index ceb6231434..ac72b2f4a6 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/Tiptap.spec.ts @@ -21,7 +21,7 @@ test('can create a rich text editor with tiptap', {tag: '@smoke'}, async ({umbra // Act await umbracoUi.dataType.clickActionsMenuAtRoot(); - await umbracoUi.dataType.clickActionsMenuCreateButton(); + await umbracoUi.dataType.clickCreateActionMenuOption(); await umbracoUi.dataType.clickDataTypeButton(); await umbracoUi.dataType.enterDataTypeName(tipTapName); await umbracoUi.dataType.clickSelectAPropertyEditorButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Dictionary/Dictionary.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Dictionary/Dictionary.spec.ts index bd3c06a9f2..c3392c2fa2 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Dictionary/Dictionary.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Dictionary/Dictionary.spec.ts @@ -62,7 +62,7 @@ test('can create a dictionary item in a dictionary', {tag: '@smoke'}, async ({um // Act await umbracoUi.dictionary.clickActionsMenuForDictionary(parentDictionaryName); - await umbracoUi.dictionary.clickCreateButton(); + await umbracoUi.dictionary.clickCreateActionMenuOption(); await umbracoUi.dictionary.enterDictionaryName(dictionaryName); await umbracoUi.dictionary.clickSaveButton(); @@ -90,7 +90,7 @@ test('can export a dictionary item', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.dictionary.clickActionsMenuForDictionary(dictionaryName); - await umbracoUi.dictionary.clickExportButton(); + await umbracoUi.dictionary.clickExportActionMenuOption(); const exportData = await umbracoUi.dictionary.exportDictionary(false); // Assert @@ -106,7 +106,7 @@ test('can export a dictionary item with descendants', {tag: '@smoke'}, async ({u // Act await umbracoUi.dictionary.clickActionsMenuForDictionary(parentDictionaryName); - await umbracoUi.dictionary.clickExportButton(); + await umbracoUi.dictionary.clickExportActionMenuOption(); const exportData = await umbracoUi.dictionary.exportDictionary(true); // Assert @@ -151,7 +151,7 @@ test('can import a dictionary item with descendants', {tag: '@smoke'}, async ({u // Act await umbracoUi.dictionary.clickActionsMenuForDictionary(dictionaryName); - await umbracoUi.dictionary.clickImportButton(); + await umbracoUi.dictionary.clickImportActionMenuOption(); await umbracoUi.dictionary.importDictionary(udtFilePath); // These timeouts are necessary as this test can fail await umbracoUi.waitForTimeout(500); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts index 627e16b7ad..1a0a8f2e35 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts @@ -114,7 +114,7 @@ test('can trash a folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.media.clickActionsMenuForName(folderName); - await umbracoUi.media.clickTrashButton(); + await umbracoUi.media.clickTrashActionMenuOption(); await umbracoUi.media.clickConfirmTrashButton(); // Assert @@ -132,7 +132,7 @@ test('can create a folder in a folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.media.clickActionsMenuForName(parentFolderName); - await umbracoUi.media.clickCreateModalButton(); + await umbracoUi.media.clickCreateActionMenuOption(); await umbracoUi.media.clickMediaTypeName('Folder'); await umbracoUi.media.enterMediaItemName(folderName); await umbracoUi.media.clickSaveButton(); @@ -177,7 +177,7 @@ test('can trash a media item', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.media.clickActionsMenuForName(mediaFileName); - await umbracoUi.media.clickTrashButton(); + await umbracoUi.media.clickTrashActionMenuOption(); await umbracoUi.media.clickConfirmTrashButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts index a36e52b530..e20c444ced 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts @@ -27,7 +27,7 @@ test('can create a member', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => await umbracoUi.member.goToMembers(); // Act - await umbracoUi.member.clickCreateButton(); + await umbracoUi.member.clickCreateMembersButton(); await umbracoUi.member.enterMemberName(memberName); await umbracoUi.member.enterComments(comment); await umbracoUi.member.clickInfoTab(); @@ -233,7 +233,7 @@ test('cannot create member with invalid email', async ({umbracoApi, umbracoUi}) await umbracoUi.member.goToMembers(); // Act - await umbracoUi.member.clickCreateButton(); + await umbracoUi.member.clickCreateMembersButton(); await umbracoUi.member.enterMemberName(memberName); await umbracoUi.member.enterComments(comment); await umbracoUi.member.clickInfoTab(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RelationTypes/RelationTypes.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RelationTypes/RelationTypes.spec.ts index 15bfcb710b..f831ca285e 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RelationTypes/RelationTypes.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/RelationTypes/RelationTypes.spec.ts @@ -21,7 +21,7 @@ test.afterEach(async ({umbracoApi}) => { test.skip('can create a relation type', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.relationType.clickActionsMenuAtRoot(); - await umbracoUi.relationType.clickCreateButton(); + await umbracoUi.relationType.clickCreateActionMenuOption(); await umbracoUi.relationType.enterRelationTypeName(relationTypeName); await umbracoUi.relationType.selectParentOption(objectTypeName); await umbracoUi.relationType.selectChildOption(objectTypeName); @@ -93,7 +93,7 @@ test.skip('can delete a relation type', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.relationType.clickRootFolderCaretButton(); await umbracoUi.relationType.clickActionsMenuForRelationType(relationTypeName); - await umbracoUi.relationType.clickDeleteButton(); + await umbracoUi.relationType.clickDeleteActionMenuOption(); await umbracoUi.relationType.clickConfirmToDeleteButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentBlueprint/DocumentBlueprint.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentBlueprint/DocumentBlueprint.spec.ts index ace79eaf62..03ec3c453e 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentBlueprint/DocumentBlueprint.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentBlueprint/DocumentBlueprint.spec.ts @@ -23,7 +23,7 @@ test('can create a document blueprint from the settings menu', {tag: '@smoke'}, // Act await umbracoUi.documentBlueprint.clickActionsMenuAtRoot(); - await umbracoUi.documentBlueprint.clickCreateDocumentBlueprintButton(); + await umbracoUi.documentBlueprint.clickCreateActionMenuOption(); await umbracoUi.documentBlueprint.clickTextButtonWithName(documentTypeName); await umbracoUi.documentBlueprint.enterDocumentBlueprintName(documentBlueprintName); await umbracoUi.documentBlueprint.clickSaveButton(); @@ -66,7 +66,7 @@ test('can delete a document blueprint', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.documentBlueprint.reloadDocumentBlueprintsTree(); await umbracoUi.documentBlueprint.clickActionsMenuForDocumentBlueprints(documentBlueprintName); - await umbracoUi.documentBlueprint.clickDeleteMenuButton(); + await umbracoUi.documentBlueprint.clickDeleteActionMenuOption(); await umbracoUi.documentBlueprint.clickConfirmToDeleteButton(); // Assert @@ -85,7 +85,7 @@ test('can create a document blueprint from the content menu', async ({umbracoApi // Act await umbracoUi.content.clickActionsMenuForContent(documentBlueprintName); - await umbracoUi.content.clickCreateDocumentBlueprintButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.clickSaveModalButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentType.spec.ts index 462eaba4d9..0825634436 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentType.spec.ts @@ -18,7 +18,7 @@ test('can create a document type', {tag: '@smoke'}, async ({umbracoApi, umbracoU // Act await umbracoUi.documentType.clickActionsMenuAtRoot(); - await umbracoUi.documentType.clickCreateButton(); + await umbracoUi.documentType.clickCreateActionMenuOption(); await umbracoUi.documentType.clickCreateDocumentTypeButton(); await umbracoUi.documentType.enterDocumentTypeName(documentTypeName); await umbracoUi.documentType.clickSaveButton(); @@ -38,7 +38,7 @@ test('can create a document type with a template', {tag: '@smoke'}, async ({umbr // Act await umbracoUi.documentType.clickActionsMenuAtRoot(); - await umbracoUi.documentType.clickCreateButton(); + await umbracoUi.documentType.clickCreateActionMenuOption(); await umbracoUi.documentType.clickCreateDocumentTypeWithTemplateButton(); await umbracoUi.documentType.enterDocumentTypeName(documentTypeName); await umbracoUi.documentType.clickSaveButton(); @@ -63,7 +63,7 @@ test('can create a element type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi // Act await umbracoUi.documentType.clickActionsMenuAtRoot(); - await umbracoUi.documentType.clickCreateButton(); + await umbracoUi.documentType.clickCreateActionMenuOption(); await umbracoUi.documentType.clickCreateElementTypeButton(); await umbracoUi.documentType.enterDocumentTypeName(documentTypeName); await umbracoUi.documentType.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts index 26d8c5fd6a..031b8fa364 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeDesignTab.spec.ts @@ -224,7 +224,7 @@ test('can create a document type with a composition', {tag: '@smoke'}, async ({u await umbracoUi.documentType.goToDocumentType(documentTypeName); await umbracoUi.waitForTimeout(500); await umbracoUi.documentType.clickCompositionsButton(); - await umbracoUi.documentType.clickButtonWithName(compositionDocumentTypeName); + await umbracoUi.documentType.clickModalMenuItemWithName(compositionDocumentTypeName); await umbracoUi.documentType.clickSubmitButton(); await umbracoUi.documentType.clickSaveButton(); @@ -253,7 +253,7 @@ test('can remove a composition from a document type', async ({umbracoApi, umbrac await umbracoUi.documentType.goToDocumentType(documentTypeName); await umbracoUi.waitForTimeout(500); await umbracoUi.documentType.clickCompositionsButton(); - await umbracoUi.documentType.clickButtonWithName(compositionDocumentTypeName); + await umbracoUi.documentType.clickModalMenuItemWithName(compositionDocumentTypeName); await umbracoUi.documentType.clickSubmitButton(); await umbracoUi.documentType.clickConfirmToSubmitButton(); await umbracoUi.documentType.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts index c7b2607aa6..a8ca1db4e5 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeFolder.spec.ts @@ -15,8 +15,8 @@ test.afterEach(async ({umbracoApi}) => { test('can create a empty document type folder', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.documentType.goToSection(ConstantHelper.sections.settings); - await umbracoUi.documentType.clickActionsMenuForName('Document Types'); - await umbracoUi.documentType.clickCreateButton(); + await umbracoUi.documentType.clickActionsMenuAtRoot(); + await umbracoUi.documentType.clickCreateActionMenuOption(); await umbracoUi.documentType.clickCreateDocumentFolderButton(); await umbracoUi.documentType.enterFolderName(documentFolderName); await umbracoUi.documentType.clickCreateFolderButton(); @@ -39,7 +39,7 @@ test('can delete a document type folder', {tag: '@smoke'}, async ({umbracoApi, u await umbracoUi.documentType.goToSection(ConstantHelper.sections.settings); await umbracoUi.documentType.clickRootFolderCaretButton(); await umbracoUi.documentType.clickActionsMenuForName(documentFolderName); - await umbracoUi.documentType.deleteFolder(); + await umbracoUi.documentType.clickDeleteAndConfirmButton(); // Assert //await umbracoUi.documentType.doesSuccessNotificationHaveText(NotificationConstantHelper.success.deleted); @@ -58,7 +58,7 @@ test('can rename a document type folder', async ({umbracoApi, umbracoUi}) => { await umbracoUi.documentType.goToSection(ConstantHelper.sections.settings); await umbracoUi.documentType.clickRootFolderCaretButton(); await umbracoUi.documentType.clickActionsMenuForName(oldFolderName); - await umbracoUi.documentType.clickRenameFolderButton(); + await umbracoUi.documentType.clickRenameActionMenuOption(); await umbracoUi.documentType.enterFolderName(documentFolderName); await umbracoUi.documentType.clickConfirmRenameButton(); @@ -81,7 +81,7 @@ test('can create a document type folder in a folder', async ({umbracoApi, umbrac await umbracoUi.documentType.goToSection(ConstantHelper.sections.settings); await umbracoUi.documentType.clickRootFolderCaretButton(); await umbracoUi.documentType.clickActionsMenuForName(documentFolderName); - await umbracoUi.documentType.clickCreateButton(); + await umbracoUi.documentType.clickCreateActionMenuOption(); await umbracoUi.documentType.clickCreateDocumentFolderButton(); await umbracoUi.documentType.enterFolderName(childFolderName); await umbracoUi.documentType.clickCreateFolderButton(); @@ -113,7 +113,7 @@ test('can create a folder in a folder in a folder', {tag: '@smoke'}, async ({umb await umbracoUi.documentType.clickRootFolderCaretButton(); await umbracoUi.documentType.clickCaretButtonForName(grandParentFolderName); await umbracoUi.documentType.clickActionsMenuForName(parentFolderName); - await umbracoUi.documentType.clickCreateButton(); + await umbracoUi.documentType.clickCreateActionMenuOption(); await umbracoUi.documentType.clickCreateDocumentFolderButton(); await umbracoUi.documentType.enterFolderName(documentFolderName); await umbracoUi.documentType.clickCreateFolderButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts index 450d78e7c0..0a74181e39 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeStructureTab.spec.ts @@ -39,7 +39,7 @@ test('can add an allowed child node to a document type', {tag: '@smoke'}, async await umbracoUi.documentType.goToDocumentType(documentTypeName); await umbracoUi.documentType.clickStructureTab(); await umbracoUi.documentType.clickChooseButton(); - await umbracoUi.documentType.clickButtonWithName(documentTypeName); + await umbracoUi.documentType.clickModalMenuItemWithName(documentTypeName); await umbracoUi.documentType.clickAllowedChildNodesButton(); await umbracoUi.documentType.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaType.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaType.spec.ts index a617b95ae4..3849bae287 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaType.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaType.spec.ts @@ -15,8 +15,8 @@ test.afterEach(async ({umbracoApi}) => { test('can create a media type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Act - await umbracoUi.mediaType.clickActionsMenuForName('Media Types'); - await umbracoUi.mediaType.clickCreateButton(); + await umbracoUi.mediaType.clickActionsMenuAtRoot(); + await umbracoUi.mediaType.clickCreateActionMenuOption(); await umbracoUi.mediaType.clickMediaTypeButton(); await umbracoUi.mediaType.enterMediaTypeName(mediaTypeName); await umbracoUi.mediaType.clickSaveButton(); @@ -90,7 +90,7 @@ test('can delete a media type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) // Act await umbracoUi.mediaType.clickRootFolderCaretButton(); await umbracoUi.mediaType.clickActionsMenuForName(mediaTypeName); - await umbracoUi.mediaType.clickDeleteButton(); + await umbracoUi.mediaType.clickDeleteActionMenuOption(); await umbracoUi.mediaType.clickConfirmToDeleteButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts index 24906d2ce4..30109d90d8 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeFolder.spec.ts @@ -15,8 +15,8 @@ test.afterEach(async ({umbracoApi}) => { test('can create a empty media type folder', async ({umbracoApi, umbracoUi}) => { // Act - await umbracoUi.mediaType.clickActionsMenuForName('Media Types'); - await umbracoUi.mediaType.clickActionsMenuCreateButton(); + await umbracoUi.mediaType.clickActionsMenuAtRoot(); + await umbracoUi.mediaType.clickCreateActionMenuOption(); await umbracoUi.mediaType.clickFolderButton(); await umbracoUi.mediaType.enterFolderName(mediaTypeFolderName); await umbracoUi.mediaType.clickConfirmCreateFolderButton(); @@ -38,7 +38,7 @@ test('can delete a media type folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.mediaType.clickRootFolderCaretButton(); await umbracoUi.mediaType.clickActionsMenuForName(mediaTypeFolderName); - await umbracoUi.mediaType.deleteFolder(); + await umbracoUi.mediaType.clickDeleteAndConfirmButton(); // Assert //await umbracoUi.mediaType.doesSuccessNotificationHaveText(NotificationConstantHelper.success.deleted); @@ -55,7 +55,7 @@ test('can rename a media type folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.mediaType.clickRootFolderCaretButton(); await umbracoUi.mediaType.clickActionsMenuForName(oldFolderName); - await umbracoUi.mediaType.clickRenameFolderButton(); + await umbracoUi.mediaType.clickUpdateActionMenuOption(); await umbracoUi.waitForTimeout(500); await umbracoUi.mediaType.enterFolderName(mediaTypeFolderName); await umbracoUi.mediaType.clickConfirmRenameButton(); @@ -76,7 +76,7 @@ test('can create a media type folder in a folder', async ({umbracoApi, umbracoUi // Act await umbracoUi.mediaType.clickRootFolderCaretButton(); await umbracoUi.mediaType.clickActionsMenuForName(mediaTypeFolderName); - await umbracoUi.mediaType.clickActionsMenuCreateButton(); + await umbracoUi.mediaType.clickCreateActionMenuOption(); await umbracoUi.mediaType.clickFolderButton(); await umbracoUi.mediaType.enterFolderName(childFolderName); await umbracoUi.mediaType.clickConfirmCreateFolderButton(); @@ -106,7 +106,7 @@ test('can create a media type folder in a folder in a folder', async ({umbracoAp await umbracoUi.mediaType.clickRootFolderCaretButton(); await umbracoUi.mediaType.clickCaretButtonForName(grandparentFolderName); await umbracoUi.mediaType.clickActionsMenuForName(mediaTypeFolderName); - await umbracoUi.mediaType.clickActionsMenuCreateButton(); + await umbracoUi.mediaType.clickCreateActionMenuOption(); await umbracoUi.mediaType.clickFolderButton(); await umbracoUi.mediaType.enterFolderName(childFolderName); await umbracoUi.mediaType.clickConfirmCreateFolderButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts index 13d3ac2cfd..5410e830ec 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/MediaType/MediaTypeStructureTab.spec.ts @@ -38,7 +38,7 @@ test('can create a media type with an allowed child node type', {tag: '@smoke'}, await umbracoUi.mediaType.goToMediaType(mediaTypeName); await umbracoUi.mediaType.clickStructureTab(); await umbracoUi.mediaType.clickChooseButton(); - await umbracoUi.mediaType.clickButtonWithName(mediaTypeName); + await umbracoUi.mediaType.clickModalMenuItemWithName(mediaTypeName); await umbracoUi.mediaType.clickAllowedChildNodesButton(); await umbracoUi.mediaType.clickSaveButton(); @@ -60,8 +60,8 @@ test('can create a media type with multiple allowed child nodes types', async ({ await umbracoUi.mediaType.goToMediaType(mediaTypeName); await umbracoUi.mediaType.clickStructureTab(); await umbracoUi.mediaType.clickChooseButton(); - await umbracoUi.mediaType.clickButtonWithName(mediaTypeName); - await umbracoUi.mediaType.clickButtonWithName(secondMediaTypeName); + await umbracoUi.mediaType.clickModalMenuItemWithName(mediaTypeName); + await umbracoUi.mediaType.clickModalMenuItemWithName(secondMediaTypeName); await umbracoUi.mediaType.clickAllowedChildNodesButton(); await umbracoUi.mediaType.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts index 1fbb85f291..47d42fd27f 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialView.spec.ts @@ -20,7 +20,7 @@ test.afterEach(async ({umbracoApi}) => { test('can create an empty partial view', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.partialView.clickActionsMenuAtRoot(); - await umbracoUi.partialView.clickCreateButton(); + await umbracoUi.partialView.clickCreateOptionsActionMenuOption(); await umbracoUi.partialView.clickNewEmptyPartialViewButton(); await umbracoUi.partialView.enterPartialViewName(partialViewName); await umbracoUi.partialView.clickSaveButton(); @@ -40,7 +40,7 @@ test('can create a partial view from snippet', async ({umbracoApi, umbracoUi}) = // Act await umbracoUi.partialView.clickActionsMenuAtRoot(); - await umbracoUi.partialView.clickCreateButton(); + await umbracoUi.partialView.clickCreateOptionsActionMenuOption(); await umbracoUi.partialView.clickNewPartialViewFromSnippetButton(); await umbracoUi.partialView.clickBreadcrumbButton(); await umbracoUi.partialView.enterPartialViewName(partialViewName); @@ -290,7 +290,7 @@ test.skip('can show returned items in query builder ', async ({umbracoApi, umbra test('cannot create a partial view with an empty name', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.partialView.clickActionsMenuAtRoot(); - await umbracoUi.partialView.clickCreateButton(); + await umbracoUi.partialView.clickCreateOptionsActionMenuOption(); await umbracoUi.partialView.clickNewEmptyPartialViewButton(); await umbracoUi.partialView.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts index 44e3e8621a..b3d9215036 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/PartialView/PartialViewFolder.spec.ts @@ -40,7 +40,7 @@ test('can delete a folder', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => // Act await umbracoUi.partialView.reloadPartialViewTree(); await umbracoUi.partialView.clickActionsMenuForPartialView(folderName); - await umbracoUi.partialView.deleteFolder(); + await umbracoUi.partialView.clickDeleteAndConfirmButton(); // Assert //await umbracoUi.partialView.isSuccessNotificationVisible(); @@ -61,7 +61,7 @@ test('can create a partial view in a folder', async ({umbracoApi, umbracoUi}) => // Act await umbracoUi.partialView.reloadPartialViewTree(); await umbracoUi.partialView.clickActionsMenuForPartialView(folderName); - await umbracoUi.partialView.clickCreateButton(); + await umbracoUi.partialView.clickCreateOptionsActionMenuOption(); await umbracoUi.partialView.clickNewEmptyPartialViewButton(); await umbracoUi.partialView.enterPartialViewName(partialViewName); await umbracoUi.partialView.clickSaveButton(); @@ -91,7 +91,7 @@ test('can create a partial view in a folder in a folder', async ({umbracoApi, um await umbracoUi.partialView.reloadPartialViewTree(); await umbracoUi.partialView.clickCaretButtonForName(folderName); await umbracoUi.partialView.clickActionsMenuForPartialView(childFolderName); - await umbracoUi.partialView.clickCreateButton(); + await umbracoUi.partialView.clickCreateOptionsActionMenuOption(); await umbracoUi.partialView.clickNewEmptyPartialViewButton(); await umbracoUi.partialView.enterPartialViewName(partialViewName); await umbracoUi.partialView.clickSaveButton(); @@ -161,7 +161,7 @@ test('cannot delete non-empty folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.partialView.clickRootFolderCaretButton(); await umbracoUi.partialView.clickActionsMenuForPartialView(folderName); - await umbracoUi.partialView.deleteFolder(); + await umbracoUi.partialView.clickDeleteAndConfirmButton(); // Assert await umbracoUi.partialView.doesErrorNotificationHaveText(NotificationConstantHelper.error.notEmpty); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/Script.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/Script.spec.ts index fbf775139b..69611cd633 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/Script.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/Script.spec.ts @@ -19,7 +19,7 @@ test('can create a empty script', {tag: '@smoke'}, async ({umbracoApi, umbracoUi // Act await umbracoUi.script.clickActionsMenuAtRoot(); - await umbracoUi.script.clickCreateButton(); + await umbracoUi.script.clickCreateOptionsActionMenuOption(); await umbracoUi.script.clickNewJavascriptFileButton(); await umbracoUi.script.enterScriptName(scriptName); await umbracoUi.script.clickSaveButton(); @@ -38,7 +38,7 @@ test('can create a script with content', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.script.clickActionsMenuAtRoot(); - await umbracoUi.script.clickCreateButton(); + await umbracoUi.script.clickCreateOptionsActionMenuOption(); await umbracoUi.script.clickNewJavascriptFileButton(); await umbracoUi.script.enterScriptName(scriptName); await umbracoUi.script.enterScriptContent(scriptContent); @@ -111,7 +111,7 @@ test('cannot create a script with an empty name', async ({umbracoApi, umbracoUi} // Act await umbracoUi.script.clickActionsMenuAtRoot(); - await umbracoUi.script.clickCreateButton(); + await umbracoUi.script.clickCreateOptionsActionMenuOption(); await umbracoUi.script.clickNewJavascriptFileButton(); await umbracoUi.script.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/ScriptFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/ScriptFolder.spec.ts index 585cf679b6..a7bd693303 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/ScriptFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Script/ScriptFolder.spec.ts @@ -36,7 +36,7 @@ test('can delete a folder', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => // Act await umbracoUi.script.reloadScriptTree(); await umbracoUi.script.clickActionsMenuForScript(scriptFolderName); - await umbracoUi.script.deleteFolder(); + await umbracoUi.script.clickDeleteAndConfirmButton(); // Assert //await umbracoUi.script.doesSuccessNotificationHaveText(NotificationConstantHelper.success.deleted); @@ -54,7 +54,7 @@ test('can create a script in a folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.script.reloadScriptTree(); await umbracoUi.script.clickActionsMenuForScript(scriptFolderName); - await umbracoUi.script.clickCreateButton(); + await umbracoUi.script.clickCreateOptionsActionMenuOption(); await umbracoUi.script.clickNewJavascriptFileButton(); await umbracoUi.script.enterScriptName(scriptName); await umbracoUi.script.enterScriptContent(scriptContent); @@ -128,7 +128,7 @@ test('can create a script in a folder in a folder', async ({umbracoApi, umbracoU await umbracoUi.script.reloadScriptTree(); await umbracoUi.script.clickCaretButtonForName(scriptFolderName); await umbracoUi.script.clickActionsMenuForScript(childFolderName); - await umbracoUi.script.clickCreateButton(); + await umbracoUi.script.clickCreateOptionsActionMenuOption(); await umbracoUi.script.clickNewJavascriptFileButton(); await umbracoUi.script.enterScriptName(scriptName); await umbracoUi.script.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/Stylesheet.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/Stylesheet.spec.ts index 11379a031d..0e3e8caf8d 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/Stylesheet.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/Stylesheet.spec.ts @@ -21,7 +21,7 @@ test('can create a empty stylesheet', {tag: '@smoke'}, async ({umbracoApi, umbra // Act await umbracoUi.stylesheet.clickActionsMenuAtRoot(); - await umbracoUi.stylesheet.clickCreateButton(); + await umbracoUi.stylesheet.clickCreateActionMenuOption(); await umbracoUi.stylesheet.clickNewStylesheetButton(); await umbracoUi.stylesheet.enterStylesheetName(stylesheetName); await umbracoUi.stylesheet.clickSaveButton(); @@ -40,7 +40,7 @@ test('can create a stylesheet with content', async ({umbracoApi, umbracoUi}) => //Act await umbracoUi.stylesheet.clickActionsMenuAtRoot(); - await umbracoUi.stylesheet.clickCreateButton(); + await umbracoUi.stylesheet.clickCreateActionMenuOption(); await umbracoUi.stylesheet.clickNewStylesheetButton(); await umbracoUi.stylesheet.enterStylesheetName(stylesheetName); await umbracoUi.stylesheet.enterStylesheetContent(stylesheetContent); @@ -114,7 +114,7 @@ test('cannot create a stylesheet with an empty name', async ({umbracoApi, umbrac // Act await umbracoUi.stylesheet.clickActionsMenuAtRoot(); - await umbracoUi.stylesheet.clickCreateButton(); + await umbracoUi.stylesheet.clickCreateActionMenuOption(); await umbracoUi.stylesheet.clickNewStylesheetButton(); await umbracoUi.stylesheet.clickSaveButton(); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/StylesheetFolder.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/StylesheetFolder.spec.ts index 50f414269b..3d70ad63fa 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/StylesheetFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Stylesheet/StylesheetFolder.spec.ts @@ -36,7 +36,7 @@ test('can delete a folder', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => // Act await umbracoUi.stylesheet.reloadStylesheetTree(); await umbracoUi.stylesheet.clickActionsMenuForStylesheet(stylesheetFolderName); - await umbracoUi.stylesheet.deleteFolder(); + await umbracoUi.stylesheet.clickDeleteAndConfirmButton(); // Assert //await umbracoUi.stylesheet.doesSuccessNotificationHaveText(NotificationConstantHelper.success.deleted); @@ -99,7 +99,7 @@ test('can create a stylesheet in a folder', async ({umbracoApi, umbracoUi}) => { //Act await umbracoUi.stylesheet.reloadStylesheetTree(); await umbracoUi.stylesheet.clickActionsMenuForStylesheet(stylesheetFolderName); - await umbracoUi.stylesheet.clickCreateButton(); + await umbracoUi.stylesheet.clickCreateActionMenuOption(); await umbracoUi.stylesheet.clickNewStylesheetButton(); await umbracoUi.stylesheet.enterStylesheetName(stylesheetName); await umbracoUi.stylesheet.enterStylesheetContent(stylesheetContent); @@ -129,7 +129,7 @@ test('can create a stylesheet in a folder in a folder', async ({umbracoApi, umbr await umbracoUi.stylesheet.reloadStylesheetTree(); await umbracoUi.stylesheet.clickCaretButtonForName(stylesheetFolderName); await umbracoUi.stylesheet.clickActionsMenuForStylesheet(childFolderName); - await umbracoUi.stylesheet.clickCreateButton(); + await umbracoUi.stylesheet.clickCreateActionMenuOption(); await umbracoUi.stylesheet.clickNewStylesheetButton(); await umbracoUi.stylesheet.enterStylesheetName(stylesheetName); await umbracoUi.stylesheet.enterStylesheetContent(stylesheetContent); @@ -157,7 +157,7 @@ test('cannot delete non-empty folder', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.stylesheet.clickRootFolderCaretButton(); await umbracoUi.stylesheet.clickActionsMenuForStylesheet(stylesheetFolderName); - await umbracoUi.stylesheet.deleteFolder(); + await umbracoUi.stylesheet.clickDeleteAndConfirmButton(); //Assert await umbracoUi.stylesheet.doesErrorNotificationHaveText(NotificationConstantHelper.error.notEmpty); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts index 171d879257..7eee110e32 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/Template/Templates.spec.ts @@ -19,7 +19,7 @@ test('can create a template', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) = // Act await umbracoUi.template.clickActionsMenuAtRoot(); - await umbracoUi.template.clickCreateButton(); + await umbracoUi.template.clickCreateActionMenuOption(); await umbracoUi.template.enterTemplateName(templateName); await umbracoUi.template.clickSaveButton(); @@ -378,7 +378,7 @@ test('cannot create a template with an empty name', {tag: '@smoke'}, async ({umb // Act await umbracoUi.template.clickActionsMenuAtRoot(); - await umbracoUi.template.clickCreateButton(); + await umbracoUi.template.clickCreateActionMenuOption(); await umbracoUi.template.clickSaveButton(); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentWithTinyMCERichTextEditor.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentWithTinyMCERichTextEditor.spec.ts index 99eea41a1a..963bf3b551 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentWithTinyMCERichTextEditor.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/ContentWithTinyMCERichTextEditor.spec.ts @@ -38,7 +38,7 @@ test('can create content with a rich text editor that has a stylesheet', async ( // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(documentTypeName); await umbracoUi.content.enterContentName(documentName); await umbracoUi.content.doesErrorNotificationHaveText(NotificationConstantHelper.error.noAccessToResource, false); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts index a103a6f7e4..ea32f45f76 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/Permissions/UserGroup/DefaultPermissionsInContent.spec.ts @@ -91,7 +91,7 @@ test('can create document blueprint with permission enabled', async ({umbracoApi // Act await umbracoUi.content.clickActionsMenuForContent(rootDocumentName); - await umbracoUi.content.clickCreateDocumentBlueprintButton(); + await umbracoUi.content.clickCreateBlueprintActionMenuOption(); await umbracoUi.content.enterDocumentBlueprintName(documentBlueprintName); await umbracoUi.content.clickSaveDocumentBlueprintButton(); @@ -123,7 +123,7 @@ test('can delete content with delete permission enabled', async ({umbracoApi, um // Act await umbracoUi.content.clickActionsMenuForContent(rootDocumentName); - await umbracoUi.content.clickTrashButton(); + await umbracoUi.content.clickTrashActionMenuOption(); await umbracoUi.content.clickConfirmTrashButton(); // Assert @@ -187,7 +187,7 @@ test('can create content with create permission enabled', async ({umbracoApi, um // Act await umbracoUi.content.clickActionsMenuAtRoot(); - await umbracoUi.content.clickCreateButton(); + await umbracoUi.content.clickCreateActionMenuOption(); await umbracoUi.content.chooseDocumentType(rootDocumentTypeName); await umbracoUi.content.enterContentName(testDocumentName); await umbracoUi.content.clickSaveButton(); @@ -247,7 +247,7 @@ test('can publish content with publish permission enabled', async ({umbracoApi, // Act await umbracoUi.content.clickActionsMenuForContent(rootDocumentName); - await umbracoUi.content.clickPublishButton(); + await umbracoUi.content.clickPublishActionMenuOption(); await umbracoUi.content.clickConfirmToPublishButton(); // Assert @@ -312,7 +312,7 @@ test('can unpublish content with unpublish permission enabled', async ({umbracoA // Act await umbracoUi.content.clickActionsMenuForContent(rootDocumentName); - await umbracoUi.content.clickUnpublishButton(); + await umbracoUi.content.clickUnpublishActionMenuOption(); await umbracoUi.content.clickConfirmToUnpublishButton(); // Assert @@ -383,7 +383,7 @@ test('can duplicate content with duplicate permission enabled', async ({umbracoA // Act await umbracoUi.content.clickActionsMenuForContent(rootDocumentName); // Duplicate to root - await umbracoUi.content.clickDuplicateToButton(); + await umbracoUi.content.clickDuplicateToActionMenuOption(); await umbracoUi.content.clickLabelWithName('Content'); await umbracoUi.content.clickDuplicateButton(); @@ -425,7 +425,7 @@ test('can move content with move to permission enabled', async ({umbracoApi, umb // Act await umbracoUi.content.clickCaretButtonForContentName(rootDocumentName); await umbracoUi.content.clickActionsMenuForContent(childDocumentOneName); - await umbracoUi.content.clickMoveToButton(); + await umbracoUi.content.clickMoveToActionMenuOption(); await umbracoUi.content.moveToContentWithName([], moveToDocumentName); // Assert @@ -466,7 +466,7 @@ test('can sort children with sort children permission enabled', async ({umbracoA // Act await umbracoUi.content.clickActionsMenuForContent(rootDocumentName); - await umbracoUi.content.clickSortChildrenButton(); + await umbracoUi.content.clickSortChildrenActionMenuOption(); // TODO: uncomment when it is not flaky // const childDocumentOneLocator = await umbracoUi.content.getButtonWithName(childDocumentOneName); @@ -507,7 +507,7 @@ test('can set culture and hostnames with culture and hostnames permission enable // Act await umbracoUi.content.clickActionsMenuForContent(rootDocumentName); - await umbracoUi.content.clickCultureAndHostnamesButton(); + await umbracoUi.content.clickCultureAndHostnamesActionMenuOption(); await umbracoUi.content.clickAddNewDomainButton(); await umbracoUi.content.enterDomain('/domain'); await umbracoUi.content.clickSaveModalButton(); @@ -544,7 +544,7 @@ test.skip('can set public access with public access permission enabled', async ( // Act await umbracoUi.content.clickActionsMenuForContent(rootDocumentName); - await umbracoUi.content.clickPublicAccessButton(); + await umbracoUi.content.clickPublicAccessActionMenuOption(); await umbracoUi.content.addGroupBasedPublicAccess(testMemberGroup, rootDocumentName); // Assert diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts index dc174629ab..bb55acd9d8 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts @@ -22,8 +22,7 @@ test('can create a user', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { await umbracoUi.user.goToUsers(); // Act - await umbracoUi.user.clickCreateButton(); - await umbracoUi.user.clickUserButton(); + await umbracoUi.user.clickCreateActionWithOptionName('User'); await umbracoUi.user.enterNameOfTheUser(nameOfTheUser); await umbracoUi.user.enterUserEmail(userEmail); await umbracoUi.user.clickChooseButton();