diff --git a/features/backend/admin_setup/category/basic_sequence_category.feature b/features/backend/admin_setup/category/basic_sequence_category.feature index 9322f1830..0da51b936 100644 --- a/features/backend/admin_setup/category/basic_sequence_category.feature +++ b/features/backend/admin_setup/category/basic_sequence_category.feature @@ -9,7 +9,7 @@ Background: Scenario: Get list of Categories - Given I request "categories" + Given I request "project/categories" Then the response status code should be 200 And the response charset is "UTF-8" And the content type is "application/json" @@ -18,7 +18,7 @@ Scenario: Get list of Categories Scenario: Get a Category specific - Given I request "category/4177095085330818c324501061677193" + Given I request "project/category/4177095085330818c324501061677193" Then the response status code should be 200 And the response charset is "UTF-8" And the content type is "application/json" @@ -32,7 +32,7 @@ Scenario: Create a new Categories "cat_name": "Test new Category" } """ - And I request "category" + And I request "project/category" Then the response status code should be 200 And the response charset is "UTF-8" And the content type is "application/json" @@ -41,7 +41,7 @@ Scenario: Create a new Categories Scenario: Get list of Categories - Given I request "categories" + Given I request "project/categories" Then the response status code should be 200 And the response charset is "UTF-8" And the content type is "application/json" @@ -57,7 +57,7 @@ Scenario: Update the Category created in this script } """ And that I want to update a resource with the key "cat_uid" stored in session array - And I request "category" + And I request "project/category" And the content type is "application/json" Then the response status code should be 200 And the response charset is "UTF-8" @@ -65,7 +65,7 @@ Scenario: Update the Category created in this script Scenario: Delete the Category created previously in this script Given that I want to delete a resource with the key "cat_uid" stored in session array - And I request "category" + And I request "project/category" And the content type is "application/json" Then the response status code should be 200 And the response charset is "UTF-8" diff --git a/features/backend/admin_setup/category/main_tests_category.feature b/features/backend/admin_setup/category/main_tests_category.feature index 817e1a5a5..c8f350a30 100644 --- a/features/backend/admin_setup/category/main_tests_category.feature +++ b/features/backend/admin_setup/category/main_tests_category.feature @@ -9,7 +9,7 @@ Background: Scenario: Get list of Categories - Given I request "categories" + Given I request "project/categories" Then the response status code should be 200 And the response charset is "UTF-8" And the content type is "application/json" @@ -18,7 +18,7 @@ Scenario: Get list of Categories Scenario: Get a Category specific - Given I request "category/4177095085330818c324501061677193" + Given I request "project/category/4177095085330818c324501061677193" Then the response status code should be 200 And the response charset is "UTF-8" And the content type is "application/json" @@ -35,7 +35,7 @@ Scenario Outline: Create a new Categories "cat_name": "" } """ - And I request "category" + And I request "project/category" Then the response status code should be 200 And the response charset is "UTF-8" And the content type is "application/json" @@ -53,7 +53,7 @@ Scenario Outline: Create a new Categories Scenario: Get list of Categories - Given I request "categories" + Given I request "project/categories" Then the response status code should be 200 And the response charset is "UTF-8" And the content type is "application/json" @@ -68,7 +68,7 @@ Scenario: Create Category with same name "cat_name": "sample" } """ - And I request "category" + And I request "project/category" Then the response status code should be 400 And the response status message should have the following text "Duplicate" @@ -80,7 +80,7 @@ Scenario Outline: Update the Category created in this script "cat_name": "cat_name" } """ - And I request "category/cat_uid" with the key "cat_uid" stored in session array as variable "cat_uid_" + And I request "project/category/cat_uid" with the key "cat_uid" stored in session array as variable "cat_uid_" And store "cat_uid" in session array as variable "cat_uid_" And the content type is "application/json" @@ -96,7 +96,7 @@ Scenario Outline: Update the Category created in this script Scenario Outline: Get a Category specific - Given I request "category/4177095085330818c324501061677193" + Given I request "project/category/cat_uid" with the key "cat_uid" stored in session array as variable "cat_uid_" Then the response status code should be 200 And the response charset is "UTF-8" And the content type is "application/json" @@ -113,7 +113,7 @@ Scenario Outline: Get a Category specific Scenario Outline: Delete the Category created previously in this script Given that I want to delete a resource with the key "cat_uid" stored in session array as variable "cat_uid_" - And I request "category" + And I request "project/category" And the content type is "application/json" Then the response status code should be 200 And the response charset is "UTF-8" @@ -129,7 +129,7 @@ Scenario Outline: Delete the Category created previously in this script Scenario: Get a Category specific - Given I request "category/4177095085330818c324501061677193" + Given I request "project/category/4177095085330818c324501061677193" Then the response status code should be 200 And the response charset is "UTF-8" And the content type is "application/json" diff --git a/features/backend/admin_setup/category/negative_tests_category.feature b/features/backend/admin_setup/category/negative_tests_category.feature index 716b8228c..9b87936c7 100644 --- a/features/backend/admin_setup/category/negative_tests_category.feature +++ b/features/backend/admin_setup/category/negative_tests_category.feature @@ -13,7 +13,7 @@ Scenario Outline: Create a new Categories (Negative Test) "cat_name": "" } """ - And I request "category" + And I request "project/category" Then the response status code should be And the response status message should have the following text "" diff --git a/features/backend/admin_setup/departments/basic_sequence_department.feature b/features/backend/admin_setup/departments/basic_sequence_department.feature index c55e80782..413e1657f 100644 --- a/features/backend/admin_setup/departments/basic_sequence_department.feature +++ b/features/backend/admin_setup/departments/basic_sequence_department.feature @@ -38,7 +38,7 @@ Background: Then the response status code should be 200 And the response charset is "UTF-8" And the type is "array" - And the response has 7 record + And the response has 6 record Scenario: Create a new department in the workspace @@ -92,7 +92,7 @@ Background: } """ - And that I want to update a resource with the key "dep_uid" stored in session array + And that I want to update a resource with the key "dep_uid" stored in session array And I request "department//assign-user/23085901752d5671483a4c2059274810" Then the response status code should be 200 And the response charset is "UTF-8" @@ -108,7 +108,7 @@ Background: } """ - And that I want to update a resource with the key "dep_uid" stored in session array + And that I want to update a resource with the key "dep_uid" stored in session array And I request "department//set-manager/24768775452d5671dbc1e92021979323" Then the response status code should be 200 And the response charset is "UTF-8" @@ -125,7 +125,7 @@ Background: } """ - And that I want to update a resource with the key "dep_uid" stored in session array + And that I want to update a resource with the key "dep_uid" stored in session array And I request "department//unassign-user/23085901752d5671483a4c2059274810" Then the response status code should be 200 And the response charset is "UTF-8" @@ -141,7 +141,7 @@ Background: } """ - And that I want to update a resource with the key "dep_uid" stored in session array + And that I want to update a resource with the key "dep_uid" stored in session array And I request "department//set-manager/38102442252d5671a629009013495090" Then the response status code should be 200 And the response charset is "UTF-8" diff --git a/features/backend/admin_setup/departments/main_tests_department.feature b/features/backend/admin_setup/departments/main_tests_department.feature index d8406fd32..ad76211dd 100644 --- a/features/backend/admin_setup/departments/main_tests_department.feature +++ b/features/backend/admin_setup/departments/main_tests_department.feature @@ -146,7 +146,7 @@ Background: } """ - And that I want to update a resource with the key "dep_uid" stored in session array as variable "dep_uid_" + And that I want to update a resource with the key "dep_uid" stored in session array as variable "dep_uid_" And I request "department//assign-user/" Then the response status code should be 200 And the response charset is "UTF-8" @@ -171,7 +171,7 @@ Background: } """ - And that I want to update a resource with the key "dep_uid" stored in session array as variable "dep_uid_" + And that I want to update a resource with the key "dep_uid" stored in session array as variable "dep_uid_" And I request "department//set-manager/" Then the response status code should be 200 And the response charset is "UTF-8" @@ -188,7 +188,7 @@ Background: Scenario Outline: Get a single department of created in this script - Given that I want to get a resource with the key "dep_uid" stored in session array as variable "dep_uid_" + Given that I want to get a resource with the key "dep_uid" stored in session array as variable "dep_uid_" And I request "department/" Then the response status code should be 200 And the response charset is "UTF-8" @@ -214,7 +214,7 @@ Background: } """ - And that I want to update a resource with the key "dep_uid" stored in session array + And that I want to update a resource with the key "dep_uid" stored in session array And I request "department//unassign-user/23085901752d5671483a4c2059274810" Then the response status code should be 200 And the response charset is "UTF-8" diff --git a/features/backend/admin_setup/departments/negative_tests_department.feature b/features/backend/admin_setup/departments/negative_tests_department.feature index 351054960..53a70b992 100644 --- a/features/backend/admin_setup/departments/negative_tests_department.feature +++ b/features/backend/admin_setup/departments/negative_tests_department.feature @@ -45,7 +45,7 @@ Scenario Outline: Create a new departments in the workspace with bad parameters | Invalid usr_uid | 56255940652d5674c75bc70062927441 | 23085900000000000000002059274810 | 400 | usr_uid | | Invalid dep_uid | 56255900000000000000000062927441 | 23085901752d5671483a4c2059274810 | 400 | dep_uid | | Field Requered usr_uid | 56255940652d5674c75bc70062927441 | | 404 | Not Found | - | Field Requered dep_uid | | 25286582752d56713231082039265791 | 404 | Not Found | + | Field Requered dep_uid | | 25286582752d56713231082039265791 | 400 | dep_uid | diff --git a/features/backend/projects/activity/main_tests_activity.feature b/features/backend/projects/activity/main_tests_activity.feature index 4ab70d3a8..96309f7b1 100644 --- a/features/backend/projects/activity/main_tests_activity.feature +++ b/features/backend/projects/activity/main_tests_activity.feature @@ -138,10 +138,10 @@ Feature: Activity Resources Main Tests Examples: - | activity | tas_title | tas_description | tas_priority_variable | tas_derivation_screen_tpl | tas_assign_type | tas_assign_variable| tas_group_variable | tas_selfservice_timeout | tas_selfservice_time | tas_selfservice_time_unit | tas_transfer_fly | tas_duration | tas_timeunit | tas_type_day | tas_calendar | tas_type | tas_def_title | tas_def_description | tas_def_subject_message | tas_def_message_type | tas_def_message | - | 97192372152a5c78f04a794095806311 | update activity task1 | update description | @@PROCESS | template.html | BALANCED | @@USER_LOGGED | @@GROUP_UID | 0 | 4 | HOURS | TRUE | 4 | HOURS | 1 | | NORMAL | Case Title | Case Description UPDATE | UPDATE Titulo de Notificacion 1 | text | Esta es una Notificacion - UPDATE | - | 95655319552a5c790b69a04054667879 | update activity task2 | update description | @@PROCESS | template.html | BALANCED | @@USER_LOGGED | @@GROUP_UID | 0 | 4 | HOURS | TRUE | 4 | HOURS | 1 | | NORMAL | Case Title | Case Description UPDATE | UPDATE Titulo de Notificacion 1 | text | Esta es una Notificacion - UPDATE | - | 63843886052a5cc066e4c04056414372 | update activity task3 | update description | @@PROCESS | template.html | BALANCED | @@USER_LOGGED | @@GROUP_UID | 0 | 6 | HOURS | TRUE | 4 | HOURS | 1 | | NORMAL | Case Title | Case Description UPDATE | UPDATE Titulo de Notificacion 1 | text | Esta es una Notificacion - UPDATE | + | activity | tas_title | tas_description | tas_priority_variable | tas_derivation_screen_tpl | tas_assign_type | tas_assign_variable| tas_group_variable | tas_selfservice_timeout | tas_selfservice_time | tas_selfservice_time_unit | tas_selfservice_trigger_uid | tas_transfer_fly | tas_duration | tas_timeunit | tas_type_day | tas_calendar | tas_type | tas_def_title | tas_def_description | tas_def_subject_message | tas_def_message_type | tas_def_message | tas_def_message_template | + | 97192372152a5c78f04a794095806311 | update activity task1 | update description | @@PROCESS | template.html | BALANCED | @@USER_LOGGED | @@GROUP_UID | 0 | 4 | HOURS | | TRUE | 4 | HOURS | 1 | | NORMAL | Case Title | Case Description UPDATE | UPDATE Titulo de Notificacion 1 | text | Esta es una Notificacion - UPDATE | template.html | + | 95655319552a5c790b69a04054667879 | update activity task2 | update description | @@PROCESS | template.html | BALANCED | @@USER_LOGGED | @@GROUP_UID | 0 | 4 | HOURS | | TRUE | 4 | HOURS | 1 | | NORMAL | Case Title | Case Description UPDATE | UPDATE Titulo de Notificacion 1 | text | Esta es una Notificacion - UPDATE | template.html | + | 63843886052a5cc066e4c04056414372 | update activity task3 | update description | @@PROCESS | template.html | BALANCED | @@USER_LOGGED | @@GROUP_UID | 0 | 6 | HOURS | | TRUE | 4 | HOURS | 1 | | NORMAL | Case Title | Case Description UPDATE | UPDATE Titulo de Notificacion 1 | text | Esta es una Notificacion - UPDATE | template.html | Scenario Outline: Update the Definition of a Activity and the check if the values had changed diff --git a/features/backend/projects/adhoc_assignee/main_tests_adhoc_assignee.feature b/features/backend/projects/adhoc_assignee/main_tests_adhoc_assignee.feature index a11080cc4..122e407b2 100644 --- a/features/backend/projects/adhoc_assignee/main_tests_adhoc_assignee.feature +++ b/features/backend/projects/adhoc_assignee/main_tests_adhoc_assignee.feature @@ -19,7 +19,7 @@ Requirements: Examples: | test_description | project | activity | records | ada_uid | ada_type | - | check if the list of possible users and groups to be assigned is correct | 4224292655297723eb98691001100052 | 65496814252977243d57684076211485 | 82 | 54731929352d56741de9d42002704749 | group | + | check if the list of possible users and groups to be assigned is correct | 4224292655297723eb98691001100052 | 65496814252977243d57684076211485 | 80 | 54731929352d56741de9d42002704749 | group | Scenario Outline: Get a list of available adhoc users and groups to be assigned to an activity with filter Given I request "project//activity//adhoc-available-assignee?filter=&start=&limit=" @@ -69,7 +69,7 @@ Requirements: Examples: | test_description | project | activity | records | ada_uid | ada_type | - | Verify that the activity has expected quantity of asignees | 4224292655297723eb98691001100052 | 65496814252977243d57684076211485 | 4 | 54731929352d56741de9d42002704749 | group | + | Verify that the activity has expected quantity of asignees | 4224292655297723eb98691001100052 | 65496814252977243d57684076211485 | 6 | 54731929352d56741de9d42002704749 | group | | Verify that the activity has expected quantity of asignees | 4224292655297723eb98691001100052 | 68911670852a22d93c22c06005808422 | 1 | 36775342552d5674146d9c2078497230 | group | @@ -122,7 +122,7 @@ Requirements: And the response charset is "UTF-8" And the content type is "application/json" And the type is "array" - And the response has 1 records + And the response has 3 records Scenario: List assignees of an activity Given I request "project/4224292655297723eb98691001100052/activity/65496814252977243d57684076211485/adhoc-assignee/all" diff --git a/features/backend/projects/adhoc_assignee/negative_tests_adhoc_assignee.feature b/features/backend/projects/adhoc_assignee/negative_tests_adhoc_assignee.feature index f70aa7a16..773a2ee6e 100644 --- a/features/backend/projects/adhoc_assignee/negative_tests_adhoc_assignee.feature +++ b/features/backend/projects/adhoc_assignee/negative_tests_adhoc_assignee.feature @@ -54,7 +54,7 @@ Scenario Outline: List assignees of an activity with bad parameters | high number for start | a | 1000 | 1 | 0 | 200 | array | | high number for start | a | 1000 | 0 | 0 | 200 | array | | empty result | xyz | 0 | 0 | 0 | 200 | array | - | empty string | | 0 | 10000 | 82 | 200 | array | + | empty string | | 0 | 10000 | 80 | 200 | array | | empty string | | 1 | 2 | 2 | 200 | array | | invalid start | a | b | c | 0 | 400 | string| | invalid limit | a | 0 | c | 0 | 400 | string| diff --git a/features/backend/projects/assignee/negative_tests_assignee.feature b/features/backend/projects/assignee/negative_tests_assignee.feature index 28460ae0f..fc0517e5a 100644 --- a/features/backend/projects/assignee/negative_tests_assignee.feature +++ b/features/backend/projects/assignee/negative_tests_assignee.feature @@ -63,7 +63,7 @@ Scenario Outline: Assign a user or group to an activity (Field validation) | invalid start | a | b | c | 0 | 400 | string | | invalid limit | a | 0 | c | 0 | 400 | string | | search 0 | 0 | 0 | 0 | 0 | 200 | array | - | search 0 | 0 | 0 | 100 | 4 | 200 | array | + | search 0 | 0 | 0 | 100 | 0 | 200 | array | | negative numbers | a | -10 | -20 | 0 | 400 | string | | real numbers | a | 0.0 | 1.0 | 1 | 200 | string | | real numbers | a | 0.0 | 0.0 | 0 | 200 | string | diff --git a/features/backend/projects/case_tracker/case_tracker_move_position.feature b/features/backend/projects/case_tracker/case_tracker_move_position.feature index 9f4758f2a..6671358d3 100644 --- a/features/backend/projects/case_tracker/case_tracker_move_position.feature +++ b/features/backend/projects/case_tracker/case_tracker_move_position.feature @@ -1,14 +1,44 @@ @ProcessMakerMichelangelo @RestAPI -Feature: Step update position Main Tests - Scenario: List all the Sub Processs (result 0 Sub Processs) +Feature: Case Tracker update position Main Tests +Requirements: + a workspace with the process 337095208534c2cb794a9b5045424275 ("Case Tracker Ordenamiento") already loaded + there are two activities and six object in the process + + + Scenario: List all objects in this process (result 5 objects) Given that I have a valid access_token - And I request "project/6838258995339cb1474fc94058315158/case-tracker/object/6262239315339cb46efc6e4031561540" + And I request "project/337095208534c2cb794a9b5045424275/case-tracker/objects" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the type is "array" + And the response has 5 records + And that "cto_position" is set to "3" + + + Scenario Outline: List all the objects in this process + Given that I have a valid access_token + And I request "project/337095208534c2cb794a9b5045424275/case-tracker/object/" Then the response status code should be 200 And the response charset is "UTF-8" And the type is "object" - And that "cto_position" is set to "3" + And that "cto_uid" is set to "" + And that "cto_type_obj" is set to "" + And that "cto_position" is set to "" + And that "obj_title" is set to "" - Scenario: Change order the step + + Examples: + + | test_description | cto_uid | cto_type_obj | cto_position | obj_title | + | Description form1 | 596781160534c2e048a51b4023771688 | DYNAFORM | 1 | form1 | + | Description form2 | 542952604534c2e084aeeb8075222116 | DYNAFORM | 2 | form2 | + | Description input1 | 779426015534c2e0bef94b6074738223 | INPUT_DOCUMENT | 3 | input1 | + | Description input2 | 958267629534c2e102d5896033309049 | INPUT_DOCUMENT | 4 | input2 | + | Description output1 | 892208902534c2e139f6a01078029070 | OUTPUT_DOCUMENT | 1 | output1 | + + + + Scenario: Change order the object input1 for position one Given that I have a valid access_token And PUT this data: """ @@ -16,33 +46,62 @@ Feature: Step update position Main Tests "cto_position": 1 } """ - And I request "project/6838258995339cb1474fc94058315158/case-tracker/object/6262239315339cb46efc6e4031561540" + And I request "project/337095208534c2cb794a9b5045424275/case-tracker/object/779426015534c2e0bef94b6074738223" Then the response status code should be 200 - Scenario: List all the Sub Processs (result 0 Sub Processs) + + Scenario Outline: List all the objects in this process Given that I have a valid access_token - And I request "project/6838258995339cb1474fc94058315158/case-tracker/object/6262239315339cb46efc6e4031561540 + And I request "project/337095208534c2cb794a9b5045424275/case-tracker/object/" Then the response status code should be 200 And the response charset is "UTF-8" And the type is "object" - And that "step_position" is set to "1" + And that "cto_uid" is set to "" + And that "cto_type_obj" is set to "" + And that "cto_position" is set to "" + And that "obj_title" is set to "" - Scenario: Change order the step + + Examples: + + | test_description | cto_uid | cto_type_obj | cto_position | obj_title | + | Description form1 | 596781160534c2e048a51b4023771688 | DYNAFORM | 2 | form1 | + | Description form2 | 542952604534c2e084aeeb8075222116 | DYNAFORM | 3 | form2 | + | Description input1 | 779426015534c2e0bef94b6074738223 | INPUT_DOCUMENT | 1 | input1 | + | Description input2 | 958267629534c2e102d5896033309049 | INPUT_DOCUMENT | 4 | input2 | + | Description output1 | 892208902534c2e139f6a01078029070 | OUTPUT_DOCUMENT | 5 | output1 | + + + Scenario: Change order the object input1 for position three Given that I have a valid access_token And PUT this data: """ { - "st_type": "BEFORE", - "st_position": "3" + "cto_position": 3 } """ - And I request "project/6838258995339cb1474fc94058315158/case-tracker/object/6262239315339cb46efc6e4031561540" + And I request "project/337095208534c2cb794a9b5045424275/case-tracker/object/779426015534c2e0bef94b6074738223" Then the response status code should be 200 - Scenario: List all the Sub Processs (result 0 Sub Processs) + + Scenario Outline: List all the objects in this process Given that I have a valid access_token - And I request "project/6838258995339cb1474fc94058315158/case-tracker/object/6262239315339cb46efc6e4031561540 + And I request "project/337095208534c2cb794a9b5045424275/case-tracker/object/" Then the response status code should be 200 And the response charset is "UTF-8" And the type is "object" - And that "step_position" is set to "3" + And that "cto_uid" is set to "" + And that "cto_type_obj" is set to "" + And that "cto_position" is set to "" + And that "obj_title" is set to "" + + + Examples: + + | test_description | cto_uid | cto_type_obj | cto_position | obj_title | + | Description form1 | 596781160534c2e048a51b4023771688 | DYNAFORM | 1 | form1 | + | Description form2 | 542952604534c2e084aeeb8075222116 | DYNAFORM | 2 | form2 | + | Description input1 | 779426015534c2e0bef94b6074738223 | INPUT_DOCUMENT | 3 | input1 | + | Description input2 | 958267629534c2e102d5896033309049 | INPUT_DOCUMENT | 4 | input2 | + | Description output1 | 892208902534c2e139f6a01078029070 | OUTPUT_DOCUMENT | 5 | output1 | + diff --git a/features/backend/projects/input_documents/main_tests_input.feature b/features/backend/projects/input_documents/main_tests_input.feature index 366ca2d15..a5872d1b2 100644 --- a/features/backend/projects/input_documents/main_tests_input.feature +++ b/features/backend/projects/input_documents/main_tests_input.feature @@ -28,7 +28,7 @@ Feature: Input Documents Main Tests "inp_doc_form_needed": "", "inp_doc_original": "", "inp_doc_published": "", - "inp_doc_versioning": "", + "inp_doc_versioning": , "inp_doc_destination_path": "", "inp_doc_tags": "" } @@ -67,7 +67,7 @@ Feature: Input Documents Main Tests "inp_doc_form_needed": "VIRTUAL", "inp_doc_original": "ORIGINAL", "inp_doc_published": "PRIVATE", - "inp_doc_versioning": "1", + "inp_doc_versioning": 1, "inp_doc_destination_path": "", "inp_doc_tags": "INPUT" } @@ -96,7 +96,7 @@ Feature: Input Documents Main Tests "inp_doc_form_needed": "", "inp_doc_original": "", "inp_doc_published": "", - "inp_doc_versioning": "", + "inp_doc_versioning": , "inp_doc_destination_path": "", "inp_doc_tags": "" } @@ -128,7 +128,7 @@ Feature: Input Documents Main Tests And that "inp_doc_title" is set to "" And that "inp_doc_description" is set to "" And that "inp_doc_form_needed" is set to "" - And that "inp_doc_versioning" is set to "" + And that "inp_doc_versioning" is set to Examples: diff --git a/features/backend/projects/process/main_tests_process.feature b/features/backend/projects/process/main_tests_process.feature index 6afd526c3..72f6dd7eb 100644 --- a/features/backend/projects/process/main_tests_process.feature +++ b/features/backend/projects/process/main_tests_process.feature @@ -18,28 +18,28 @@ Feature: Process of a Project Resources And that "pro_title" is set to "" And that "pro_description" is set to "" And that "pro_parent" is set to "" - And that "pro_time" is set to "" + And that "pro_time" is set to And that "pro_timeunit" is set to "" And that "pro_status" is set to "" And that "pro_type_day" is set to "" And that "pro_type" is set to "" - And that "pro_assignment" is set to "" - And that "pro_show_map" is set to "" - And that "pro_show_message" is set to "" - And that "pro_subprocess" is set to "" + And that "pro_assignment" is set to + And that "pro_show_map" is set to + And that "pro_show_message" is set to + And that "pro_subprocess" is set to And that "pro_tri_deleted" is set to "" And that "pro_tri_canceled" is set to "" And that "pro_tri_paused" is set to "" And that "pro_tri_reassigned" is set to "" - And that "pro_show_delegate" is set to "" - And that "pro_show_dynaform" is set to "" + And that "pro_show_delegate" is set to + And that "pro_show_dynaform" is set to And that "pro_category" is set to "" And that "pro_sub_category" is set to "" - And that "pro_industry" is set to "" + And that "pro_industry" is set to And that "pro_update_date" is set to "" And that "pro_create_date" is set to "" And that "pro_create_user" is set to "" - And that "pro_debug" is set to "" + And that "pro_debug" is set to And that "pro_derivation_screen_tpl" is set to "" And that "pro_summary_dynaform" is set to "" And that "pro_calendar" is set to "" @@ -58,28 +58,28 @@ Feature: Process of a Project Resources "pro_title" : "", "pro_description" : "", "pro_parent" : "", - "pro_time" : "", + "pro_time" : , "pro_timeunit" : "", "pro_status" : "", "pro_type_day" : "", "pro_type" : "", - "pro_assignment" : "", - "pro_show_map" : "", - "pro_show_message" : "", - "pro_subprocess" : "", + "pro_assignment" : , + "pro_show_map" : , + "pro_show_message" : , + "pro_subprocess" : , "pro_tri_deleted" : "", "pro_tri_canceled" : "", "pro_tri_paused" : "", "pro_tri_reassigned" : "", - "pro_show_delegate" : "", - "pro_show_dynaform" : "", + "pro_show_delegate" : , + "pro_show_dynaform" : , "pro_category" : "", "pro_sub_category" : "", - "pro_industry" : "", + "pro_industry" : , "pro_update_date" : "", "pro_create_date" : "", "pro_create_user" : "", - "pro_debug" : "", + "pro_debug" : , "pro_derivation_screen_tpl": "", "pro_summary_dynaform" : "", "pro_calendar" : "" @@ -94,7 +94,7 @@ Feature: Process of a Project Resources Examples: | project | pro_title | pro_description | pro_parent | pro_time | pro_timeunit | pro_status | pro_type_day | pro_type | pro_assignment | pro_show_map | pro_show_message | pro_subprocess | pro_tri_deleted | pro_tri_canceled | pro_tri_paused | pro_tri_reassigned | pro_show_delegate | pro_show_dynaform | pro_category | pro_sub_category | pro_industry | pro_update_date | pro_create_date | pro_create_user | pro_debug | pro_derivation_screen_tpl | pro_summary_dynaform | pro_calendar | | 79409754952f8f5110c4342001470580 | Update Test Process 1 | Update Process - PUT | 79409754952f8f5110c4342001470580 | 1 | DAYS | INACTIVE | | NORMAL | 1 | 0 | 0 | 0 | | | | | 0 | 0 | | | 0 | 2014-01-10 09:43:36 | 2015-12-09 09:43:36 | 00000000000000000000000000000001 | 0 | | | | - | 58773281752f50297d6bf00047802053 | Update Test Process 2 | Update Process - PUT | 58773281752f50297d6bf00047802053 | 1 | DAYS | ACTIVE | | NORMAL | 0 | 1 | 1 | 1 | 69112537052f503b53142c2026229055 | 30169571352f50349539aa7005920345 | 45413889552f5037587e5a4073302257 | 23429991752f5035c3eab21091451118 | 1 | 0 | 77488943552f502c3d7f649000082980 | | 0 | 2014-01-10 09:43:36 | 2014-02-07 10:58:15 | 51049032352d56710347233042615067 | 1 | tplScreen.html | 94906672952f5058bf3f0f8012616448 | 99159704252f501c63f8c58025859967 | + | 58773281752f50297d6bf00047802053 | Update Test Process 2 | Update Process - PUT | 58773281752f50297d6bf00047802053 | 1 | DAYS | ACTIVE | | NORMAL | 0 | 1 | 1 | 1 | 69112537052f503b53142c2026229055 | 30169571352f50349539aa7005920345 | 45413889552f5037587e5a4073302257 | 23429991752f5035c3eab21091451118 | 1 | 0 | 77488943552f502c3d7f649000082980 | | 0 | 2014-01-10 09:43:36 | 2014-02-07 10:58:15 | 51049032352d56710347233042615067 | 1 | tplScreen.html | 94906672952f5058bf3f0f8012616448 | 14606161052f50839307899033145440 | Scenario Outline: Get a single Process @@ -107,28 +107,28 @@ Feature: Process of a Project Resources And that "pro_title" is set to "" And that "pro_description" is set to "" And that "pro_parent" is set to "" - And that "pro_time" is set to "" + And that "pro_time" is set to And that "pro_timeunit" is set to "" And that "pro_status" is set to "" And that "pro_type_day" is set to "" And that "pro_type" is set to "" - And that "pro_assignment" is set to "" - And that "pro_show_map" is set to "" - And that "pro_show_message" is set to "" - And that "pro_subprocess" is set to "" + And that "pro_assignment" is set to + And that "pro_show_map" is set to + And that "pro_show_message" is set to + And that "pro_subprocess" is set to And that "pro_tri_deleted" is set to "" And that "pro_tri_canceled" is set to "" And that "pro_tri_paused" is set to "" And that "pro_tri_reassigned" is set to "" - And that "pro_show_delegate" is set to "" - And that "pro_show_dynaform" is set to "" + And that "pro_show_delegate" is set to + And that "pro_show_dynaform" is set to And that "pro_category" is set to "" And that "pro_sub_category" is set to "" - And that "pro_industry" is set to "" + And that "pro_industry" is set to And that "pro_update_date" is set to "" And that "pro_create_date" is set to "" And that "pro_create_user" is set to "" - And that "pro_debug" is set to "" + And that "pro_debug" is set to And that "pro_derivation_screen_tpl" is set to "" And that "pro_summary_dynaform" is set to "" And that "pro_calendar" is set to "" @@ -147,28 +147,28 @@ Feature: Process of a Project Resources "pro_title" : "", "pro_description" : "", "pro_parent" : "", - "pro_time" : "", + "pro_time" : , "pro_timeunit" : "", "pro_status" : "", "pro_type_day" : "", "pro_type" : "", - "pro_assignment" : "", - "pro_show_map" : "", - "pro_show_message" : "", - "pro_subprocess" : "", + "pro_assignment" : , + "pro_show_map" : , + "pro_show_message" : , + "pro_subprocess" : , "pro_tri_deleted" : "", "pro_tri_canceled" : "", "pro_tri_paused" : "", "pro_tri_reassigned" : "", - "pro_show_delegate" : "", - "pro_show_dynaform" : "", + "pro_show_delegate" : , + "pro_show_dynaform" : , "pro_category" : "", "pro_sub_category" : "", - "pro_industry" : "", + "pro_industry" : , "pro_update_date" : "", "pro_create_date" : "", "pro_create_user" : "", - "pro_debug" : "", + "pro_debug" : , "pro_derivation_screen_tpl": "", "pro_summary_dynaform" : "", "pro_calendar" : "" @@ -196,28 +196,28 @@ Feature: Process of a Project Resources And that "pro_title" is set to "" And that "pro_description" is set to "" And that "pro_parent" is set to "" - And that "pro_time" is set to "" + And that "pro_time" is set to And that "pro_timeunit" is set to "" And that "pro_status" is set to "" And that "pro_type_day" is set to "" And that "pro_type" is set to "" - And that "pro_assignment" is set to "" - And that "pro_show_map" is set to "" - And that "pro_show_message" is set to "" - And that "pro_subprocess" is set to "" + And that "pro_assignment" is set to + And that "pro_show_map" is set to + And that "pro_show_message" is set to + And that "pro_subprocess" is set to And that "pro_tri_deleted" is set to "" And that "pro_tri_canceled" is set to "" And that "pro_tri_paused" is set to "" And that "pro_tri_reassigned" is set to "" - And that "pro_show_delegate" is set to "" - And that "pro_show_dynaform" is set to "" + And that "pro_show_delegate" is set to + And that "pro_show_dynaform" is set to And that "pro_category" is set to "" And that "pro_sub_category" is set to "" - And that "pro_industry" is set to "" + And that "pro_industry" is set to And that "pro_update_date" is set to "" And that "pro_create_date" is set to "" And that "pro_create_user" is set to "" - And that "pro_debug" is set to "" + And that "pro_debug" is set to And that "pro_derivation_screen_tpl" is set to "" And that "pro_summary_dynaform" is set to "" And that "pro_calendar" is set to "" diff --git a/features/backend/projects/process/negative_tests_process.feature b/features/backend/projects/process/negative_tests_process.feature index c7f9b4629..6d5f6b463 100644 --- a/features/backend/projects/process/negative_tests_process.feature +++ b/features/backend/projects/process/negative_tests_process.feature @@ -11,28 +11,28 @@ Scenario Outline: Update Process "pro_title" : "", "pro_description" : "", "pro_parent" : "", - "pro_time" : "", + "pro_time" : , "pro_timeunit" : "", "pro_status" : "", "pro_type_day" : "", "pro_type" : "", - "pro_assignment" : "", - "pro_show_map" : "", - "pro_show_message" : "", - "pro_subprocess" : "", + "pro_assignment" : , + "pro_show_map" : , + "pro_show_message" : , + "pro_subprocess" : , "pro_tri_deleted" : "", "pro_tri_canceled" : "", "pro_tri_paused" : "", "pro_tri_reassigned" : "", - "pro_show_delegate" : "", - "pro_show_dynaform" : "", + "pro_show_delegate" : , + "pro_show_dynaform" : , "pro_category" : "", "pro_sub_category" : "", - "pro_industry" : "", + "pro_industry" : , "pro_update_date" : "", "pro_create_date" : "", "pro_create_user" : "", - "pro_debug" : "", + "pro_debug" : , "pro_derivation_screen_tpl": "", "pro_summary_dynaform" : "", "pro_calendar" : "" @@ -81,28 +81,28 @@ Scenario: Update Process "pro_title" : "Test Process 2", "pro_description" : "", "pro_parent" : "74737540052e1641ab88249082085472", - "pro_time" : "1", + "pro_time" : 1, "pro_timeunit" : "DAYS", "pro_status" : "ACTIVE", "pro_type_day" : "", "pro_type" : "NORMAL", - "pro_assignment" : "0", - "pro_show_map" : "0", - "pro_show_message" : "0", - "pro_subprocess" : "0", + "pro_assignment" : 0, + "pro_show_map" : 0, + "pro_show_message" : 0, + "pro_subprocess" : 0, "pro_tri_deleted" : "", "pro_tri_canceled" : "", "pro_tri_paused" : "", "pro_tri_reassigned" : "", - "pro_show_delegate" : "0", - "pro_show_dynaform" : "0", + "pro_show_delegate" : 0, + "pro_show_dynaform" : 0, "pro_category" : "", "pro_sub_category" : "", - "pro_industry" : "0", + "pro_industry" : 0, "pro_update_date" : "2014-02-10 10:58:15", "pro_create_date" : "2014-02-10 10:49:37", "pro_create_user" : "00000000000000000000000000000001", - "pro_debug" : "0", + "pro_debug" : 0, "pro_derivation_screen_tpl": "", "pro_summary_dynaform" : "", "pro_calendar" : "" diff --git a/features/backend/projects/process_supervisor/main_tests_supervisor.feature b/features/backend/projects/process_supervisor/main_tests_supervisor.feature index a8b26430c..90c5a7344 100644 --- a/features/backend/projects/process_supervisor/main_tests_supervisor.feature +++ b/features/backend/projects/process_supervisor/main_tests_supervisor.feature @@ -31,7 +31,7 @@ Requirements: Examples: | test_description | project | records | - | List users and groups available to be supervisors | 85794888452ceeef3675164057928956 | 20 | + | List users and groups available to be supervisors | 85794888452ceeef3675164057928956 | 21 | Scenario Outline: Get a List of available groups process supervisor of a project @@ -57,7 +57,7 @@ Requirements: Examples: | test_description | project | records | - | List the unique admin user available to be supervisor | 85794888452ceeef3675164057928956 | 1 | + | List the unique admin user available to be supervisor | 85794888452ceeef3675164057928956 | 2 | @@ -70,7 +70,7 @@ Requirements: Examples: | test_description | project | pu_uid | - | Get the supervisor details | 85794888452ceeef3675164057928956 | 45562646852fa827abb79a5097602637 | + | Get the supervisor details | 85794888452ceeef3675164057928956 | 31336919452fa84404e3ac0086239686 | Scenario Outline: Get a List of dynaforms assigned to a process supervisor diff --git a/features/backend/projects/process_supervisor/main_tests_supervisor_ordenamiento.feature b/features/backend/projects/process_supervisor/main_tests_supervisor_ordenamiento.feature index dc40d1533..99ac4b3db 100644 --- a/features/backend/projects/process_supervisor/main_tests_supervisor_ordenamiento.feature +++ b/features/backend/projects/process_supervisor/main_tests_supervisor_ordenamiento.feature @@ -1,7 +1,7 @@ @ProcessMakerMichelangelo @RestAPI Feature: Reorder Process Supervisor - Dynaform and Input Requirements: - a workspace with the process 7557786515322022952dcc8014985410 ("Ordenamiento") already loaded + a workspace with the process 857888611534814982bc651033834642 ("Ordenamiento Main") already loaded there are two activities and eight steps in the process Background: @@ -9,7 +9,7 @@ Requirements: Scenario Outline: obtain the position of dynaform in process supervisor - Given I request "project/7557786515322022952dcc8014985410/process-supervisors" + Given I request "project/857888611534814982bc651033834642/process-supervisor/dynaform/step_uid" Then the response status code should be 200 And the response charset is "UTF-8" And the type is "object" @@ -18,10 +18,10 @@ Requirements: Examples: | test_description | step_uid | pud_position | - | Position-dynaform1 | 8257746325322026c0e45e3047837732 | 1 | - | Position-dynaform2 | 30547852753220293960227013371359 | 2 | - | Position-dynaform3 | 840380819532202d132fb91020992676 | 3 | - | Position-dynaform4 | 663853222532202eec8a913042063689 | 4 | + | Position-dynaform1 | 674032139534bd91f9331a5032066933 | 1 | + | Position-dynaform2 | 583050735534bd923984f24007464958 | 2 | + | Position-dynaform3 | 114660532534bd926817991070085867 | 3 | + | Position-dynaform4 | 105517492534bd929a58c15055718131 | 4 | Scenario: Change order the dynaform of "dynaform3" by position one @@ -31,12 +31,12 @@ Requirements: "pud_position": "1" } """ - And I request "project/7557786515322022952dcc8014985410/activity/7976552835322023005e069088446535/step/840380819532202d132fb91020992676" + And I request "project/857888611534814982bc651033834642/activity/7976552835322023005e069088446535/step/114660532534bd926817991070085867" Then the response status code should be 200 Scenario Outline: Obtain the position of the steps after changing position - Given I request "project/7557786515322022952dcc8014985410/activity/7976552835322023005e069088446535/step/" + Given I request "project/857888611534814982bc651033834642/activity/7976552835322023005e069088446535/step/" Then the response status code should be 200 And the response charset is "UTF-8" And the type is "object" @@ -45,10 +45,10 @@ Requirements: Examples: | test_description | step_uid | step_position | - | Position-dynaform1 | 8257746325322026c0e45e3047837732 | 2 | - | Position-dynaform2 | 30547852753220293960227013371359 | 3 | - | Position-dynaform3 | 840380819532202d132fb91020992676 | 1 | - | Position-dynaform4 | 663853222532202eec8a913042063689 | 4 | + | Position-dynaform1 | 674032139534bd91f9331a5032066933 | 2 | + | Position-dynaform2 | 583050735534bd923984f24007464958 | 3 | + | Position-dynaform3 | 114660532534bd926817991070085867 | 1 | + | Position-dynaform4 | 105517492534bd929a58c15055718131 | 4 | @@ -59,7 +59,7 @@ Requirements: "dyn_uid": "" } """ - And I request "project/7557786515322022952dcc8014985410/process-supervisor/dynaform" + And I request "project/857888611534814982bc651033834642/process-supervisor/dynaform" Then the response status code should be 201 And the response charset is "UTF-8" And the content type is "application/json" @@ -69,11 +69,11 @@ Requirements: Examples: | test_description | pud_number | dyn_uid | - | Assign a dynaform5 for Supervisor | 1 | 240449806532203ef307192024451548 | + | Assign a dynaform5 for Supervisor | 1 | 856447360534bdeab3c4a72086906269 | Scenario Outline: Obtain the position of the steps after add new dynaform - Given I request "project/7557786515322022952dcc8014985410/activity/7976552835322023005e069088446535/step/" + Given I request "project/857888611534814982bc651033834642/activity/7976552835322023005e069088446535/step/" Then the response status code should be 200 And the response charset is "UTF-8" And the type is "object" @@ -86,7 +86,7 @@ Requirements: | Position-dynaform2 | 30547852753220293960227013371359 | 3 | | Position-dynaform3 | 840380819532202d132fb91020992676 | 1 | | Position-dynaform4 | 663853222532202eec8a913042063689 | 4 | - | Position-dynaform5 | 240449806532203ef307192024451548 | 5 | + | Position-dynaform5 | 925775829534bdee3ef85a0017515754 | 5 | Scenario Outline: Delete an dynaform5 to a process supervisor @@ -98,23 +98,51 @@ Requirements: Examples: | test_description | project | pud_number | - | Delete dynaform5 for Supervisor | 7557786515322022952dcc8014985410 | 1 | + | Delete dynaform5 for Supervisor | 925775829534bdee3ef85a0017515754 | 1 | + + + +Scenario: Change order the dynaform of "dynaform3" by position three + Given PUT this data: + """ + { + "pud_position": "3" + } + """ + And I request "project/857888611534814982bc651033834642/activity/7976552835322023005e069088446535/step/114660532534bd926817991070085867" + Then the response status code should be 200 + + + Scenario Outline: Obtain the position of the steps after changing position + Given I request "project/857888611534814982bc651033834642/activity/7976552835322023005e069088446535/step/" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the type is "object" + And that "step_position" is set to "" + + Examples: + + | test_description | step_uid | step_position | + | Position-dynaform1 | 674032139534bd91f9331a5032066933 | 1 | + | Position-dynaform2 | 583050735534bd923984f24007464958 | 2 | + | Position-dynaform3 | 114660532534bd926817991070085867 | 3 | + | Position-dynaform4 | 105517492534bd929a58c15055718131 | 4 | Scenario Outline: obtain the position of Input Documents in process supervisor - Given I request "project/7557786515322022952dcc8014985410/process-supervisors" + Given I request "project/857888611534814982bc651033834642/process-supervisors" Then the response status code should be 200 And the response charset is "UTF-8" - And the type is "object" + And the type is "array" And that "pui_position" is set to "" Examples: | test_description | step_uid | pud_position | - | Position-Input1 | 853418037532209018ab711041079957 | 1 | - | Position-Input2 | 5384383215322090e71aef1047228013 | 2 | - | Position-Input3 | 17499504253220917664c33090176996 | 3 | + | Position-Input1 | 152101193534bdfdb530c96029300152 | 1 | + | Position-Input2 | 370888112534bdfde887e79055241597 | 2 | + | Position-Input3 | 392695739534bdfe1542bb4007328326 | 3 | @@ -125,12 +153,12 @@ Scenario Outline: obtain the position of Input Documents in process supervisor "pud_position": "1" } """ - And I request "project/7557786515322022952dcc8014985410/activity/7976552835322023005e069088446535/step/17499504253220917664c33090176996" + And I request "project/857888611534814982bc651033834642/activity/7976552835322023005e069088446535/step/392695739534bdfe1542bb4007328326" Then the response status code should be 200 Scenario Outline: Obtain the position of the steps after changing position - Given I request "project/7557786515322022952dcc8014985410/process-supervisors" + Given I request "project/857888611534814982bc651033834642/process-supervisors" Then the response status code should be 200 And the response charset is "UTF-8" And the type is "object" @@ -139,6 +167,48 @@ Scenario Outline: obtain the position of Input Documents in process supervisor Examples: | test_description | step_uid | pud_position | - | Position-Input1 | 853418037532209018ab711041079957 | 2 | - | Position-Input2 | 5384383215322090e71aef1047228013 | 3 | - | Position-Input3 | 17499504253220917664c33090176996 | 1 | \ No newline at end of file + | Position-Input1 | 152101193534bdfdb530c96029300152 | 2 | + | Position-Input2 | 370888112534bdfde887e79055241597 | 3 | + | Position-Input3 | 392695739534bdfe1542bb4007328326 | 1 | + + +Scenario Outline: obtain the position of Input Documents in process supervisor + Given I request "project/857888611534814982bc651033834642/process-supervisors" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the type is "object" + And that "pui_position" is set to "" + + Examples: + + | test_description | step_uid | pud_position | + | Position-Input1 | 152101193534bdfdb530c96029300152 | 1 | + | Position-Input2 | 370888112534bdfde887e79055241597 | 2 | + | Position-Input3 | 392695739534bdfe1542bb4007328326 | 3 | + + + + Scenario: Change order the Input document of "Input3" by position three + Given PUT this data: + """ + { + "pud_position": "3" + } + """ + And I request "project/857888611534814982bc651033834642/activity/7976552835322023005e069088446535/step/392695739534bdfe1542bb4007328326" + Then the response status code should be 200 + + + Scenario Outline: Obtain the position of the steps after changing position + Given I request "project/857888611534814982bc651033834642/process-supervisors" + Then the response status code should be 200 + And the response charset is "UTF-8" + And the type is "object" + And that "pui_position" is set to "" + + Examples: + + | test_description | step_uid | pud_position | + | Position-Input1 | 152101193534bdfdb530c96029300152 | 1 | + | Position-Input2 | 370888112534bdfde887e79055241597 | 2 | + | Position-Input3 | 392695739534bdfe1542bb4007328326 | 3 | \ No newline at end of file diff --git a/features/backend/projects/project/project.feature b/features/backend/projects/project/project.feature index 93bf4b372..52fe0426a 100644 --- a/features/backend/projects/project/project.feature +++ b/features/backend/projects/project/project.feature @@ -12,6 +12,7 @@ Feature: Project Resources And the content type is "application/json" And the type is "array" +""" Scenario: Get a single project Given I request "project/4224292655297723eb98691001100052" @@ -38,3 +39,4 @@ Feature: Project Resources Scenario: Delete a project Given I request "project/" Then the response status code should be 200 +""" \ No newline at end of file diff --git a/features/backend/projects/step/basic_sequence_step.feature b/features/backend/projects/step/basic_sequence_step.feature index 47850235f..e10e6113e 100644 --- a/features/backend/projects/step/basic_sequence_step.feature +++ b/features/backend/projects/step/basic_sequence_step.feature @@ -100,7 +100,7 @@ Feature: Project Properties - Step Resources Then the response status code should be 200 And the response charset is "UTF-8" And the type is "array" - And the "obj_uid" property in row 1 equals "6869969705306aaae049a62048840877" + And the "obj_uid" property in row 1 equals "32743823452cd63105006e1076595203" And the "obj_title" property in row 1 equals "OutputDocument Demo" And the "obj_description" property in row 1 equals "Description" And the "obj_type" property in row 1 equals "OUTPUT_DOCUMENT" diff --git a/features/backend/projects/step/main_tests_step.feature b/features/backend/projects/step/main_tests_step.feature index febf317ff..6640b2d2d 100644 --- a/features/backend/projects/step/main_tests_step.feature +++ b/features/backend/projects/step/main_tests_step.feature @@ -68,18 +68,28 @@ Feature: Project Properties - Step Resources Main Tests And the response status message should have the following text "exists" - Scenario: Try delete a Input Document when it is assigned to a step - And that I want to delete a resource with the key "32743823452cd63105006e1076595203" stored in session array - And I request "project/14414793652a5d718b65590036026581/input-document" + Scenario Outline: Try delete a Input Document when it is assigned to a step + Given that I want to delete a resource with the key "step_uid" stored in session array as variable "step_uid_" + And I request "project/16062437052cd6141881e06088349078/input-document" And the content type is "application/json" Then the response status code should be 400 + + Examples: + + | step_number | + | 3 | - Scenario: Try delete a Output document when it is assigned to a step - Given that I want to delete a resource with the key "83199959452cd62589576c1018679557" stored in session array - And I request "project//output-document" + Scenario Outline: Try delete a Output document when it is assigned to a step + Given that I want to delete a resource with the key "step_uid" stored in session array as variable "step_uid_" + And I request "project/16062437052cd6141881e06088349078/output-document" And the content type is "application/json" Then the response status code should be 400 + + Examples: + + | step_number | + | 4 | @@ -213,6 +223,12 @@ Feature: Project Properties - Step Resources Main Tests | Trigger assigned to Task 2 in type before | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 4 | 22 | 81919273152cd636c665080083928728 | AFTER | | 1 | | Trigger assigned to Task 2 in type After | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 4 | 23 | 56359776552cd6378b38e47080912028 | AFTER | | 2 | | Trigger assigned to Task 2 in type After | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 4 | 24 | 57401970252cd6393531551040242546 | AFTER | | 3 | + | Trigger assigned to Task 2 in type before | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 5 | 25 | 81919273152cd636c665080083928728 | BEFORE | | 1 | + | Trigger assigned to Task 2 in type After | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 5 | 26 | 56359776552cd6378b38e47080912028 | BEFORE | | 2 | + | Trigger assigned to Task 2 in type After | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 5 | 27 | 57401970252cd6393531551040242546 | BEFORE | | 3 | + | Trigger assigned to Task 2 in type before | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 5 | 28 | 81919273152cd636c665080083928728 | AFTER | | 1 | + | Trigger assigned to Task 2 in type After | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 5 | 29 | 56359776552cd6378b38e47080912028 | AFTER | | 2 | + | Trigger assigned to Task 2 in type After | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 5 | 30 | 57401970252cd6393531551040242546 | AFTER | | 3 | Scenario: Trigger assigned to the step when it was already assigned @@ -227,7 +243,7 @@ Scenario: Trigger assigned to the step when it was already assigned """ And I request "project/16062437052cd6141881e06088349078/activity/10163687452cd6234e0dd25086954968/step/50332332752cd9b9a7cc989003652905/trigger" with the key "step_uid" stored in session array Then the response status code should be 400 - And the response status message should have the following text "exists" + And the response status message should have the following text "exist" Scenario Outline: Try delete a trigger when it is assigned to a step @@ -369,7 +385,7 @@ Scenario: Trigger assigned to the step when it was already assigned | Trigger assigned to Task 2 in type After | 16062437052cd6141881e06088349078 | 10163687452cd6234e0dd25086954968 | 2 | 6 | | Trigger assigned to Task 2 in type After | 16062437052cd6141881e06088349078 | 10163687452cd6234e0dd25086954968 | 3 | 0 | | Trigger assigned to Task 2 in type before | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 4 | 0 | - | Trigger assigned to External in type before | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 5 | 0 | + | Trigger assigned to External in type before | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 5 | 6 | Scenario Outline: Unassign all "DynaForm Demo1" from "Task1" and "Task 2" diff --git a/gulliver/system/class.database_mysql.php b/gulliver/system/class.database_mysql.php index fe551636f..cff8ed2ec 100755 --- a/gulliver/system/class.database_mysql.php +++ b/gulliver/system/class.database_mysql.php @@ -98,7 +98,7 @@ class database extends database_base if ($sKeys != '') { $sSQL .= ',PRIMARY KEY(' . substr( $sKeys, 0, - 1 ) . ')'; } - $sSQL .= ')' . $this->sEndLine; + $sSQL .= ')ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci' . $this->sEndLine; return $sSQL; } diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml index 6ea94b52a..65be1a029 100755 --- a/workflow/engine/config/schema.xml +++ b/workflow/engine/config/schema.xml @@ -3004,6 +3004,17 @@ + + + + + + + + + + + @@ -3051,6 +3062,18 @@ OAUTH TABLES DEFINITION -->
+ + + + + + + + + + + + @@ -3058,6 +3081,18 @@
+ + + + + + + + + + + + @@ -3066,6 +3101,18 @@
+ + + + + + + + + + + + @@ -3075,6 +3122,18 @@
+ + + + + + + + + + + + @@ -3082,12 +3141,36 @@
+ + + + + + + + + + + +
+ + + + + + + + + + + + @@ -3098,6 +3181,18 @@ BPMN TABLES DEFINITION -->
+ + + + + + + + + + + + @@ -3117,6 +3212,18 @@
+ + + + + + + + + + + + @@ -3137,6 +3244,18 @@
+ + + + + + + + + + + + @@ -3185,6 +3304,18 @@
+ + + + + + + + + + + + @@ -3209,6 +3340,18 @@
+ + + + + + + + + + + + @@ -3225,6 +3368,18 @@
+ + + + + + + + + + + + @@ -3256,6 +3411,18 @@
+ + + + + + + + + + + + @@ -3286,6 +3453,18 @@
+ + + + + + + + + + + + @@ -3327,6 +3506,18 @@
+ + + + + + + + + + + + @@ -3363,6 +3554,18 @@
+ + + + + + + + + + + + @@ -3392,6 +3595,18 @@
+ + + + + + + + + + + + @@ -3417,6 +3632,18 @@
+ + + + + + + + + + + + @@ -3441,6 +3668,18 @@
+ + + + + + + + + + + + @@ -3462,6 +3701,18 @@
+ + + + + + + + + + + + @@ -3479,6 +3730,18 @@
+ + + + + + + + + + + + @@ -3495,4 +3758,5 @@
- + + \ No newline at end of file diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql index 7c5c6bf4a..0d7fa87db 100755 --- a/workflow/engine/data/mysql/schema.sql +++ b/workflow/engine/data/mysql/schema.sql @@ -1474,7 +1474,7 @@ CREATE TABLE `SESSION_STORAGE` `CLIENT_ADDRESS` VARCHAR(32) default '0.0.0.0', PRIMARY KEY (`ID`), KEY `indexSessionStorage`(`ID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- PROCESS_FILES #----------------------------------------------------------------------------- @@ -1510,7 +1510,7 @@ CREATE TABLE `OAUTH_ACCESS_TOKENS` `EXPIRES` DATETIME NOT NULL, `SCOPE` VARCHAR(2000), PRIMARY KEY (`ACCESS_TOKEN`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- OAUTH_AUTHORIZATION_CODES #----------------------------------------------------------------------------- @@ -1527,7 +1527,7 @@ CREATE TABLE `OAUTH_AUTHORIZATION_CODES` `EXPIRES` DATETIME NOT NULL, `SCOPE` VARCHAR(2000), PRIMARY KEY (`AUTHORIZATION_CODE`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- OAUTH_CLIENTS #----------------------------------------------------------------------------- @@ -1545,7 +1545,7 @@ CREATE TABLE `OAUTH_CLIENTS` `REDIRECT_URI` VARCHAR(2000) NOT NULL, `USR_UID` VARCHAR(32) NOT NULL, PRIMARY KEY (`CLIENT_ID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- OAUTH_REFRESH_TOKENS #----------------------------------------------------------------------------- @@ -1561,7 +1561,7 @@ CREATE TABLE `OAUTH_REFRESH_TOKENS` `EXPIRES` DATETIME NOT NULL, `SCOPE` VARCHAR(2000), PRIMARY KEY (`REFRESH_TOKEN`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- OAUTH_SCOPES #----------------------------------------------------------------------------- @@ -1574,7 +1574,7 @@ CREATE TABLE `OAUTH_SCOPES` `TYPE` VARCHAR(40) NOT NULL, `SCOPE` VARCHAR(2000), `CLIENT_ID` VARCHAR(80) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- PMOAUTH_USER_ACCESS_TOKENS #----------------------------------------------------------------------------- @@ -1589,7 +1589,7 @@ CREATE TABLE `PMOAUTH_USER_ACCESS_TOKENS` `USER_ID` VARCHAR(32), `SESSION_ID` VARCHAR(40) NOT NULL, PRIMARY KEY (`ACCESS_TOKEN`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_PROJECT #----------------------------------------------------------------------------- @@ -1614,7 +1614,7 @@ CREATE TABLE `BPMN_PROJECT` `PRJ_ORIGINAL_SOURCE` MEDIUMTEXT, PRIMARY KEY (`PRJ_UID`), KEY `BPMN_PROJECT_I_1`(`PRJ_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_PROCESS #----------------------------------------------------------------------------- @@ -1638,7 +1638,7 @@ CREATE TABLE `BPMN_PROCESS` CONSTRAINT `fk_bpmn_process_project` FOREIGN KEY (`PRJ_UID`) REFERENCES `BPMN_PROJECT` (`PRJ_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_ACTIVITY #----------------------------------------------------------------------------- @@ -1688,7 +1688,7 @@ CREATE TABLE `BPMN_ACTIVITY` CONSTRAINT `fk_bpmn_activity_process` FOREIGN KEY (`PRO_UID`) REFERENCES `BPMN_PROCESS` (`PRO_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_ARTIFACT #----------------------------------------------------------------------------- @@ -1714,7 +1714,7 @@ CREATE TABLE `BPMN_ARTIFACT` CONSTRAINT `fk_bpmn_artifact_process` FOREIGN KEY (`PRO_UID`) REFERENCES `BPMN_PROCESS` (`PRO_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_DIAGRAM #----------------------------------------------------------------------------- @@ -1734,7 +1734,7 @@ CREATE TABLE `BPMN_DIAGRAM` CONSTRAINT `fk_bpmn_diagram_project` FOREIGN KEY (`PRJ_UID`) REFERENCES `BPMN_PROJECT` (`PRJ_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_BOUND #----------------------------------------------------------------------------- @@ -1767,7 +1767,7 @@ CREATE TABLE `BPMN_BOUND` CONSTRAINT `fk_bpmn_bound_diagram` FOREIGN KEY (`DIA_UID`) REFERENCES `BPMN_DIAGRAM` (`DIA_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_DATA #----------------------------------------------------------------------------- @@ -1799,7 +1799,7 @@ CREATE TABLE `BPMN_DATA` CONSTRAINT `fk_bpmn_data_project` FOREIGN KEY (`PRJ_UID`) REFERENCES `BPMN_PROJECT` (`PRJ_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_EVENT #----------------------------------------------------------------------------- @@ -1842,7 +1842,7 @@ CREATE TABLE `BPMN_EVENT` CONSTRAINT `fk_bpmn_event_process` FOREIGN KEY (`PRO_UID`) REFERENCES `BPMN_PROCESS` (`PRO_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_FLOW #----------------------------------------------------------------------------- @@ -1880,7 +1880,7 @@ CREATE TABLE `BPMN_FLOW` CONSTRAINT `fk_bpmn_flow_diagram` FOREIGN KEY (`DIA_UID`) REFERENCES `BPMN_DIAGRAM` (`DIA_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_GATEWAY #----------------------------------------------------------------------------- @@ -1911,7 +1911,7 @@ CREATE TABLE `BPMN_GATEWAY` CONSTRAINT `fk_bpmn_gateway_process` FOREIGN KEY (`PRO_UID`) REFERENCES `BPMN_PROCESS` (`PRO_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_LANESET #----------------------------------------------------------------------------- @@ -1938,7 +1938,7 @@ CREATE TABLE `BPMN_LANESET` CONSTRAINT `fk_bpmn_laneset_process` FOREIGN KEY (`PRO_UID`) REFERENCES `BPMN_PROCESS` (`PRO_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_LANE #----------------------------------------------------------------------------- @@ -1964,7 +1964,7 @@ CREATE TABLE `BPMN_LANE` CONSTRAINT `fk_bpmn_lane_laneset` FOREIGN KEY (`LNS_UID`) REFERENCES `BPMN_LANESET` (`LNS_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_PARTICIPANT #----------------------------------------------------------------------------- @@ -1989,7 +1989,7 @@ CREATE TABLE `BPMN_PARTICIPANT` CONSTRAINT `fk_bpmn_participant_project` FOREIGN KEY (`PRJ_UID`) REFERENCES `BPMN_PROJECT` (`PRJ_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_EXTENSION #----------------------------------------------------------------------------- @@ -2010,7 +2010,7 @@ CREATE TABLE `BPMN_EXTENSION` CONSTRAINT `fk_bpmn_extension_project` FOREIGN KEY (`PRJ_UID`) REFERENCES `BPMN_PROJECT` (`PRJ_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8' ; #----------------------------------------------------------------------------- #-- BPMN_DOCUMENTATION #----------------------------------------------------------------------------- @@ -2031,6 +2031,6 @@ CREATE TABLE `BPMN_DOCUMENTATION` CONSTRAINT `fk_bpmn_documentation_project` FOREIGN KEY (`PRJ_UID`) REFERENCES `BPMN_PROJECT` (`PRJ_UID`) -)ENGINE=InnoDB ; +)ENGINE=InnoDB DEFAULT CHARSET='utf8'; # This restores the fkey checks, after having unset them earlier SET FOREIGN_KEY_CHECKS = 1;