fernando/luos
1
0
Fork 0
Code Releases Activity

Merged colosa/processmaker into master

Browse Source
This commit is contained in:
jonathan quispe
2014-06-05 12:05:28 -04:00
parent 05e52ba07f b4154bf562
commit e7cf32f010
8 changed files with 125 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
features/backend/admin_setup/roles/basic_tests_roles.feature
View File

@@ -47,52 +47,67 @@ Scenario Outline: Create new Role
#Assign users to role
#Scenario: List assigned Users to Role & List available Users to assign to Role
# Given I request "role/00000000000000000000000000000003/users"
# Then the response status code should be 200
# And the response charset is "UTF-8"
# And the content type is "application/json"
# And the type is "array"
# And the response has 61 records
#
#Scenario: Assign User to Role
# Given POST this data:
# """
# {
# "usr_uid": "310985970530cbfa4ec0593063369294"
# }
# """
# And I request "role/00000000000000000000000000000003/user"
# Then the response status code should be 201
# And the response charset is "UTF-8"
# And the content type is "application/json"
# And the type is "object"
#
#
#Scenario: Get list of Roles
# Given I request "roles"
# Then the response status code should be 200
# And the response charset is "UTF-8"
# And the content type is "application/json"
# And the type is "array"
# And the response has 62 records
#
#
#Scenario: Unassign User of the Role
# Given that I want to delete a resource with the key "310985970530cbfa4ec0593063369294"
# And I request "role/00000000000000000000000000000003/user/310985970530cbfa4ec0593063369294"
# And the content type is "application/json"
# Then the response status code should be 200
# And the response charset is "UTF-8"
#
#
#Scenario: Get list of Roles
# Given I request "roles"
# Then the response status code should be 200
# And the response charset is "UTF-8"
# And the content type is "application/json"
# And the type is "array"
# And the response has 61 records
Scenario: List assigned Users to Role & List available Users to assign to Role
Given I request "role/00000000000000000000000000000003/users"
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "array"
And the response has 61 records
Scenario: Assign User to Role
Given POST this data:
"""
{
"usr_uid": "310985970530cbfa4ec0593063369294"
}
"""
And I request "role/00000000000000000000000000000003/user"
Then the response status code should be 201
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "object"
Scenario: Get list of Roles
Given I request "roles"
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "array"
And the response has 4 records
Scenario: Unassign User of the Role
Given that I want to delete a "User from a role"
And I request "role/00000000000000000000000000000003/user/310985970530cbfa4ec0593063369294"
And the content type is "application/json"
Then the response status code should be 200
And the response charset is "UTF-8"
Scenario: Assign User "Wendy" to Role "PROCESSMAKER_ADMIN"
Given POST this data:
"""
{
"usr_uid": "310985970530cbfa4ec0593063369294"
}
"""
And I request "role/00000000000000000000000000000002/user"
Then the response status code should be 201
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "object"
Scenario: Get list of Roles
Given I request "roles"
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "array"
And the response has 4 records
#Culminacion de los endpoint de asignacion de usuarios
#Role and Permission
@@ -111,7 +126,7 @@ Scenario: List assigned Permissions to Role & List available Permissions to assi
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "array"
And the response has 14 recordsuser
And the response has 14 records
Scenario: Assign Permission "PM_DASHBOARD" to Role
Given POST this data:
@@ -126,7 +141,7 @@ Scenario: Assign Permission "PM_DASHBOARD" to Role
And the content type is "application/json"
And the type is "object"
Scenario: List assigned Permissions to Role & List available Permissions to assign to Role
Scenario: List assigned Permissions to Role
Given I request "role/00000000000000000000000000000003/permissions"
Then the response status code should be 200
And the response charset is "UTF-8"
@@ -134,21 +149,23 @@ Scenario: List assigned Permissions to Role & List available Permissions to assi
And the type is "array"
And the response has 4 records
Scenario: List assigned Permissions to Role & List available Permissions to assign to Role
Scenario: List available Permissions to assign to Role
Given I request "role/00000000000000000000000000000003/available-permissions"
Then the response status code should be 200
And the response charset is "UTF-8"
And the content type is "application/json"
And the type is "array"
And the response has 15 records
And the response has 13 records
Scenario: Unassign Permission of the Role
Given that I want to delete a resource with the key ""
Given that I want to delete a "Permmission from a role"
And I request "role/00000000000000000000000000000003/permission/00000000000000000000000000000011"
And the content type is "application/json"
Then the response status code should be 200
And the response charset is "UTF-8"
Scenario: List assigned Permissions to Role & List available Permissions to assign to Role
Given I request "role/00000000000000000000000000000003/permissions"
Then the response status code should be 200

