diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsConflict.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsConflict.testcase index f0d6ee042ea612..d5b82d0d78597e 100644 --- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsConflict.testcase +++ b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsConflict.testcase @@ -28,70 +28,6 @@ definition { } } - @description = "Assert the conflict changes display when modifying and deleting the same document in two Publications" - @priority = 4 - test AssertModificationDeletionConflictDisplays { - property portal.acceptance = "true"; - - HeadlessSite.addSite(siteName = "Site Name"); - - JSONDocument.addFileWithUploadedFile( - dmDocumentTitle = "DM Document Title", - groupName = "Site Name", - mimeType = "text/plain", - sourceFileName = "Document_1.txt"); - - JSONPublications.addPublication(publicationName = "Publication Name 1"); - - JSONPublications.selectPublication(publicationName = "Publication Name 1"); - - DMNavigator.openDocumentsAndMediaAdmin(siteURLKey = "Site Name"); - - DMDocument.editCP( - dmDocumentTitle = "DM Document Title", - dmDocumentTitleEdit = "DM Document Title Edit"); - - JSONPublications.addPublication(publicationName = "Publication Name 2"); - - JSONPublications.selectPublication(publicationName = "Publication Name 2"); - - JSONDocument.deleteFile( - dmDocumentTitle = "DM Document Title", - groupName = "Site Name"); - - JSONPublications.selectPublication(publicationName = "Publication Name 1"); - - Publications.publishPublication( - gotoPublicationsAdmin = "true", - publicationName = "Publication Name 1"); - - DMNavigator.openDocumentsAndMediaAdmin(siteURLKey = "Site Name"); - - DMNavigator.gotoDocumentCP(dmDocumentTitle = "DM Document Title Edit"); - - DMDocument.viewCP(dmDocumentTitle = "DM Document Title Edit"); - - JSONPublications.selectPublication(publicationName = "Publication Name 2"); - - DMNavigator.openDocumentsAndMediaAdmin(siteURLKey = "Site Name"); - - DMDocument.viewDefault(); - - PublicationsNavigator.gotoPublish(publicationName = "Publication Name 2"); - - Publications.viewNeedsManualResolution( - entryTitle = "Asset", - warningMessage = "Entity Updated Before Deletion"); - - Publications.viewNeedsManualResolution( - entryTitle = "Document Version", - warningMessage = "Entity Updated Before Deletion"); - - Publications.viewNeedsManualResolution( - entryTitle = "Document", - warningMessage = "Entity Updated Before Deletion"); - } - @description = "This is a use case for LPS-172496. Deleting a portlet with a modified configuration from a Publication incorrectly leads to a Deletion Modification Conflict" @priority = 3 test CanDeletePortletModifiedConfigurationWithoutDeletionModificationConflict { @@ -192,63 +128,6 @@ definition { } } - @description = "This is a use case for LPS-175305. As a publication admin, I would like to know log the conflicts that happened." - @priority = 4 - test CanSeeConflictsInTheLog { - property test.liferay.virtual.instance = "false"; - property test.run.type = "single"; - - task ("Add Log level and Web Content") { - ServerAdministration.openServerAdmin(); - - ServerAdministration.addCategoryLogLevels( - categoryLevel = "INFO", - categoryName = "com.liferay.change.tracking.web.internal.display.context"); - - JSONWebcontent.addWebContent( - content = "Web Content content", - groupName = "Guest", - title = "Web Content Title"); - } - - task ("Create Publication 1, delete WC, create Publication 2 and Modify WC") { - JSONPublications.addPublication(publicationName = "Publication 1"); - - JSONPublications.selectPublication(publicationName = "Publication 1"); - - JSONWebcontent.deleteWebContent( - groupName = "Guest", - title = "Web Content Title"); - - JSONPublications.addPublication(publicationName = "Publication 2"); - - JSONPublications.selectPublication(publicationName = "Publication 2"); - - WebContentNavigator.openWebContentAdmin(siteURLKey = "guest"); - - WebContentNavigator.gotoEditCP(webContentTitle = "Web Content Title"); - - WebContent.editCP( - webContentContentEdit = "Web Content Content Edit", - webContentTitle = "Web Content Title", - webContentTitleEdit = "Web Content Title Edit"); - } - - task ("Attempt to publish Publication 1") { - JSONPublications.selectPublication(publicationName = "Publication 1"); - - Refresh(); - - PublicationsNavigator.gotoPublish(publicationName = "Publication 1"); - - Click(locator1 = "Publications#PUBLISH_BUTTON"); - - Alert.viewWarningSpecificNotPresent(warningMessage = "Your request completed successfully."); - - AssertConsoleTextPresent(value1 = "Unresolved conflict with change tracking entry ID"); - } - } - @priority = 5 test ConflictingPublicationsAutomaticallyResolved { JSONWebcontent.addWebContent( diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsForms.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsForms.testcase index 02a031aa8e48ba..4fe906558fa7c4 100644 --- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsForms.testcase +++ b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsForms.testcase @@ -203,100 +203,6 @@ definition { publicationName = "Publication Name"); } - @description = "Assert the conflict needs manually resolved on Forms within Publications." - @priority = 4 - test ResolveConflictingPublicationsByDiscarding { - HeadlessSite.addSite(siteName = "Site Name"); - - FormsAdmin.addForm(groupName = "Site Name"); - - Form.editName(); - - Form.editPageTitle( - formPageName = "Created Form Page Name", - formTitleNumber = 1); - - Form.addTextField(); - - Form.editFieldLabelMetal(fieldValue = "Label"); - - Form.closeSidebar(); - - Form.save(); - - JSONPublications.addPublication(publicationName = "Publication Name 1"); - - JSONPublications.selectPublication(publicationName = "Publication Name 1"); - - PagesAdmin.openPagesAdmin(siteURLKey = "Site Name"); - - ProductMenu.gotoPortlet( - category = "Content & Data", - portlet = "Forms"); - - FormsAdminNavigator.gotoEditFormByName(); - - Form.editName(formName = "Created Form Name Edited"); - - Form.gotoAddField( - fieldPositionNumber = 1, - fieldType = "Single Selection"); - - Form.closeSidebar(); - - Form.save(); - - PublicationsNavigator.gotoReviewChanges(publicationName = "Publication Name 1"); - - PublicationsChanges.viewChanges( - changeCategory = "Dynamic Data Mapping Structure", - changeSite = "Site Name", - changeTitle = "Created Form Name Edited", - changeType = "Modified", - changeUser = "Test Test"); - - JSONPublications.addPublication(publicationName = "Publication Name 2"); - - JSONPublications.selectPublication(publicationName = "Publication Name 2"); - - PagesAdmin.openPagesAdmin(siteURLKey = "Site Name"); - - ProductMenu.gotoPortlet( - category = "Content & Data", - portlet = "Forms"); - - FormsAdmin.deleteForm(formName = "Created Form Name"); - - JSONDocument.addFile( - dmDocumentDescription = "DM Document Description", - dmDocumentTitle = "DM Document Title", - groupName = "Site Name"); - - PublicationsNavigator.gotoReviewChanges(publicationName = "Publication Name 2"); - - PublicationsChanges.viewChanges( - changeCategory = "Dynamic Data Mapping Structure", - changeSite = "Site Name", - changeTitle = "Created Form Name", - changeType = "Deleted", - changeUser = "Test Test"); - - PublicationsNavigator.gotoPublish( - gotoPublicationsAdmin = "true", - publicationName = "Publication Name 2"); - - PublicationsChanges.discardChanges( - changeCategory = "Dynamic Data Mapping Structure", - changeTitle = "Dynamic Data Mapping Structure", - conflictingChanges = "true"); - - Publications.publishPublication(publicationName = "Publication Name 2"); - - Publications.publishPublication( - gotoPublicationsAdmin = "true", - publicationName = "Publication Name 1"); - } - @description = "Assert the form with mutiple pages can be submited successfully within publications and the entry can be published to production." @priority = 4 test SubmitFormWithMultiplePagesWithinPublications { diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsSegmentation.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsSegmentation.testcase index dccefe16e761d8..a689d004424b12 100644 --- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsSegmentation.testcase +++ b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsSegmentation.testcase @@ -152,72 +152,6 @@ definition { value1 = "This experience is for Administrators only."); } - @description = "Assert we can resolve conflicting Segment changes by discarding." - @priority = 4 - test CanResolveConflictingPublicationsByDiscarding { - HeadlessSite.addSite(siteName = "Site Name"); - - Segmentation.openSegmentsAdmin(siteURLKey = "site-name"); - - LexiconEntry.gotoAdd(); - - Segmentation.addProperties(propertyOption = "Regular Role"); - - Segmentation.fillTitle(titleField = "Segment Title"); - - Segmentation.changeCriterionInput(criterionInputOption = "Equals"); - - Segmentation.fillProperty(selectCheckbox = "Administrator"); - - Button.clickSave(); - - JSONPublications.addPublication(publicationName = "Publication Name 1"); - - JSONPublications.selectPublication(publicationName = "Publication Name 1"); - - Segmentation.editSegment(entry = "Segment Title"); - - Segmentation.fillTitle(titleField = "Edited Segment Title"); - - Button.clickSave(); - - JSONPublications.addPublication(publicationName = "Publication Name 2"); - - JSONPublications.selectPublication(publicationName = "Publication Name 2"); - - Segmentation.deleteSegment(entry = "Segment Title"); - - PublicationsNavigator.gotoReviewChanges(); - - PublicationsChanges.viewChanges( - changeCategory = "Segments Entry", - changeSite = "Site Name", - changeTitle = "Segment Title", - changeType = "Deleted", - changeUser = "Test Test"); - - PublicationsNavigator.gotoPublish( - gotoPublicationsAdmin = "true", - publicationName = "Publication Name 2"); - - Publications.viewNeedsManualResolution( - entryTitle = "Segments Entry", - warningMessage = "Entity Updated Before Deletion"); - - PublicationsChanges.discardChanges( - changeCategory = "Segments Entry", - changeTitle = "Segments Entry", - conflictingChanges = "true"); - - Publications.publishPublication(publicationName = "Publication Name 2"); - - Publications.selectPublication(publicationName = "Publication Name 1"); - - Publications.publishPublication( - gotoPublicationsAdmin = "true", - publicationName = "Publication Name 1"); - } - @description = "Segment should support locales in review changes." @priority = 3 test CanReviewChangeForSegmentWithLocalization { diff --git a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsTeams.testcase b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsTeams.testcase index a12fca145807f3..d05de9e743da95 100644 --- a/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsTeams.testcase +++ b/portal-web/test/functional/com/liferay/portalweb/tests/enduser/publications/PublicationsTeams.testcase @@ -133,83 +133,4 @@ definition { userGroupName = "User Group Name"); } - @description = "Able to resolve team conflicting change by discarding" - @priority = 4 - test CanResolveTeamConflictingChangeByDiscarding { - HeadlessSite.addSite(siteName = "Site Name"); - - Site.openSiteTeamsAdmin(siteURLKey = "site-name"); - - Team.addCP( - teamDescription = "Team Description", - teamName = "Team Name"); - - JSONPublications.addPublication(publicationName = "Publication 1 Name"); - - JSONPublications.selectPublication(publicationName = "Publication 1 Name"); - - Site.openSiteTeamsAdmin(siteURLKey = "site-name"); - - Team.editCP( - teamDescriptionEdit = "Team Description Edit", - teamName = "Team Name", - teamNameEdit = "Team Name Edit"); - - PublicationsNavigator.gotoReviewChanges(); - - PublicationsChanges.viewChanges( - changeCategory = "Team", - changeSite = "Site Name", - changeTitle = "Team Name Edit", - changeType = "Modified", - changeUser = "Test Test"); - - JSONPublications.addPublication(publicationName = "Publication 2 Name"); - - JSONPublications.selectPublication(publicationName = "Publication 2 Name"); - - Site.openSiteTeamsAdmin(siteURLKey = "site-name"); - - Team.deleteCP( - teamDescription = "Team Description", - teamName = "Team Name"); - - task ("Add new Document") { - JSONDocument.addFile( - dmDocumentDescription = "DM Document Description", - dmDocumentTitle = "DM Document Title", - groupName = "Site Name"); - } - - PublicationsNavigator.gotoReviewChanges(); - - PublicationsChanges.viewChanges( - changeCategory = "Team", - changeSite = "Site Name", - changeTitle = "Team Name", - changeType = "Deleted", - changeUser = "Test Test"); - - PublicationsNavigator.gotoPublish( - gotoPublicationsAdmin = "true", - publicationName = "Publication 2 Name"); - - Publications.viewNeedsManualResolution( - entryTitle = "Team", - warningMessage = "Entity Updated Before Deletion"); - - PublicationsChanges.discardChanges( - changeCategory = "Team", - changeTitle = "Team", - conflictingChanges = "true"); - - Publications.publishPublication(publicationName = "Publication 2 Name"); - - JSONPublications.selectPublication(publicationName = "Publication 1 Name"); - - Publications.publishPublication( - gotoPublicationsAdmin = "true", - publicationName = "Publication 1 Name"); - } - } \ No newline at end of file