Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LPS-66668 #42221

Closed
wants to merge 7 commits into from
Closed

LPS-66668 #42221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
407f5e2
LPS-66668 Change redirect to my workflow tasks
Jul 21, 2016
12a95f2
LPS-66668 Add poshi test to assign then approve a workflow task as a …
Jul 23, 2016
a19bf0b
LPS-66668 Add test for Site Admin user
vicnate5 Aug 2, 2016
0f48b1a
LPS-66668 Use portlet:renderURL to generate render URL
brandizzi Aug 4, 2016
9d33475
LPS-66668 This page was not created in this test.
brandizzi Aug 9, 2016
8275959
LPS-66668 Correct value
vicnate5 Aug 10, 2016
7ebc0b8
LPS-66668 Remove unneeded asserts
vicnate5 Aug 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...w/portal-workflow-task-web/src/main/resources/META-INF/resources/workflow_task_action.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,13 @@ redirectURL.setParameter("mvcPath", "/view.jsp");
</c:if>

<c:if test="<%= workflowTaskDisplayContext.hasOtherAssignees(workflowTask) %>">
<liferay-portlet:renderURL portletName="<%= PortletKeys.MY_WORKFLOW_TASK %>" var="renderURL">
<portlet:param name="mvcPath" value="/view.jsp" />
</liferay-portlet:renderURL>

<liferay-portlet:actionURL name="assignWorkflowTask" portletName="<%= PortletKeys.MY_WORKFLOW_TASK %>" var="assignURL">
<portlet:param name="mvcPath" value="/edit_workflow_task.jsp" />
<portlet:param name="redirect" value="<%= currentURL %>" />
<portlet:param name="redirect" value="<%= renderURL %>" />
<portlet:param name="closeRedirect" value="<%= closeRedirect %>" />
<portlet:param name="workflowTaskId" value="<%= String.valueOf(workflowTask.getWorkflowTaskId()) %>" />
</liferay-portlet:actionURL>
Expand Down
4 changes: 4 additions & 0 deletions portal-web/test/functional/com/liferay/portalweb/macros/Notifications.macro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@
<execute function="AssertTextEquals" locator1="Notifications#NOTIFICATIONS_CONTENT" value1="${contentBody}" />
</command>

<command name="viewNoLongerAppliedNotification">
<execute function="AssertTextEquals" locator1="Notifications#NOTIFICATIONS_TITLE" value1="Notification no longer applies." />
</command>

<command name="viewNoNotifications">
<if>
<equals arg1="${activePanel}" arg2="Profile" />
Expand Down
20 changes: 20 additions & 0 deletions portal-web/test/functional/com/liferay/portalweb/macros/Workflow.macro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,26 @@
</execute>
</command>

<command name="assignByDetails">
<execute function="Click#waitForMenuToggleJSClick" locator1="Icon#BODY_VERTICAL_ELLIPSIS" />

<execute function="AssertClick" locator1="MyWorkflowTasksTask#MENU_ASSIGN" value1="Assign to..." />

<execute function="AssertTextEquals" locator1="MyWorkflowTasks#DIALOG_BOX_TITLE" value1="Assign to..." />
<execute function="Select" locator1="MyWorkflowTasks#DIALOG_BOX_ASSIGN_TO_SELECT" value1="${user}" />

<if>
<isset var="comment" />
<then>
<execute function="Type" locator1="MyWorkflowTasks#DIALOG_BOX_COMMENT_FIELD" value1="${comment}" />
</then>
</if>

<execute macro="Button#clickDone" />

<execute macro="Alert#viewSuccessMessage" />
</command>

<command name="assignToMeTaskByActions">
<execute macro="Workflow#viewTaskAssignedToMyRoles">
<var name="ddlDataDefinitionName" value="${ddlDataDefinitionName}" />
Expand Down
10 changes: 10 additions & 0 deletions portal-web/test/functional/com/liferay/portalweb/paths/plugin/workflow/MyWorkflowTasks.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@
<td></td>
</tr>
<!--DIALOG_BOX-->
<tr>
<td>DIALOG_BOX_TITLE</td>
<td>//div[contains(@class,'modal-header')]/h3</td>
<td></td>
</tr>
<tr>
<td>DIALOG_BOX_DUE_DATE</td>
<td>//input[contains(@id,'_dueDate')]</td>
Expand All @@ -220,6 +225,11 @@
<td>//textarea[contains(@id,'_comment')]</td>
<td></td>
</tr>
<tr>
<td>DIALOG_BOX_ASSIGN_TO_SELECT</td>
<td>//select[contains(@id,'MyWorkflowTaskPortlet_assigneeUserId')]</td>
<td></td>
</tr>
<tr>
<td></td>
<td></td>
Expand Down
5 changes: 5 additions & 0 deletions ...-web/test/functional/com/liferay/portalweb/paths/plugin/workflow/MyWorkflowTasksTask.path
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
<td>//a[contains(@id,'taskAssignToMeLink')]</td>
<td></td>
</tr>
<tr>
<td>MENU_ASSIGN</td>
<td>//a[contains(@id,'taskAssignLink')]</td>
<td></td>
</tr>
<tr>
<td>MENU_APPROVE</td>
<td>//a[contains(@id,'approvetaskChangeStatusLink')]</td>
Expand Down
261 changes: 261 additions & 0 deletions ...eray/portalweb/tests/enduser/workflow/workflowadmin/usecase/WorkflowadminUsecase.testcase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,267 @@
</execute>
</command>

