LRQA-84392 Add condition for page revision

shuyangzhou · Nov 16, 2023 · 3c999db · 3c999db
1 parent 35bd94e
commit 3c999db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/modules/apps/portal-workflow/portal-workflow-test/src/testFunctional/macros/Workflow.macro b/modules/apps/portal-workflow/portal-workflow-test/src/testFunctional/macros/Workflow.macro
@@ -663,6 +663,9 @@ definition {
 		if (contains(${portletTitle}, "SINGLE APPROVER")) {
 			AssertElementNotPresent(locator1 = "WorkflowSubmissionsTask#PREVIEW_VIEW");
 		}
+		else if (isSet(pageRevision)) {
+			Close.closeAndSelectWindow(value1 = "title=Page Revision Page - Site Name - Liferay DXP");
+		}
 		else {
 			Close.closeAndSelectWindow(value1 = "title=${viewTitle}");
 

diff --git a/...ps/portal-workflow/portal-workflow-test/src/testFunctional/paths/MyWorkflowTasksTask.path b/...ps/portal-workflow/portal-workflow-test/src/testFunctional/paths/MyWorkflowTasksTask.path
@@ -48,7 +48,7 @@
 </tr>
 <tr>
 	<td>PREVIEW_CONTENT</td>
-	<td>//*[contains(@class, 'web-content') or contains(@class, 'dynamic') or contains(@class, 'blogs') or contains(@class, 'kaleo-process') or contains(@class, 'comments')]/../../../following-sibling::div | //*[contains(@class, 'documents-and-media')]/../following-sibling::span[contains(@class, 'taglib-text')]</td>
+	<td>//*[contains(@class, 'web-content') or contains(@class, 'dynamic') or contains(@class, 'blogs') or contains(@class, 'kaleo-process') or contains(@class, 'comments')]/../../../following-sibling::div | //*[contains(@class, 'documents-and-media')]/../following-sibling::span[contains(@class, 'taglib-text')] | //*[contains(@class, 'asset-summary')]</td>
 	<td></td>
 </tr>
 <tr>

diff --git a/...com/liferay/portalweb/tests/enduser/staging/usecase/StagingUsecaseWithVersioning.testcase b/...com/liferay/portalweb/tests/enduser/staging/usecase/StagingUsecaseWithVersioning.testcase
@@ -308,7 +308,6 @@ definition {
 	}
 
 	@description = "This is a use case for LPS-90924. Blocked by LPS-180479."
-	@ignore = "true"
 	@priority = 3
 	test PublishPageRevisionWithPortletSettingsChanges {
 		ProductMenu.gotoPortlet(
@@ -344,7 +343,7 @@ definition {
 			workflowAssetType = "Page Revision",
 			workflowTask = "Review");
 
-		Workflow.gotoPreviewView();
+		Workflow.gotoPreviewView(pageRevision = "true");
 
 		Page.viewWithWorkflowPG(workflowStatus = "Pending (Review)");
 
@@ -372,7 +371,7 @@ definition {
 			workflowAssetType = "Page Revision",
 			workflowTask = "Review");
 
-		Workflow.gotoPreviewView();
+		Workflow.gotoPreviewView(pageRevision = "true");
 
 		Page.viewWithWorkflowPG(workflowStatus = "Pending (Review)");
 
@@ -398,7 +397,7 @@ definition {
 
 		Workflow.gotoAssetViaTableTitle(workflowAssetTitle = "Page Revision Page");
 
-		Workflow.gotoPreviewView();
+		Workflow.gotoPreviewView(pageRevision = "true");
 
 		Page.viewWithWorkflowPG(workflowStatus = "Ready for Publication");