LRQA-48215 Use exist macro to assert success message

liferay · Apr 18, 2019 · 5e1d29d · 5e1d29d
1 parent 5f051f3
commit 5e1d29d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/portal-web/test/functional/com/liferay/portalweb/macros/Workflow.macro b/portal-web/test/functional/com/liferay/portalweb/macros/Workflow.macro
@@ -135,7 +135,7 @@ definition {
 
 		LexiconEntry.gotoEllipsisMenuItem(menuItem = "Approve");
 
-		Workflow.confirmWorkflowAction();
+		Alert.viewSuccessMessage();
 
 		Workflow.viewCompletedTask(
 			ddlDataDefinitionName = "${ddlDataDefinitionName}",
@@ -479,9 +479,7 @@ definition {
 			);
 		}
 
-		Workflow.confirmWorkflowAction();
-
-		SelectFrame(value1 = "relative=top");
+		Alert.viewSuccessMessage();
 
 		Workflow.viewCompletedTask(
 			ddlDataDefinitionName = "${ddlDataDefinitionName}",
@@ -508,9 +506,7 @@ definition {
 
 		LexiconEntry.gotoEllipsisMenuItem(menuItem = "Reject");
 
-		Workflow.confirmWorkflowAction();
-
-		SelectFrame(value1 = "relative=top");
+		Alert.viewSuccessMessage();
 
 		Workflow.viewCompletedTask(
 			ddlDataDefinitionName = "${ddlDataDefinitionName}",
@@ -535,7 +531,7 @@ definition {
 
 		MenuItem.click(menuItem = "Resubmit");
 
-		Workflow.confirmWorkflowAction();
+		Alert.viewSuccessMessage();
 
 		Workflow.viewCompletedTask(
 			ddlDataDefinitionName = "${ddlDataDefinitionName}",
@@ -562,7 +558,7 @@ definition {
 
 		LexiconEntry.gotoEllipsisMenuItem(menuItem = "Resubmit");
 
-		Workflow.confirmWorkflowAction();
+		Alert.viewSuccessMessage();
 
 		Workflow.viewCompletedTask(
 			ddlDataDefinitionName = "${ddlDataDefinitionName}",
@@ -704,7 +700,7 @@ definition {
 			);
 		}
 
-		Workflow.confirmWorkflowAction();
+		Alert.viewSuccessMessage();
 
 		Workflow.viewTaskAssignedToMe(
 			ddlDataDefinitionName = "${ddlDataDefinitionName}",
@@ -759,7 +755,7 @@ definition {
 			);
 		}
 
-		Workflow.confirmWorkflowAction();
+		Alert.viewSuccessMessage();
 
 		Workflow.viewTaskAssignedToMyRoles(
 			ddlDataDefinitionName = "${ddlDataDefinitionName}",

diff --git a/...web/test/functional/com/liferay/portalweb/tests/enduser/workflow/WorkflowUsecase.testcase b/...web/test/functional/com/liferay/portalweb/tests/enduser/workflow/WorkflowUsecase.testcase
@@ -1017,7 +1017,7 @@ definition {
 
 		LexiconEntry.gotoEllipsisMenuItem(menuItem = "Approve");
 
-		Workflow.confirmWorkflowAction();
+		Alert.viewSuccessMessage();
 
 		Navigator.gotoPage(pageName = "Blogs Page");