<command name="ApproveWorkflowTaskAsSiteAdmin" priority="5">
<description message="This is a use case for LPS-66668." />
<property name="portal.acceptance" value="true" />

<execute macro="ProductMenu#gotoControlPanelSites">
<var name="portlet" value="Sites" />
</execute>

<execute macro="Site#addBlankCP">
<var name="siteName" value="Site Name" />
</execute>

<execute macro="ProductMenu#gotoControlPanelSites">
<var name="portlet" value="Sites" />
</execute>

<execute macro="Page#add">
<var name="pageName" value="Site Page Name" />
<var name="siteName" value="Site Name" />
</execute>

<execute macro="ProductMenu#gotoControlPanelUsers">
<var name="portlet" value="Users and Organizations" />
</execute>

<execute macro="User#addCP">
<var name="userEmailAddress" value="userea@liferay.com" />
<var name="userFirstName" value="userfn" />
<var name="userLastName" value="userln" />
<var name="userScreenName" value="usersn" />
</execute>

<execute macro="ProductMenu#gotoControlPanelUsers">
<var name="portlet" value="Users and Organizations" />
</execute>

<execute macro="User#editPasswordCP">
<var name="userEmailAddress" value="userea@liferay.com" />
<var name="userScreenName" value="usersn" />
</execute>

<execute macro="ProductMenu#gotoControlPanelUsers">
<var name="portlet" value="Users and Organizations" />
</execute>

<execute macro="User#editUserSiteCP">
<var name="siteName" value="Site Name" />
<var name="userScreenName" value="usersn" />
</execute>

<execute macro="ProductMenu#gotoControlPanelUsers">
<var name="portlet" value="Users and Organizations" />
</execute>

<execute macro="User#assignSiteRoleCP">
<var name="siteRoleName" value="Site Administrator" />
<var name="userScreenName" value="usersn" />
</execute>

<execute macro="ProductMenu#gotoSite">
<var name="site" value="Site Name" />
</execute>

<execute macro="ProductMenu#gotoSitesConfiguration">
<var name="portlet" value="Workflow Configuration" />
</execute>

<execute macro="Workflow#configureWorkflow">
<var name="workflowDefinition" value="Single Approver (Version 1)" />
<var name="workflowResourceValue" value="Blogs Entry" />
</execute>

<execute macro="ProductMenu#gotoSitesContent">
<var name="portlet" value="Blogs" />
</execute>

<execute macro="Blogs#addWithWorkflow">
<var name="entryContent" value="Blogs Entry Content" />
<var name="entrySubtitle" value="Subtitle" />
<var name="entryTitle" value="Blogs Entry Title" />
</execute>

<execute macro="User#logoutAndLoginPG">
<var name="userLoginEmailAddress" value="userea@liferay.com" />
<var name="userLoginFullName" value="userfn userln" />
</execute>

<execute macro="ProductMenu#gotoSite">
<var name="site" value="Site Name" />
</execute>

<execute macro="Notifications#viewBadgeCount">
<var name="notificationCount" value="1" />
</execute>

<execute macro="WorkflowAsset#gotoViaNotification">
<var name="assetType" value="Blogs Entry" />
<var name="user" value="Test Test" />
</execute>

<execute macro="Workflow#clickAssignToMeByDetails" />

<execute macro="Workflow#confirmAndViewSucessMessageViaDetails" />

<execute macro="Notifications#viewBadgeCount">
<var name="notificationCount" value="0" />
</execute>

<execute macro="Page#gotoMyAccount">
<var name="portletName" value="My Workflow Tasks" />
</execute>

<execute macro="Workflow#viewTaskAssignedToMeDetails">
<var name="workflowAssetContent" value="Blogs Entry Content" />
<var name="workflowAssetTitle" value="Blogs Entry Title" />
<var name="workflowAssignedTo" value="userfn userln" />
<var name="workflowTask" value="Review" />
</execute>

<execute macro="Workflow#clickApproveByDetails" />

