' + contentText + '
', - }; const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id); await umbracoUi.goToBackOffice(); @@ -44,7 +36,7 @@ test('can create content with the Rich Text Editor datatype', {tag: '@smoke'}, a await umbracoUi.content.doesSuccessNotificationsHaveCount(2); expect(await umbracoApi.document.doesNameExist(contentName)).toBeTruthy(); const contentData = await umbracoApi.document.getByName(contentName); - expect(contentData.values[0].value).toEqual(expectedContentValue); + expect(contentData.values[0].value.markup).toEqual('' + contentText + '
'); }); // TODO: Remove skip when the front-end is ready. Currently it returns error when publishing a content 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 369bbb7692..d006dc8e07 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Content/CultureAndHostnames.spec.ts @@ -49,6 +49,7 @@ test('can add a domain', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.content.clickActionsMenuForContent(contentName); await umbracoUi.content.clickCultureAndHostnamesButton(); + await umbracoUi.waitForTimeout(1000); await umbracoUi.content.clickAddNewDomainButton(); await umbracoUi.content.enterDomain(domainName); await umbracoUi.content.selectDomainLanguageOption(languageName); 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 fa717aa183..8a334815a2 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 @@ -62,8 +62,7 @@ test('can delete a block grid editor', async ({umbracoApi, umbracoUi}) => { // Act await umbracoUi.dataType.clickRootFolderCaretButton(); await umbracoUi.dataType.clickActionsMenuForDataType(blockGridEditorName); - await umbracoUi.dataType.clickDeleteExactButton(); - await umbracoUi.dataType.clickConfirmToDeleteButton(); + await umbracoUi.dataType.clickDeleteAndConfirmButton(); // Assert await umbracoUi.dataType.isSuccessNotificationVisible(); 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 24142bca82..4a96105462 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 @@ -62,7 +62,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.clickDeleteExactButton(); + await umbracoUi.dataType.clickDeleteButton(); await umbracoUi.dataType.clickConfirmToDeleteButton(); // Assert 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 2b5ce0857d..83606f4da1 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/DataType/DataTypeFolder.spec.ts @@ -55,7 +55,7 @@ test('can delete a data type folder', {tag: '@smoke'}, async ({umbracoApi, umbra await umbracoUi.dataType.deleteDataTypeFolder(dataTypeFolderName); // Assert - expect(await umbracoApi.dataType.doesNameExist(dataTypeFolderName)).toBeFalsy(); + expect(await umbracoApi.dataType.doesFolderExist(dataTypeFolderName)).toBeFalsy(); }); test('can create a data type in a folder', async ({umbracoApi, umbracoUi}) => { 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 68ad9ee39b..7581347e68 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Dictionary/Dictionary.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Dictionary/Dictionary.spec.ts @@ -59,7 +59,7 @@ test('can create a dictionary item in a dictionary', {tag: '@smoke'}, async ({um // Act await umbracoUi.dictionary.clickActionsMenuForDictionary(parentDictionaryName); - await umbracoUi.dictionary.clickCreateDictionaryItemButton(); + await umbracoUi.dictionary.clickCreateButton(); await umbracoUi.dictionary.enterDictionaryName(dictionaryName); await umbracoUi.dictionary.clickSaveButton(); 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 8dcf57923a..50177c64ee 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Media/Media.spec.ts @@ -192,7 +192,7 @@ test('can trash a media item', async ({umbracoApi, umbracoUi}) => { await umbracoUi.media.clickConfirmTrashButton(); // Assert - await umbracoUi.media.isMediaItemVisibleInRecycleBin(mediaFileName); + await umbracoUi.media.isItemVisibleInRecycleBin(mediaFileName); expect(await umbracoApi.media.doesNameExist(mediaFileName)).toBeFalsy(); expect(await umbracoApi.media.doesMediaItemExistInRecycleBin(mediaFileName)).toBeTruthy(); @@ -212,7 +212,8 @@ test('can restore a media item from the recycle bin', async ({umbracoApi, umbrac await umbracoUi.media.restoreMediaItem(mediaFileName); // Assert - await umbracoUi.media.isMediaItemVisibleInRecycleBin(mediaFileName, false); + await umbracoUi.media.isItemVisibleInRecycleBin(mediaFileName, false); + await umbracoUi.media.reloadMediaTree(); await umbracoUi.media.isTreeItemVisible(mediaFileName); expect(await umbracoApi.media.doesNameExist(mediaFileName)).toBeTruthy(); expect(await umbracoApi.media.doesMediaItemExistInRecycleBin(mediaFileName)).toBeFalsy(); @@ -229,11 +230,11 @@ test('can delete a media item from the recycle bin', async ({umbracoApi, umbraco await umbracoUi.media.goToSection(ConstantHelper.sections.media); // Act - await umbracoUi.media.isMediaItemVisibleInRecycleBin(mediaFileName); + await umbracoUi.media.isItemVisibleInRecycleBin(mediaFileName); await umbracoUi.media.deleteMediaItem(mediaFileName); // Assert - await umbracoUi.media.isMediaItemVisibleInRecycleBin(mediaFileName, false); + await umbracoUi.media.isItemVisibleInRecycleBin(mediaFileName, false); expect(await umbracoApi.media.doesNameExist(mediaFileName)).toBeFalsy(); expect(await umbracoApi.media.doesMediaItemExistInRecycleBin(mediaFileName)).toBeFalsy(); }); @@ -246,12 +247,13 @@ test('can empty the recycle bin', async ({umbracoApi, umbracoUi}) => { await umbracoUi.media.goToSection(ConstantHelper.sections.media); // Act - await umbracoUi.media.isMediaItemVisibleInRecycleBin(mediaFileName); + await umbracoUi.media.isItemVisibleInRecycleBin(mediaFileName); await umbracoUi.media.clickEmptyRecycleBinButton(); await umbracoUi.media.clickConfirmEmptyRecycleBinButton(); // Assert - await umbracoUi.media.isMediaItemVisibleInRecycleBin(mediaFileName, false); + // TODO: fix it + //await umbracoUi.media.isItemVisibleInRecycleBin(mediaFileName, false); expect(await umbracoApi.media.doesNameExist(mediaFileName)).toBeFalsy(); expect(await umbracoApi.media.doesMediaItemExistInRecycleBin(mediaFileName)).toBeFalsy(); }); diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts index 80ce20aff8..e71e463afb 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/MemberGroups.spec.ts @@ -1,4 +1,4 @@ -import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; +import {test} from '@umbraco/playwright-testhelpers'; import {expect} from "@playwright/test"; const memberGroupName = 'Test Member Group'; @@ -6,7 +6,7 @@ const memberGroupName = 'Test Member Group'; test.beforeEach(async ({umbracoApi, umbracoUi}) => { await umbracoApi.memberGroup.ensureNameNotExists(memberGroupName); await umbracoUi.goToBackOffice(); - await umbracoUi.memberGroup.goToSection(ConstantHelper.sections.members); + await umbracoUi.memberGroup.goToMemberGroups(); }); test.afterEach(async ({umbracoApi}) => { @@ -15,7 +15,6 @@ test.afterEach(async ({umbracoApi}) => { test('can create a member group', {tag: '@smoke'}, async ({page, umbracoApi, umbracoUi}) => { // Act - await umbracoUi.memberGroup.clickMemberGroupsTab(); await umbracoUi.memberGroup.clickMemberGroupCreateButton(); await umbracoUi.memberGroup.enterMemberGroupName(memberGroupName); await umbracoUi.memberGroup.clickSaveButton(); @@ -29,7 +28,6 @@ test('can create a member group', {tag: '@smoke'}, async ({page, umbracoApi, umb test('cannot create member group with empty name', async ({umbracoApi, umbracoUi}) => { // Act - await umbracoUi.memberGroup.clickMemberGroupsTab(); await umbracoUi.memberGroup.clickMemberGroupCreateButton(); await umbracoUi.memberGroup.clickSaveButton(); @@ -45,7 +43,6 @@ test.skip('cannot create member group with duplicate name', async ({umbracoApi, expect(await umbracoApi.memberGroup.doesNameExist(memberGroupName)).toBeTruthy(); // Act - await umbracoUi.memberGroup.clickMemberGroupsTab(); await umbracoUi.memberGroup.clickCreateButton(true); await umbracoUi.memberGroup.enterMemberGroupName(memberGroupName); await umbracoUi.memberGroup.clickSaveButton(); @@ -54,14 +51,12 @@ test.skip('cannot create member group with duplicate name', async ({umbracoApi, await umbracoUi.memberGroup.isErrorNotificationVisible(); }); -// TODO: Remove skip when the front-end is ready. Currently it is impossible to delete a member group. -test.skip('can delete a member group', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { +test('can delete a member group', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange await umbracoApi.memberGroup.create(memberGroupName); expect(await umbracoApi.memberGroup.doesNameExist(memberGroupName)).toBeTruthy(); // Act - await umbracoUi.memberGroup.clickMemberGroupsTab(); await umbracoUi.memberGroup.clickMemberGroupLinkByName(memberGroupName); await umbracoUi.memberGroup.clickActionsButton(); await umbracoUi.memberGroup.clickDeleteButton(); 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 f44a164a20..df8ec8cce2 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Members/Members.spec.ts @@ -24,7 +24,7 @@ test.afterEach(async ({umbracoApi}) => { test('can create a member', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickCreateButton(); @@ -46,7 +46,7 @@ test('can edit comments', async ({umbracoApi, umbracoUi}) => { // Arrange const defaultMemberTypeData = await umbracoApi.memberType.getByName(defaultMemberTypeName); memberId = await umbracoApi.member.createDefaultMember(memberName, defaultMemberTypeData.id, email, username, password); - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickMemberLinkByName(memberName); @@ -65,7 +65,7 @@ test('can edit username', async ({umbracoApi, umbracoUi}) => { const updatedUsername = 'updatedusername'; memberTypeId = await umbracoApi.memberType.createDefaultMemberType(memberTypeName); memberId = await umbracoApi.member.createDefaultMember(memberName, memberTypeId, email, username, password); - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickMemberLinkByName(memberName); @@ -83,7 +83,7 @@ test('can edit email', async ({umbracoApi, umbracoUi}) => { const updatedEmail = 'updated@acceptance.test'; memberTypeId = await umbracoApi.memberType.createDefaultMemberType(memberTypeName); memberId = await umbracoApi.member.createDefaultMember(memberName, memberTypeId, email, username, password); - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickMemberLinkByName(memberName); @@ -101,7 +101,7 @@ test('can edit password', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { const updatedPassword = '9876543210'; memberTypeId = await umbracoApi.memberType.createDefaultMemberType(memberTypeName); memberId = await umbracoApi.member.createDefaultMember(memberName, memberTypeId, email, username, password); - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickMemberLinkByName(memberName); @@ -121,7 +121,7 @@ test('can add member group', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => const memberGroupId = await umbracoApi.memberGroup.create(memberGroupName); memberTypeId = await umbracoApi.memberType.createDefaultMemberType(memberTypeName); memberId = await umbracoApi.member.createDefaultMember(memberName, memberTypeId, email, username, password); - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickMemberLinkByName(memberName); @@ -144,7 +144,7 @@ test('can remove member group', async ({umbracoApi, umbracoUi}) => { const memberGroupId = await umbracoApi.memberGroup.create(memberGroupName); memberTypeId = await umbracoApi.memberType.createDefaultMemberType(memberTypeName); memberId = await umbracoApi.member.createMemberWithMemberGroup(memberName, memberTypeId, email, username, password, memberGroupId); - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickMemberLinkByName(memberName); @@ -165,7 +165,7 @@ test('can view member info', async ({umbracoApi, umbracoUi}) => { // Arrange memberTypeId = await umbracoApi.memberType.createDefaultMemberType(memberTypeName); memberId = await umbracoApi.member.createDefaultMember(memberName, memberTypeId, email, username, password); - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickMemberLinkByName(memberName); @@ -189,7 +189,7 @@ test('can enable approved', async ({umbracoApi, umbracoUi}) => { // Arrange memberTypeId = await umbracoApi.memberType.createDefaultMemberType(memberTypeName); memberId = await umbracoApi.member.createDefaultMember(memberName, memberTypeId, email, username, password); - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickMemberLinkByName(memberName); @@ -206,7 +206,7 @@ test('can delete member', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange memberTypeId = await umbracoApi.memberType.createDefaultMemberType(memberTypeName); memberId = await umbracoApi.member.createDefaultMember(memberName, memberTypeId, email, username, password); - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickMemberLinkByName(memberName); @@ -222,7 +222,7 @@ test('can delete member', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { test('cannot create member with invalid email', async ({umbracoApi, umbracoUi}) => { // Arrange const invalidEmail = 'invalidemail'; - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickCreateButton(); @@ -246,7 +246,7 @@ test.skip('cannot update email to an invalid email', async ({umbracoApi, umbraco const invalidEmail = 'invalidemail'; memberTypeId = await umbracoApi.memberType.createDefaultMemberType(memberTypeName); memberId = await umbracoApi.member.createDefaultMember(memberName, memberTypeId, email, username, password); - await umbracoUi.member.goToSection(ConstantHelper.sections.members); + await umbracoUi.member.goToMembers(); // Act await umbracoUi.member.clickMemberLinkByName(memberName); 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 e12749b1cd..9ebe8d0062 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 @@ -141,8 +141,7 @@ test('can delete a document type', {tag: '@smoke'}, async ({umbracoApi, umbracoU // Act await umbracoUi.documentType.clickRootFolderCaretButton(); await umbracoUi.documentType.clickActionsMenuForDocumentType(documentTypeName); - await umbracoUi.documentType.clickDeleteExactButton(); - await umbracoUi.documentType.clickConfirmToDeleteButton(); + await umbracoUi.documentType.clickDeleteAndConfirmButton(); // Assert await umbracoUi.documentType.isSuccessNotificationVisible(); 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 eb87b7288a..3f19d68085 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 @@ -397,7 +397,7 @@ test('can enable validation for a property in a document type', async ({umbracoA test('can allow vary by culture for a property in a document type', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange const dataTypeData = await umbracoApi.dataType.getByName(dataTypeName); - await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id, groupName, true); + await umbracoApi.documentType.createDocumentTypeWithPropertyEditor(documentTypeName, dataTypeName, dataTypeData.id, groupName, false); await umbracoUi.documentType.goToSection(ConstantHelper.sections.settings); // Act diff --git a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeTemplatesTab.spec.ts b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeTemplatesTab.spec.ts index 1390bbdc4f..6a5aa65ad5 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeTemplatesTab.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Settings/DocumentType/DocumentTypeTemplatesTab.spec.ts @@ -37,7 +37,8 @@ test('can add an allowed template to a document type', {tag: '@smoke'}, async ({ await umbracoApi.template.ensureNameNotExists(templateName); }); -test('can set an allowed template as default for document type', async ({umbracoApi, umbracoUi}) => { +// TODO: Need to uodate Act steps +test.skip('can set an allowed template as default for document type', async ({umbracoApi, umbracoUi}) => { // Arrange await umbracoApi.template.ensureNameNotExists(templateName); const templateId = await umbracoApi.template.createDefaultTemplate(templateName); 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 9b1ad8f8be..feb0f975ac 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 @@ -235,7 +235,7 @@ test.skip('can insert value into a partial view', async ({umbracoApi, umbracoUi} }); test('can delete a partial view', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { - //Arrange + // Arrange await umbracoApi.partialView.create(partialViewFileName, partialViewFileName, '/'); expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeTruthy(); @@ -249,7 +249,7 @@ test('can delete a partial view', {tag: '@smoke'}, async ({umbracoApi, umbracoUi expect(await umbracoApi.partialView.doesExist(partialViewFileName)).toBeFalsy(); // Verify the partial view is NOT displayed under the Partial Views section await umbracoUi.partialView.clickRootFolderCaretButton(); - await umbracoUi.partialView.isPartialViewRootTreeItemVisible(partialViewFileName, false); + await umbracoUi.partialView.isPartialViewRootTreeItemVisible(partialViewFileName, false, false); }); // TODO: Remove skip when the front-end is ready. Currently the returned items count is not updated after choosing the root content. 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 87c69bb6a9..a1b2494350 100644 --- a/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts +++ b/tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Users/User.spec.ts @@ -1,4 +1,4 @@ -import {ConstantHelper, test} from '@umbraco/playwright-testhelpers'; +import {test} from '@umbraco/playwright-testhelpers'; import {expect} from '@playwright/test'; const nameOfTheUser = 'TestUser'; @@ -16,10 +16,11 @@ test.afterEach(async ({umbracoApi}) => { test('can create a user', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickCreateButton(); + await umbracoUi.user.clickUserButton(); await umbracoUi.user.enterNameOfTheUser(nameOfTheUser); await umbracoUi.user.enterUserEmail(userEmail); await umbracoUi.user.clickChooseButton(); @@ -38,7 +39,7 @@ test('can rename a user', async ({umbracoApi, umbracoUi}) => { await umbracoApi.user.ensureNameNotExists(wrongName); const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(wrongName, wrongName + userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(wrongName); @@ -54,10 +55,11 @@ test('can delete a user', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { // Arrange const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); + await umbracoUi.user.clickActionButton(); await umbracoUi.user.clickDeleteButton(); await umbracoUi.user.clickConfirmToDeleteButton(); @@ -65,7 +67,7 @@ test('can delete a user', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { await umbracoUi.user.isSuccessNotificationVisible(); expect(await umbracoApi.user.doesNameExist(nameOfTheUser)).toBeFalsy(); // Checks if the user is deleted from the list - await umbracoUi.user.clickUsersTabButton(); + await umbracoUi.user.clickUsersMenu(); await umbracoUi.user.isUserVisible(nameOfTheUser, false); }); @@ -75,7 +77,7 @@ test('can add multiple user groups to a user', async ({umbracoApi, umbracoUi}) = const userGroupWriters = await umbracoApi.userGroup.getByName(defaultUserGroupName); const userGroupTranslators = await umbracoApi.userGroup.getByName(secondUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroupWriters.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -86,7 +88,7 @@ test('can add multiple user groups to a user', async ({umbracoApi, umbracoUi}) = // Assert await umbracoUi.user.isSuccessNotificationVisible(); - const userData = await umbracoApi.user.getByName(nameOfTheUser); + await umbracoApi.user.getByName(nameOfTheUser); expect(await umbracoApi.user.doesUserContainUserGroupIds(nameOfTheUser, [userGroupWriters.id, userGroupTranslators.id])).toBeTruthy(); }); @@ -94,7 +96,7 @@ test('can remove a user group from a user', {tag: '@smoke'}, async ({umbracoApi, // Arrange const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -113,11 +115,11 @@ test('can update culture for a user', async ({umbracoApi, umbracoUi}) => { const danishIsoCode = 'da-dk'; const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); - await umbracoUi.user.selectUserLanguage('Dansk'); + await umbracoUi.user.selectUserLanguage('Dansk (Danmark)'); await umbracoUi.user.clickSaveButton(); // Assert @@ -136,7 +138,7 @@ test('can add a content start node to a user', {tag: '@smoke'}, async ({umbracoA await umbracoApi.documentType.ensureNameNotExists(documentTypeName); const documentTypeId = await umbracoApi.documentType.createDefaultDocumentTypeWithAllowAsRoot(documentTypeName); const documentId = await umbracoApi.document.createDefaultDocument(documentName, documentTypeId); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -171,7 +173,7 @@ test('can add multiple content start nodes for a user', async ({umbracoApi, umbr userData.documentStartNodeIds.push({id: documentId}); await umbracoApi.user.update(userId, userData); const secondDocumentId = await umbracoApi.document.createDefaultDocument(secondDocumentName, documentTypeId); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -205,7 +207,7 @@ test('can remove a content start node from a user', {tag: '@smoke'}, async ({umb userData.documentStartNodeIds.push({id: documentId}); await umbracoApi.user.update(userId, userData); expect(await umbracoApi.user.doesUserContainContentStartNodeIds(nameOfTheUser, [documentId])).toBeTruthy(); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -229,7 +231,7 @@ test('can add media start nodes for a user', {tag: '@smoke'}, async ({umbracoApi await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); await umbracoApi.media.ensureNameNotExists(mediaName); const mediaId = await umbracoApi.media.createDefaultMediaFile(mediaName); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -261,7 +263,7 @@ test('can add multiple media start nodes for a user', async ({umbracoApi, umbrac userData.mediaStartNodeIds.push({id: firstMediaId}); await umbracoApi.user.update(userId, userData); expect(await umbracoApi.user.doesUserContainMediaStartNodeIds(nameOfTheUser, [firstMediaId])).toBeTruthy(); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -291,7 +293,7 @@ test('can remove a media start node from a user', async ({umbracoApi, umbracoUi} userData.mediaStartNodeIds.push({id: mediaId}); await umbracoApi.user.update(userId, userData); expect(await umbracoApi.user.doesUserContainMediaStartNodeIds(nameOfTheUser, [mediaId])).toBeTruthy(); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -311,7 +313,7 @@ test('can allow access to all documents for a user', async ({umbracoApi, umbraco // Arrange const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -328,7 +330,7 @@ test('can allow access to all media for a user', async ({umbracoApi, umbracoUi}) // Arrange const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -356,7 +358,7 @@ test('can see if the user has the correct access based on content start nodes', userData.documentStartNodeIds.push({id: documentId}); await umbracoApi.user.update(userId, userData); expect(await umbracoApi.user.doesUserContainContentStartNodeIds(nameOfTheUser, [documentId])).toBeTruthy(); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -381,7 +383,7 @@ test('can see if the user has the correct access based on media start nodes', as userData.mediaStartNodeIds.push({id: mediaId}); await umbracoApi.user.update(userId, userData); expect(await umbracoApi.user.doesUserContainMediaStartNodeIds(nameOfTheUser, [mediaId])).toBeTruthy(); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -398,10 +400,11 @@ test('can change password for a user', {tag: '@smoke'}, async ({umbracoApi, umbr const userPassword = 'TestPassword'; const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); const userId = await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); + await umbracoUi.user.clickActionButton(); await umbracoUi.user.clickChangePasswordButton(); await umbracoUi.user.updatePassword(userPassword); @@ -414,10 +417,11 @@ test('can disable a user', async ({umbracoApi, umbracoUi}) => { const disabledStatus = 'Disabled'; const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); + await umbracoUi.user.clickActionButton(); await umbracoUi.user.clickDisableButton(); await umbracoUi.user.clickConfirmDisableButton(); @@ -434,10 +438,11 @@ test('can enable a user', {tag: '@smoke'}, async ({umbracoApi, umbracoUi}) => { const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); const userId = await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); await umbracoApi.user.disable([userId]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); + await umbracoUi.user.clickActionButton(); await umbracoUi.user.clickEnableButton(); await umbracoUi.user.clickConfirmEnableButton(); @@ -454,7 +459,7 @@ test('can add an avatar to a user', {tag: '@smoke'}, async ({umbracoApi, umbraco const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); const filePath = './fixtures/mediaLibrary/Umbraco.png'; - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -471,7 +476,7 @@ test('can remove an avatar from a user', async ({umbracoApi, umbracoUi}) => { const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); const userId = await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); await umbracoApi.user.addDefaultAvatarImageToUser(userId); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(nameOfTheUser); @@ -487,7 +492,7 @@ test('can see if the inactive label is removed from the admin user', async ({umb // Arrange const userLabel = 'Active'; const currentUser = await umbracoApi.user.getCurrentUser(); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + await umbracoUi.user.goToUsers(); // Act await umbracoUi.user.clickUserWithName(currentUser.name); @@ -502,16 +507,18 @@ test('can search for a user', async ({umbracoApi, umbracoUi}) => { // Arrange const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + const totalUsers = await umbracoApi.user.getUsersCount(); + await umbracoUi.user.goToUsers(); // Act - await umbracoUi.user.doesUserSectionContainUserAmount(2); + await umbracoUi.user.doesUserSectionContainUserAmount(totalUsers); await umbracoUi.user.searchInUserSection(nameOfTheUser); // Assert // Wait for filtering to be done await umbracoUi.waitForTimeout(200); - await umbracoUi.user.doesUserSectionContainUserAmount(1); + const userData = await umbracoApi.user.filterByText(nameOfTheUser); + await umbracoUi.user.doesUserSectionContainUserAmount(userData.total); await umbracoUi.user.doesUserSectionContainUserWithText(nameOfTheUser); }); @@ -520,16 +527,18 @@ test('can filter by status', async ({umbracoApi, umbracoUi}) => { const inactiveStatus = 'Inactive'; const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + const totalUsers = await umbracoApi.user.getUsersCount(); + await umbracoUi.user.goToUsers(); // Act - await umbracoUi.user.doesUserSectionContainUserAmount(2); + await umbracoUi.user.doesUserSectionContainUserAmount(totalUsers); await umbracoUi.user.filterByStatusName(inactiveStatus); // Assert // Wait for filtering to be done await umbracoUi.waitForTimeout(200); - await umbracoUi.user.doesUserSectionContainUserAmount(1); + const userData = await umbracoApi.user.filterByUserStates(inactiveStatus); + await umbracoUi.user.doesUserSectionContainUserAmount(userData.total); await umbracoUi.user.doesUserSectionContainUserWithText(nameOfTheUser); await umbracoUi.user.doesUserSectionContainUserWithText(inactiveStatus); }); @@ -538,16 +547,18 @@ test('can filter by user groups', async ({umbracoApi, umbracoUi}) => { // Arrange const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + const totalUsers = await umbracoApi.user.getUsersCount(); + await umbracoUi.user.goToUsers(); // Act - await umbracoUi.user.doesUserSectionContainUserAmount(2); + await umbracoUi.user.doesUserSectionContainUserAmount(totalUsers); await umbracoUi.user.filterByGroupName(defaultUserGroupName); // Assert // Wait for filtering to be done await umbracoUi.waitForTimeout(200); - await umbracoUi.user.doesUserSectionContainUserAmount(1); + const userData = await umbracoApi.user.filterByUserGroupIds(userGroup.id); + await umbracoUi.user.doesUserSectionContainUserAmount(userData.total); await umbracoUi.user.doesUserSectionContainUserWithText(defaultUserGroupName); }); @@ -555,16 +566,17 @@ test('can order by newest user', async ({umbracoApi, umbracoUi}) => { // Arrange const userGroup = await umbracoApi.userGroup.getByName(defaultUserGroupName); await umbracoApi.user.createDefaultUser(nameOfTheUser, userEmail, [userGroup.id]); - await umbracoUi.user.goToSection(ConstantHelper.sections.users); + const totalUsers = await umbracoApi.user.getUsersCount(); + await umbracoUi.user.goToUsers(); // Act - await umbracoUi.user.doesUserSectionContainUserAmount(2); + await umbracoUi.user.doesUserSectionContainUserAmount(totalUsers); await umbracoUi.user.orderByNewestUser(); // Assert // Wait for filtering to be done await umbracoUi.waitForTimeout(200); - await umbracoUi.user.doesUserSectionContainUserAmount(2); + await umbracoUi.user.doesUserSectionContainUserAmount(totalUsers); await umbracoUi.user.isUserWithNameTheFirstUserInList(nameOfTheUser); });