8
features/backend/admin_setup/roles/main_tests_roles.feature
View File

@@ -408,13 +408,13 @@ Scenario Outline: Assign Permission "PM_DASHBOARD" to Role
| Assign Permissions "PM_CASES" to rol 1 | 1 | 00000000000000000000000000000005 |
| Assign Permissions "PM_LOGIN" to rol 2 | 2 | 00000000000000000000000000000001 |
| Assign Permissions "PM_ALLCASES" to rol 2 | 2 | 00000000000000000000000000000006 |
| Assign Permissions "PM_REPORTS" to rol 2 | 2 | 00000000000000000000000000000008 |
| Assign Permissions "PM_FOLDERS_VIEW" to rol 2 | 2 | 00000000000000000000000000000015 |
| Assign Permissions "PM_REASSIGNCASE" to rol 2 | 2 | 00000000000000000000000000000007 |
| Assign Permissions "PM_SUPERVISOR" to rol 2 | 2 | 00000000000000000000000000000009 |
| Assign Permissions "PM_SETUP_ADVANCE" to rol 3 | 3 | 00000000000000000000000000000010 |
| Assign Permissions "PM_DASHBOARD" to rol 4 | 4 | 00000000000000000000000000000011 |
| Assign Permissions "PM_WEBDAV" to rol 5 | 5 | 00000000000000000000000000000012 |
| Assign Permissions "PM_DELETECASE" to rol 6 | 6 | 00000000000000000000000000000013 |
| Assign Permissions "PM_LOGIN" to rol 6 | 6 | 00000000000000000000000000000001 |
| Assign Permissions "PM_EDITPERSONALINFO" to rol 7 | 7 | 00000000000000000000000000000014 |
| Assign Permissions "PM_FOLDERS_VIEW" to rol 8 | 8 | 00000000000000000000000000000015 |
| Assign Permissions "PM_FOLDERS_ADD_FOLDER" to rol 8 | 8 | 00000000000000000000000000000016 |
@@ -482,13 +482,13 @@ Scenario Outline: Unassign Permission of the Role
| Unassign Permissions "PM_CASES" to rol 1 | 1 | 00000000000000000000000000000005 |
| Unassign Permissions "PM_LOGIN" to rol 2 | 2 | 00000000000000000000000000000001 |
| Unassign Permissions "PM_ALLCASES" to rol 2 | 2 | 00000000000000000000000000000006 |
| Unassign Permissions "PM_REPORTS" to rol 2 | 2 | 00000000000000000000000000000008 |
| Unassign Permissions "PM_FOLDERS_VIEW" to rol 2 | 2 | 00000000000000000000000000000015 |
| Unassign Permissions "PM_REASSIGNCASE" to rol 2 | 2 | 00000000000000000000000000000007 |
| Unassign Permissions "PM_SUPERVISOR" to rol 2 | 2 | 00000000000000000000000000000009 |
| Unassign Permissions "PM_SETUP_ADVANCE" to rol 3 | 3 | 00000000000000000000000000000010 |
| Unassign Permissions "PM_DASHBOARD" to rol 4 | 4 | 00000000000000000000000000000011 |
| Unassign Permissions "PM_WEBDAV" to rol 5 | 5 | 00000000000000000000000000000012 |
| Unassign Permissions "PM_DELETECASE" to rol 6 | 6 | 00000000000000000000000000000013 |
| Unassign Permissions "PM_LOGIN" to rol 6 | 6 | 00000000000000000000000000000001 |
| Unassign Permissions "PM_EDITPERSONALINFO" to rol 7 | 7 | 00000000000000000000000000000014 |
| Unassign Permissions "PM_FOLDERS_VIEW" to rol 8 | 8 | 00000000000000000000000000000015 |
| Unassign Permissions "PM_FOLDERS_ADD_FOLDER" to rol 8 | 8 | 00000000000000000000000000000016 |