<execute macro="Workflow#confirmAndViewSucessMessageViaDetails" />
</command>

<command name="AssignThenApproveWorkflowTaskAsPortalContentReviewer" priority="3">
<description message="This is a use case for LPS-66668." />

<execute macro="Navigator#openURL" />

<execute macro="ProductMenu#gotoControlPanelUsers">
<var name="portlet" value="Users and Organizations" />
</execute>

<execute macro="User#addCP">
<var name="userEmailAddress" value="userea@liferay.com" />
<var name="userFirstName" value="userfn" />
<var name="userLastName" value="userln" />
<var name="userScreenName" value="usersn" />
</execute>

<execute macro="ProductMenu#gotoControlPanelUsers">
<var name="portlet" value="Users and Organizations" />
</execute>

<execute macro="User#editPasswordCP">
<var name="userEmailAddress" value="userea@liferay.com" />
<var name="userScreenName" value="usersn" />
</execute>

<execute macro="ProductMenu#gotoControlPanelUsers">
<var name="portlet" value="Roles" />
</execute>

<execute macro="Role#assignRegRoleCP">
<var name="roleName" value="Portal Content Reviewer" />
<var name="userScreenName" value="usersn" />
</execute>

<execute macro="Navigator#openURL" />

<execute macro="ProductMenu#gotoSitesConfiguration">
<var name="portlet" value="Workflow Configuration" />
</execute>

<execute macro="Workflow#configureWorkflow">
<var name="workflowDefinition" value="Single Approver (Version 1)" />
<var name="workflowResourceValue" value="Blogs Entry" />
</execute>

<execute macro="ProductMenu#gotoSitesContent">
<var name="portlet" value="Blogs" />
</execute>

<execute macro="Blogs#addWithWorkflow">
<var name="entryContent" value="Blogs Entry Content" />
<var name="entrySubtitle" value="Subtitle" />
<var name="entryTitle" value="Blogs Entry Title" />
</execute>

<execute macro="Navigator#openURL" />

<execute macro="Notifications#viewBadgeCount">
<var name="notificationCount" value="1" />
</execute>

<execute macro="WorkflowAsset#gotoViaNotification">
<var name="assetType" value="Blogs Entry" />
<var name="user" value="Test Test" />
</execute>

<execute macro="User#logoutAndLoginPG">
<var name="userLoginEmailAddress" value="userea@liferay.com" />
<var name="userLoginFullName" value="userfn userln" />
</execute>

<execute macro="Notifications#viewBadgeCount">
<var name="notificationCount" value="1" />
</execute>

<execute macro="WorkflowAsset#gotoViaNotification">
<var name="assetType" value="Blogs Entry" />
<var name="user" value="Test Test" />
</execute>

<execute macro="Workflow#assignByDetails">
<var name="user" value="Test Test" />
</execute>

<execute macro="Workflow#viewDefaultMyWorkflowTasksCP" />

<execute macro="ProductMenu#gotoUserMyAccount">
<var name="portlet" value="Notifications" />
</execute>

<execute macro="Notifications#viewNoLongerAppliedNotification" />

<execute macro="User#logoutAndLoginPG" />

<execute macro="Notifications#viewBadgeCount">
<var name="notificationCount" value="1" />
</execute>

<execute macro="WorkflowAsset#gotoViaNotification">
<var name="assetType" value="Blogs Entry" />
<var name="user" value="userfn userln" />
</execute>

<execute macro="Workflow#assignByDetails">
<var name="user" value="userfn userln" />
</execute>

<execute macro="Workflow#viewDefaultMyWorkflowTasksCP" />

<execute macro="ProductMenu#gotoUserMyAccount">
<var name="portlet" value="Notifications" />
</execute>

<execute macro="WorkflowAsset#gotoViaNotification">
<var name="assetType" value="Blogs Entry" />
<var name="user" value="userfn userln" />
</execute>

<execute macro="User#logoutAndLoginPG">
<var name="userLoginEmailAddress" value="userea@liferay.com" />
<var name="userLoginFullName" value="userfn userln" />
</execute>

<execute macro="Notifications#viewBadgeCount">
<var name="notificationCount" value="1" />
</execute>

<execute macro="WorkflowAsset#gotoViaNotification">
<var name="assetType" value="Blogs Entry" />
<var name="user" value="Test Test" />
</execute>

<execute macro="Workflow#clickApproveByDetails" />

<execute macro="Workflow#confirmAndViewSucessMessageViaDetails" />
</command>

<command name="DeactivateAndActivateUploadedDefinition" priority="3">
<execute macro="ProductMenu#gotoControlPanelConfiguration">
<var name="portlet" value="Workflow Definition" />
Expand Down