45
features/backend/admin_setup/roles/negative_tests_roles.feature
View File

@@ -21,30 +21,30 @@ Scenario Outline: Create new Role (NEGATIVE TESTS)
Examples:
| test_description | rol_code | rol_name | rol_status | error_code | error_message |
| Create Role with same name | PROCESSMAKER_OPERATOR | Operator | ACTIVE | 400 | already_exists |
| Create Role without fill required fields "rol_code" | | sample | | 400 | required_fields |
| Create Role without fill required fields "rol_name" | PROCESSMAKER_ADMINISTRATOR1 | | ACTIVE | 400 | required_fields |
| Create Role without fill required fields "rol_status" | PROCESSMAKER_MANAGER1 | Rol con code manager | | 400 | required_fields |
| Create Role with same name | PROCESSMAKER_OPERATOR | Operator | ACTIVE | 400 | already exists |
| Create Role without fill required fields "rol_code" | | sample | | 400 | rol_code |
| Create Role without fill required fields "rol_name" | PROCESSMAKER_ADMINISTRATOR1 | | ACTIVE | 400 | rol_name |
| Create Role without fill required fields "rol_status" | PROCESSMAKER_MANAGER1 | Rol con code manager | | 400 | rol_status |
| Create Role with wrong field rol_status | PROCESSMAKER_ADMINISTRATOR2 | Rol con code administrator/inactive | SAMPLE | 400 | rol_status |
#Scenario Outline: Assign User to Role (NEGATIVE TESTS)
# Given POST this data:
# """
# {
# "usr_uid": "<usr_uid>"
# }
# """
# And I request "role/rol_uid/user"
# Then the response status code should be <error_code>
# And the response status message should have the following text "<error_message>"
#
# Examples:
#
# | Description | rol_uid | usr_uid | error_code | error_message |
# | Without rol_uid | 00000000000000000000000000000004 | 51049032352d56710347233042615067 | 400 | rol_uid |
# | Without usr_uid | 00000000000000000000000000000004 | | 400 | usr_uid |
# | Assign same user to rol | 00000000000000000000000000000002 | 00000000000000000000000000000001 | 400 | usr_uid |
Scenario Outline: Assign User to Role (NEGATIVE TESTS)
Given POST this data:
"""
{
"usr_uid": "<usr_uid>"
}
"""
And I request "role/<rol_uid>/user"
Then the response status code should be <error_code>
And the response status message should have the following text "<error_message>"
Examples:
| Description | rol_uid | usr_uid | error_code | error_message |
| Without rol_uid | | 51049032352d56710347233042615067 | 400 | rol_uid |
| Without usr_uid | 00000000000000000000000000000004 | | 400 | usr_uid |
| Assign same user to rol | 00000000000000000000000000000002 | 00000000000000000000000000000001 | 400 | usr_uid |
Scenario Outline: Assign Permission "PM_DASHBOARD" to Role (NEGATIVE TESTS)
@@ -54,10 +54,11 @@ Scenario Outline: Assign Permission "PM_DASHBOARD" to Role (NEGATIVE TESTS)
"per_uid": "<per_uid>"
}
"""
And I request "role/rol_uid/permission"
And I request "role/<rol_uid>/permission"
Then the response status code should be <error_code>
And the response status message should have the following text "<error_message>"
Examples:
| Description | rol_uid | per_uid | error_code | error_message |

21
features/backend/projects/case_tracker/negative_tests_case_tracker.feature
View File

@@ -21,11 +21,11 @@ Feature: Case Tracker Negative Tests
Examples:
| test_description | project | map_type | routing_history | message_history | error_code | error_message |
| Invalid map type | 50259961452d82bf57f4f62051572528 | STAGGEES | 1 | 1 | 400 | map_type |
| Invalid Routing History | 50259961452d82bf57f4f62051572528 | STAGES | 20 | 0 | 400 | routing_history |
| Invalid Message History | 50259961452d82bf57f4f62051572528 | STAGES | 1 | 20 | 400 | message_history |
| Field requered project | | STAGES | 0 | 1 | 400 | prj_uid |
| test_description | project | map_type | routing_history | message_history | error_code | error_message |
| Invalid map type | 50259961452d82bf57f4f62051572528 | STAGGEES | 1 | 1 | 400 | map_type |
| Invalid Routing History | 50259961452d82bf57f4f62051572528 | STAGES | 20 | 0 | 400 | routing_history |
| Invalid Message History | 50259961452d82bf57f4f62051572528 | STAGES | 1 | 20 | 400 | message_history |
| Field requered project | | STAGES | 0 | 1 | 400 | prj_uid |
Scenario Outline: Assigning objects to process case tracker with bad parameters (negative tests)
@@ -45,9 +45,8 @@ Feature: Case Tracker Negative Tests
Examples:
| test_description | project | cto_type_obj | cto_uid_obj | cto_condition | cto_position | error_code | error_message |
| Invalid cto_type_obj | 50259961452d82bf57f4f62051572528 | DYNAFORM | 00001752652d82c592fc100000000051 | | 1 | 400 | DYNAFORM |
| Invalid cto_uid_obj | 50259961452d82bf57f4f62051572528 | INPUT_DOCUMENT | 8700000000000006d8c67d1001895377 | | 2 | 400 | INPUT_DOCUMENT |
| Invalid cto_position | 50259961452d82bf57f4f62051572528 | OUTPUT_DOCUMENT | 76247354052d82ca9d04509043789234 | | 3,9999.87 | 400 | cto_position |
| Field requered project | | DYNAFORM | 14761752652d82c592fc180020076851 | | 1 | 400 | prj_uid |
| test_description | project | cto_type_obj | cto_uid_obj | cto_condition | cto_position | error_code | error_message |
| Invalid cto_type_obj | 50259961452d82bf57f4f62051572528 | SAMPLE | 76247354052d82ca9d04509043789234 | | 1 | 400 | cto_type_obj |
| Invalid cto_uid_obj | 50259961452d82bf57f4f62051572528 | INPUT_DOCUMENT | 8700000000000006d8c67d1001895377 | | 2 | 400 | cto_uid_obj |
| Invalid cto_position | 50259961452d82bf57f4f62051572528 | OUTPUT_DOCUMENT | 76247354052d82ca9d04509043789234 | | 3,9999.87 | 400 | cto_position |
| Field requered project | | DYNAFORM | 14761752652d82c592fc180020076851 | | 1 | 400 | prj_uid |

2
features/backend/projects/project_export_import/main_tests_project_export_import.feature
View File

@@ -26,7 +26,7 @@ Scenario: Get a List DynaForms of a Project Process Complete BPMN
And the type is "array"
And the response has 1 records
Scenario: Get the Output Documents List when there are exactly two output documents
Scenario: Get the Output Documents List when there are exactly two output documents " BUG-14907, No se visualiza los cambios en el editor tiny de OutputDocuments"
Given I request "project/1455892245368ebeb11c1a5001393784/output-documents"
Then the response status code should be 200
And the response charset is "UTF-8"

6
workflow/engine/src/ProcessMaker/BusinessModel/CaseScheduler.php
View File

@@ -151,6 +151,7 @@ class CaseScheduler
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\CaseSchedulerPeer::TAS_UID);
$criteria->add(\CaseSchedulerPeer::SCH_NAME, $name, \Criteria::EQUAL);
$criteria->add(\CaseSchedulerPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$rsCriteria = \CaseSchedulerPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$rsCriteria->next();
@@ -168,13 +169,14 @@ class CaseScheduler
*
* return bool Return true if the name exists, false otherwise
*/
public function existsNameUpdate($schUid, $name)
public function existsNameUpdate($processUid, $schUid, $name)
{
try {
$criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\CaseSchedulerPeer::TAS_UID);
$criteria->add(\CaseSchedulerPeer::SCH_NAME, $name, \Criteria::EQUAL);
$criteria->add(\CaseSchedulerPeer::SCH_UID, $schUid, \Criteria::NOT_EQUAL);
$criteria->add(\CaseSchedulerPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$rsCriteria = \CaseSchedulerPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$rsCriteria->next();
@@ -545,7 +547,7 @@ class CaseScheduler
if ($caseSchedulerData['SCH_NAME']=='') {
throw new \Exception(\G::LoadTranslation("ID_CAN_NOT_BE_EMPTY", array ('sch_name')));
}
if ($this->existsNameUpdate($sSchUID, $caseSchedulerData['SCH_NAME'])) {
if ($this->existsNameUpdate($sProcessUID, $sSchUID, $caseSchedulerData['SCH_NAME'])) {
throw new \Exception(\G::LoadTranslation("ID_CASE_SCHEDULER_DUPLICATE"));
}
$mUser = $this->getUser($caseSchedulerData['SCH_DEL_USER_NAME'], $caseSchedulerData['TAS_UID']);

4
workflow/engine/src/ProcessMaker/Services/Api/Project/ProcessPermissions.php
View File

@@ -68,7 +68,7 @@ class ProcessPermissions extends Api
* @param string $op_case_status {@from body} {@choice ALL,DRAFT,TO_DO,PAUSED,COMPLETED}
* @param string $op_participate {@from body} {@choice 0,1}
* @param string $op_obj_type {@from body} {@choice ANY,DYNAFORM,INPUT,OUTPUT,CASES_NOTES,MSGS_HISTORY}
* @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE}
* @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE,RESEND}
* @param string $tas_uid {@from body}
* @param string $op_task_source {@from body}
* @param string $dynaforms {@from body}
@@ -127,7 +127,7 @@ class ProcessPermissions extends Api
* @param string $op_case_status {@from body} {@choice ALL,DRAFT,TO_DO,PAUSED,COMPLETED}
* @param string $op_participate {@from body} {@choice 0,1}
* @param string $op_obj_type {@from body} {@choice ANY,DYNAFORM,INPUT,OUTPUT,CASES_NOTES,MSGS_HISTORY}
* @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE}
* @param string $op_action {@from body} {@choice VIEW,BLOCK,DELETE,RESEND}
* @param string $tas_uid {@from body}
* @param string $op_task_source {@from body}
* @param string $dynaforms {@from body}

13
workflow/engine/templates/processes/main.js
View File

@@ -589,6 +589,19 @@ function doSearch(){
editProcess = function(typeParam)
{
var rowSelected = processesGrid.getSelectionModel().getSelected();
if (!rowSelected) {
Ext.Msg.show({
title: '',
msg: _('ID_NO_SELECTION_WARNING'),
buttons: Ext.Msg.INFO,
fn: function () {
},
animEl: 'elId',
icon: Ext.MessageBox.INFO,
buttons: Ext.MessageBox.OK
});
return;
}
var url, pro_uid = rowSelected.data.PRO_UID;
var type = rowSelected.data.PROJECT_TYPE;