From ab04aa6e4d051beb465d3f6f702f8fe62ef1bf8b Mon Sep 17 00:00:00 2001
From: Daniel Rojas <daniel.rojas@colosa.com>
Date: Wed, 12 Mar 2014 13:25:38 -0400
Subject: [PATCH 1/2] Se modifica end point de validacion de usuario mediante
 WS, no es necesario enviar act_uid en PROJECT USERS

---
 .../engine/src/BusinessModel/ProjectUser.php  | 25 ++++++++++++++-----
 .../Api/ProcessMaker/Project/ProjectUsers.php |  9 +++----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/workflow/engine/src/BusinessModel/ProjectUser.php b/workflow/engine/src/BusinessModel/ProjectUser.php
index 711259f72..ad2e58d07 100644
--- a/workflow/engine/src/BusinessModel/ProjectUser.php
+++ b/workflow/engine/src/BusinessModel/ProjectUser.php
@@ -202,13 +202,14 @@ class ProjectUser
      * Return the user that can start a task
      *
      * @param string $sProcessUID {@min 32} {@max 32}
+     * @param string $sActivityUID {@min 32} {@max 32}
      * @param array  $oData
      *
      * return array
      *
      * @access public
      */
-    public function postProjectWsUserCanStartTask($sProcessUID, $oData)
+    public function postProjectWsUserCanStartTask($sProcessUID, $sActivityUID, $oData)
     {
         try {
             $oProcess = \ProcessPeer::retrieveByPK( $sProcessUID );
@@ -220,8 +221,7 @@ class ProjectUser
              * validates if the username and password are valid data and if the user assigned
              * to the webentry has the rights and persmissions required
              */
-            $sPRO_UID = $sProcessUID;
-            $sTASKS = $oData['act_uid'];
+            $sTASKS = $sActivityUID;
             $sWS_USER = trim( $oData['username'] );
             $sWS_PASS = trim( $oData['password'] );
             if (\G::is_https()) {
@@ -265,9 +265,14 @@ class ProjectUser
                 $oCriteria->addSelectColumn( \UsersPeer::USR_USERNAME );
                 $oCriteria->addSelectColumn( \UsersPeer::USR_FIRSTNAME );
                 $oCriteria->addSelectColumn( \UsersPeer::USR_LASTNAME );
+                $oCriteria->addSelectColumn( \TaskPeer::PRO_UID );
                 $oCriteria->addJoin( \TaskUserPeer::USR_UID, \UsersPeer::USR_UID, \Criteria::LEFT_JOIN );
-                $oCriteria->add( \TaskUserPeer::TAS_UID, $sTASKS );
+                $oCriteria->addJoin( \TaskUserPeer::TAS_UID, \TaskPeer::TAS_UID, \Criteria::LEFT_JOIN );
+                if ($sTASKS) {
+                    $oCriteria->add( \TaskUserPeer::TAS_UID, $sTASKS );
+                }
                 $oCriteria->add( \UsersPeer::USR_USERNAME, $sWS_USER );
+                $oCriteria->add( \TaskPeer::PRO_UID, $sProcessUID );
                 $userIsAssigned = \TaskUserPeer::doCount( $oCriteria );
                 // if the user is not assigned directly, maybe a have the task a group with the user
                 if ($userIsAssigned < 1) {
@@ -278,11 +283,19 @@ class ProjectUser
                     $oCriteria->addSelectColumn( \UsersPeer::USR_LASTNAME );
                     $oCriteria->addJoin( \UsersPeer::USR_UID, \GroupUserPeer::USR_UID, \Criteria::LEFT_JOIN );
                     $oCriteria->addJoin( \GroupUserPeer::GRP_UID, \TaskUserPeer::USR_UID, \Criteria::LEFT_JOIN );
-                    $oCriteria->add( \TaskUserPeer::TAS_UID, $sTASKS );
+                    $oCriteria->addJoin( \TaskUserPeer::TAS_UID, \TaskPeer::TAS_UID, \Criteria::LEFT_JOIN );
+                    if ($sTASKS) {
+                        $oCriteria->add( \TaskUserPeer::TAS_UID, $sTASKS );
+                    }
                     $oCriteria->add( \UsersPeer::USR_USERNAME, $sWS_USER );
+                    $oCriteria->add( \TaskPeer::PRO_UID, $sProcessUID );
                     $userIsAssigned = \GroupUserPeer::doCount( $oCriteria );
                     if (! ($userIsAssigned >= 1)) {
-                        throw (new \Exception( "The `usr_uid` `" . $sWS_USER . "` doesn't have the activity `act_uid` `" . $sTASKS . "` assigned"));
+                        if ($sTASKS) {
+                            throw (new \Exception( "The `usr_uid` `" . $sWS_USER . "` doesn't have the activity `act_uid` `" . $sTASKS . "` assigned"));
+                        } else {
+                            throw (new \Exception( "The `usr_uid` `" . $sWS_USER . "` doesn't have an activity assigned"));
+                        }
                     }
                 }
                 $oDataset = \TaskUserPeer::doSelectRS($oCriteria);
diff --git a/workflow/engine/src/Services/Api/ProcessMaker/Project/ProjectUsers.php b/workflow/engine/src/Services/Api/ProcessMaker/Project/ProjectUsers.php
index d27bc47bb..f16c86ac2 100644
--- a/workflow/engine/src/Services/Api/ProcessMaker/Project/ProjectUsers.php
+++ b/workflow/engine/src/Services/Api/ProcessMaker/Project/ProjectUsers.php
@@ -71,16 +71,17 @@ class ProjectUsers extends Api
 
     /**
      * @param string $prj_uid {@min 32} {@max 32}
+     * @param string $act_uid {@min 32} {@max 32}
      * @param wsUserCanStartTaskStructure $request_data
      *
      * @url POST /:prj_uid/ws/user/can-start-task
      */
-    public function doPostProjectWsUserCanStartTask($prj_uid, wsUserCanStartTaskStructure $request_data =  null)
+    public function doPostProjectWsUserCanStartTask($prj_uid, $act_uid = null, wsUserCanStartTaskStructure $request_data =  null)
     {
         try {
             $request_data = (array)($request_data);
             $user = new \BusinessModel\ProjectUser();
-            $objectData = $user->postProjectWsUserCanStartTask($prj_uid, $request_data);
+            $objectData = $user->postProjectWsUserCanStartTask($prj_uid, $act_uid, $request_data);
             //Response
             $response = $objectData;
         } catch (\Exception $e) {
@@ -93,10 +94,6 @@ class ProjectUsers extends Api
 
 class wsUserCanStartTaskStructure
 {
-    /**
-     * @var string {@from body} {@min 32} {@max 32}
-     */
-    public $act_uid;
     /**
      * @var string {@from body}
      */

From da684d900e1218256b80e0d4c1f1f8f708ae39e5 Mon Sep 17 00:00:00 2001
From: Wendy Nestor <wendy@colosa.com>
Date: Wed, 12 Mar 2014 15:16:15 -0400
Subject: [PATCH 2/2] cambio de folder y avance en department

---
 .../calendar/basic_sequence_calendar.feature  |   0
 .../calendar/main_tests_calendar.feature      |   0
 .../calendar/negative_tests_calendar.feature  |   0
 .../category/basic_sequence_category.feature  |   0
 .../category/main_tests_category.feature      |   0
 .../category/negative_tests_category.feature  |   0
 .../basic_sequence_department.feature         | 120 +++++++++++++
 .../departments/main_tests_department.feature | 169 ++++++++++++++++++
 .../negative_tests_department.feature         |  28 +++
 .../pm_group/basic_sequence_pm_group.feature  |   0
 .../pm_group/main_tests_pm_group.feature      |   0
 .../pm_group/negative_tests_pm_group.feature  |   0
 .../pm_user/basic_sequence_pm_user.feature    |   0
 .../users}/pm_user/main_tests_pm_user.feature |   0
 .../pm_user/negative_tests_pm_user.feature    |   0
 .../basic_sequence_case_note.feature          |   0
 .../case note/main_tests_case_note.feature    |   0
 .../negative_tests_case_note.feature          |   0
 .../basic_sequence_case_variables.feature     |   0
 .../main_tests_case_variables.feature         |   0
 .../negative_tests_case_variables.feature     |   0
 .../basic_sequence_cases_actions_7_12.feature |   0
 .../main_tests_cases_actions_7_12.feature     |   0
 .../negative_tests_cases_actions_7_12.feature |   0
 ...basic_sequence_cases_actions_13_17.feature |   0
 .../main_tests_cases_actions_13_17.feature    |   0
 ...negative_tests_cases_actions_13_17.feature |   0
 .../basic_sequence_cases_lists_1_6.feature    |   0
 .../main_tests_cases_lists_1_6.feature        |   0
 .../negative_tests_cases_lists_1_6.feature    |   0
 ...basic_sequence_input_document_case.feature |   0
 .../main_tests_input_document_case.feature    |   0
 ...negative_tests_input_document_case.feature |   0
 ...asic_sequence_output_document_case.feature |   0
 ...main_sequence_output_document_case.feature |   0
 ...egative_tests_output_document_case.feature |   0
 .../activity/main_tests_activity.feature      |   0
 .../activity/negative_tests_activity.feature  |   0
 .../main_tests_adhoc_assignee.feature         |   0
 .../negative_tests_adhoc_assignee.feature     |   0
 .../assignee/activity_assignee.feature        |   0
 .../assignee/main_tests_assignee.feature      |   0
 .../assignee/negative_tests_assignee.feature  |   0
 .../basic_sequence_case_scheduler.feature     |   0
 .../main_tests_case_scheduler.feature         |   0
 .../negative_tests_case_scheduler.feature     |   0
 .../basic_sequence_case_tracker.feature       |   0
 .../main_tests_case_tracker.feature           |   0
 .../negative_tests_case_tracker.feature       |   0
 ...asic_sequence_database_connections.feature |   0
 .../main_tests_database_connections.feature   |   0
 ...egative_tests_database_connections.feature |   0
 .../dynaforms/basic_sequence_dynaform.feature |   0
 .../dynaforms/main_tests_dynaform.feature     |   0
 .../dynaforms/negative_tests_dynaform.feature |   0
 .../events/basic_sequence_event.feature       |   0
 .../events/main_tests_event.feature           |   0
 .../events/negative_tests_event.feature       |   0
 .../basic_sequence_files_manager.feature      |   0
 .../main_test_files_manager.feature           |  37 ++--
 .../negative_tests_files_manager.feature      |   0
 .../basic_sequence_input.feature              |   0
 .../input_documents/main_tests_input.feature  |   0
 .../negative_tests_input.feature              |   0
 .../main_tests_output.feature                 |   0
 .../negative_tests_output.feature             |   0
 .../process/basic_sequence_process.feature    |   0
 .../process/main_tests_process.feature        |   0
 .../process/negative_tests_process.feature    |   0
 .../basic_sequence_permissions.feature        |   0
 .../main_tests_permissions.feature            |   0
 .../negative_tests_permissions.feature        |   0
 .../main_tests_supervisor.feature             |   0
 .../negative_tests_supervisor.feature         |   0
 .../process_variables/basic_sequence.feature  |   0
 .../main_tests_process_variables.feature      |   0
 .../negative_tests_process_variables.feature  |   0
 .../{ => projects}/project/project.feature    |   0
 .../basic_sequence_project_user.feature       |   0
 .../main_tests_project_user.feature           |   0
 .../negative_tests_project_user.feature       |   0
 .../basic_sequence_report_tables.feature      |   0
 .../main_tests_report_tables.feature          |   0
 .../negative_tests_report_tables.feature      |   0
 .../step/basic_sequence_step.feature          |   0
 .../main_step_update_move_position.feature    |   0
 .../step/main_tests_step.feature              |  37 +++-
 .../step/negative_tests_step.feature          |   0
 .../step/reordenamiento.feature               |   0
 .../step/step_update_move_position.feature    |   0
 .../basic_sequence_sub_process.feature        |   0
 .../main_tests_sub_process.feature            |   0
 .../negative_tests_sub_process.feature        |   0
 .../basic_sequence_trigger_wizard.feature     |   0
 .../main_tests_trigger_wizards.feature        |   0
 .../negative_tests_triggers_wizards.feature   |   0
 .../triggers/main_tests_triggers.feature      |   0
 .../triggers/negative_tests_triggers.feature  |   0
 .../basic_sequence_web_entry.feature          |   0
 .../web_entry/main_tests_web_entry.feature    |   0
 .../negative_tests_web_entry.feature          |   0
 .../remove_users_and_web_entry.feature        |   0
 102 files changed, 371 insertions(+), 20 deletions(-)
 create mode 100644 features/backend/admin_setup/settings/calendar/basic_sequence_calendar.feature
 create mode 100644 features/backend/admin_setup/settings/calendar/main_tests_calendar.feature
 create mode 100644 features/backend/admin_setup/settings/calendar/negative_tests_calendar.feature
 create mode 100644 features/backend/admin_setup/settings/category/basic_sequence_category.feature
 create mode 100644 features/backend/admin_setup/settings/category/main_tests_category.feature
 create mode 100644 features/backend/admin_setup/settings/category/negative_tests_category.feature
 create mode 100644 features/backend/admin_setup/users/departments/basic_sequence_department.feature
 create mode 100644 features/backend/admin_setup/users/departments/main_tests_department.feature
 create mode 100644 features/backend/admin_setup/users/departments/negative_tests_department.feature
 rename features/backend/{ => admin_setup/users}/pm_group/basic_sequence_pm_group.feature (100%)
 rename features/backend/{ => admin_setup/users}/pm_group/main_tests_pm_group.feature (100%)
 rename features/backend/{ => admin_setup/users}/pm_group/negative_tests_pm_group.feature (100%)
 rename features/backend/{ => admin_setup/users}/pm_user/basic_sequence_pm_user.feature (100%)
 rename features/backend/{ => admin_setup/users}/pm_user/main_tests_pm_user.feature (100%)
 rename features/backend/{ => admin_setup/users}/pm_user/negative_tests_pm_user.feature (100%)
 create mode 100644 features/backend/application_cases/case note/basic_sequence_case_note.feature
 create mode 100644 features/backend/application_cases/case note/main_tests_case_note.feature
 create mode 100644 features/backend/application_cases/case note/negative_tests_case_note.feature
 create mode 100644 features/backend/application_cases/case variables/basic_sequence_case_variables.feature
 create mode 100644 features/backend/application_cases/case variables/main_tests_case_variables.feature
 create mode 100644 features/backend/application_cases/case variables/negative_tests_case_variables.feature
 create mode 100644 features/backend/application_cases/cases actions1 7-12/basic_sequence_cases_actions_7_12.feature
 create mode 100644 features/backend/application_cases/cases actions1 7-12/main_tests_cases_actions_7_12.feature
 create mode 100644 features/backend/application_cases/cases actions1 7-12/negative_tests_cases_actions_7_12.feature
 create mode 100644 features/backend/application_cases/cases actions2 13-17/basic_sequence_cases_actions_13_17.feature
 create mode 100644 features/backend/application_cases/cases actions2 13-17/main_tests_cases_actions_13_17.feature
 create mode 100644 features/backend/application_cases/cases actions2 13-17/negative_tests_cases_actions_13_17.feature
 create mode 100644 features/backend/application_cases/cases lists 1-6/basic_sequence_cases_lists_1_6.feature
 create mode 100644 features/backend/application_cases/cases lists 1-6/main_tests_cases_lists_1_6.feature
 create mode 100644 features/backend/application_cases/cases lists 1-6/negative_tests_cases_lists_1_6.feature
 create mode 100644 features/backend/application_cases/input documents_case/basic_sequence_input_document_case.feature
 create mode 100644 features/backend/application_cases/input documents_case/main_tests_input_document_case.feature
 create mode 100644 features/backend/application_cases/input documents_case/negative_tests_input_document_case.feature
 create mode 100644 features/backend/application_cases/output document_case/basic_sequence_output_document_case.feature
 create mode 100644 features/backend/application_cases/output document_case/main_sequence_output_document_case.feature
 create mode 100644 features/backend/application_cases/output document_case/negative_tests_output_document_case.feature
 rename features/backend/{ => projects}/activity/main_tests_activity.feature (100%)
 rename features/backend/{ => projects}/activity/negative_tests_activity.feature (100%)
 rename features/backend/{ => projects}/adhoc_assignee/main_tests_adhoc_assignee.feature (100%)
 rename features/backend/{ => projects}/adhoc_assignee/negative_tests_adhoc_assignee.feature (100%)
 rename features/backend/{ => projects}/assignee/activity_assignee.feature (100%)
 rename features/backend/{ => projects}/assignee/main_tests_assignee.feature (100%)
 rename features/backend/{ => projects}/assignee/negative_tests_assignee.feature (100%)
 rename features/backend/{ => projects}/case_scheduler/basic_sequence_case_scheduler.feature (100%)
 rename features/backend/{ => projects}/case_scheduler/main_tests_case_scheduler.feature (100%)
 rename features/backend/{ => projects}/case_scheduler/negative_tests_case_scheduler.feature (100%)
 rename features/backend/{ => projects}/case_tracker/basic_sequence_case_tracker.feature (100%)
 rename features/backend/{ => projects}/case_tracker/main_tests_case_tracker.feature (100%)
 rename features/backend/{ => projects}/case_tracker/negative_tests_case_tracker.feature (100%)
 rename features/backend/{ => projects}/database_connections/basic_sequence_database_connections.feature (100%)
 rename features/backend/{ => projects}/database_connections/main_tests_database_connections.feature (100%)
 rename features/backend/{ => projects}/database_connections/negative_tests_database_connections.feature (100%)
 rename features/backend/{ => projects}/dynaforms/basic_sequence_dynaform.feature (100%)
 rename features/backend/{ => projects}/dynaforms/main_tests_dynaform.feature (100%)
 rename features/backend/{ => projects}/dynaforms/negative_tests_dynaform.feature (100%)
 rename features/backend/{ => projects}/events/basic_sequence_event.feature (100%)
 rename features/backend/{ => projects}/events/main_tests_event.feature (100%)
 rename features/backend/{ => projects}/events/negative_tests_event.feature (100%)
 rename features/backend/{ => projects}/files_manager/basic_sequence_files_manager.feature (100%)
 rename features/backend/{ => projects}/files_manager/main_test_files_manager.feature (87%)
 rename features/backend/{ => projects}/files_manager/negative_tests_files_manager.feature (100%)
 rename features/backend/{ => projects}/input_documents/basic_sequence_input.feature (100%)
 rename features/backend/{ => projects}/input_documents/main_tests_input.feature (100%)
 rename features/backend/{ => projects}/input_documents/negative_tests_input.feature (100%)
 rename features/backend/{ => projects}/output_documents/main_tests_output.feature (100%)
 rename features/backend/{ => projects}/output_documents/negative_tests_output.feature (100%)
 rename features/backend/{ => projects}/process/basic_sequence_process.feature (100%)
 rename features/backend/{ => projects}/process/main_tests_process.feature (100%)
 rename features/backend/{ => projects}/process/negative_tests_process.feature (100%)
 rename features/backend/{ => projects}/process_permissions/basic_sequence_permissions.feature (100%)
 rename features/backend/{ => projects}/process_permissions/main_tests_permissions.feature (100%)
 rename features/backend/{ => projects}/process_permissions/negative_tests_permissions.feature (100%)
 rename features/backend/{ => projects}/process_supervisor/main_tests_supervisor.feature (100%)
 rename features/backend/{ => projects}/process_supervisor/negative_tests_supervisor.feature (100%)
 rename features/backend/{ => projects}/process_variables/basic_sequence.feature (100%)
 rename features/backend/{ => projects}/process_variables/main_tests_process_variables.feature (100%)
 rename features/backend/{ => projects}/process_variables/negative_tests_process_variables.feature (100%)
 rename features/backend/{ => projects}/project/project.feature (100%)
 rename features/backend/{ => projects}/project_user/basic_sequence_project_user.feature (100%)
 rename features/backend/{ => projects}/project_user/main_tests_project_user.feature (100%)
 rename features/backend/{ => projects}/project_user/negative_tests_project_user.feature (100%)
 rename features/backend/{ => projects}/report_tables/basic_sequence_report_tables.feature (100%)
 rename features/backend/{ => projects}/report_tables/main_tests_report_tables.feature (100%)
 rename features/backend/{ => projects}/report_tables/negative_tests_report_tables.feature (100%)
 rename features/backend/{ => projects}/step/basic_sequence_step.feature (100%)
 rename features/backend/{ => projects}/step/main_step_update_move_position.feature (100%)
 rename features/backend/{ => projects}/step/main_tests_step.feature (94%)
 rename features/backend/{ => projects}/step/negative_tests_step.feature (100%)
 rename features/backend/{ => projects}/step/reordenamiento.feature (100%)
 rename features/backend/{ => projects}/step/step_update_move_position.feature (100%)
 rename features/backend/{ => projects}/sub_process/basic_sequence_sub_process.feature (100%)
 rename features/backend/{ => projects}/sub_process/main_tests_sub_process.feature (100%)
 rename features/backend/{ => projects}/sub_process/negative_tests_sub_process.feature (100%)
 rename features/backend/{ => projects}/trigger_wizard/basic_sequence_trigger_wizard.feature (100%)
 rename features/backend/{ => projects}/trigger_wizard/main_tests_trigger_wizards.feature (100%)
 rename features/backend/{ => projects}/trigger_wizard/negative_tests_triggers_wizards.feature (100%)
 rename features/backend/{ => projects}/triggers/main_tests_triggers.feature (100%)
 rename features/backend/{ => projects}/triggers/negative_tests_triggers.feature (100%)
 rename features/backend/{ => projects}/web_entry/basic_sequence_web_entry.feature (100%)
 rename features/backend/{ => projects}/web_entry/main_tests_web_entry.feature (100%)
 rename features/backend/{ => projects}/web_entry/negative_tests_web_entry.feature (100%)
 rename features/backend/{ => projects}/web_entry/remove_users_and_web_entry.feature (100%)

diff --git a/features/backend/admin_setup/settings/calendar/basic_sequence_calendar.feature b/features/backend/admin_setup/settings/calendar/basic_sequence_calendar.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/admin_setup/settings/calendar/main_tests_calendar.feature b/features/backend/admin_setup/settings/calendar/main_tests_calendar.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/admin_setup/settings/calendar/negative_tests_calendar.feature b/features/backend/admin_setup/settings/calendar/negative_tests_calendar.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/admin_setup/settings/category/basic_sequence_category.feature b/features/backend/admin_setup/settings/category/basic_sequence_category.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/admin_setup/settings/category/main_tests_category.feature b/features/backend/admin_setup/settings/category/main_tests_category.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/admin_setup/settings/category/negative_tests_category.feature b/features/backend/admin_setup/settings/category/negative_tests_category.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/admin_setup/users/departments/basic_sequence_department.feature b/features/backend/admin_setup/users/departments/basic_sequence_department.feature
new file mode 100644
index 000000000..88fd626ea
--- /dev/null
+++ b/features/backend/admin_setup/users/departments/basic_sequence_department.feature
@@ -0,0 +1,120 @@
+@ProcessMakerMichelangelo @RestAPI
+Feature: Departaments
+Requirements:
+    a workspace with the 16 departments created already loaded
+
+Background:
+    Given that I have a valid access_token
+
+
+    Scenario: List all Departaments in the workspace when exactly are 16 departaments created
+        Given I request "department"
+        Then the response status code should be 200
+        And the response charset is "UTF-8"
+        And the type is "array"
+        And the response has 16 record
+
+    
+    Scenario: Get a single department of de Sales Division department 
+        Given I request "department/12921473252d567506e6e63079240767"
+        Then the response status code should be 200
+        And the response charset is "UTF-8"
+        And the type is "object"
+        And the "dep_parent" property equals ""
+        And the "dep_title" property equals "Sales Division"
+        And the "dep_status" property equals "ACTIVE"
+        And the "dep_manager" property equals ""
+        And the "dep_ldap_dn" property equals ""
+        And the "dep_last" property equals "0"
+        And the "dep_manager_username" property equals ""
+        And the "dep_manager_lastname" property equals ""
+        And the "has_children" property equals "0"
+        
+  
+    Scenario: Create a new department in the workspace
+        Given POST this data:
+            """
+            {
+
+                "dep_title" : "TestDepartment",
+                "dep_parent" : "",
+                "dep_status" : "ACTIVE"
+
+            }
+            """
+        And I request "department"
+        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"
+        And store "dep_uid" in session array
+    
+    
+    Scenario: Update a department created in this script
+        Given PUT this data:
+            """
+            {
+                "dep_title" : "TestDepartment Update",
+                "dep_status" : "INACTIVE"
+            }
+            """
+        And that I want to update a resource with the key "dep_uid" stored in session array
+        And I request "department"
+        Then the response status code should be 200
+        And the content type is "application/json"
+        And the response charset is "UTF-8"
+        And the type is "object"
+
+
+
+    Scenario: Get a single department after update of the department created of this script 
+        Given that I want to get a resource with the key "dep_uid" stored in session array
+        Given I request "department"
+        Then the response status code should be 200
+        And the response charset is "UTF-8"
+        And the "dep_title" property equals "TestDepartment Update"
+        And the "dep_status" property equals "INACTIVE"
+
+
+   #Scenario: Assign user to department created in this script
+   #     Given POST this data:
+    #        """
+     #       {
+
+             #  "dep_title" : "TestDepartment",
+              #  "dep_parent" : "",git 
+               # "dep_status" : "ACTIVE"
+
+            #}
+            #"""
+        #And I request "department/<dep_uid>/assign-user/62511352152d5673bba9cd4062743508 "
+        #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"
+        #And store "dep_uid" in session array
+
+
+    Scenario: List all Departaments in the workspace when exactly are 16 departaments created
+        Given I request "department"
+        Then the response status code should be 200
+        And the response charset is "UTF-8"
+        And the type is "array"
+        And the response has 17 record
+
+
+    Scenario: Delete a department created in this script
+        Given that I want to delete a resource with the key "dep_uid" stored in session array
+        And I request "department"
+        Then the response status code should be 200
+        And the content type is "application/json"
+        And the response charset is "UTF-8"
+        And the type is "object"
+
+
+    Scenario: List all Departaments in the workspace when exactly are 16 departaments created
+        Given I request "department"
+        Then the response status code should be 200
+        And the response charset is "UTF-8"
+        And the type is "array"
+        And the response has 16 record
\ No newline at end of file
diff --git a/features/backend/admin_setup/users/departments/main_tests_department.feature b/features/backend/admin_setup/users/departments/main_tests_department.feature
new file mode 100644
index 000000000..ea03bb4f6
--- /dev/null
+++ b/features/backend/admin_setup/users/departments/main_tests_department.feature
@@ -0,0 +1,169 @@
+@ProcessMakerMichelangelo @RestAPI
+Feature: Departaments Main Tests
+Requirements:
+    a workspace with the 16 departments created already loaded
+
+Background:
+    Given that I have a valid access_token
+
+
+    Scenario: List all Departaments in the workspace when exactly are 16 departaments created
+        Given I request "department"
+        Then the response status code should be 200
+        And the response charset is "UTF-8"
+        And the type is "array"
+        And the response has 16 record
+
+    
+    Scenario: Get a single department of de Sales Division department 
+        Given I request "department/12921473252d567506e6e63079240767"
+        Then the response status code should be 200
+        And the response charset is "UTF-8"
+        And the type is "object"
+        And the "dep_parent" property equals ""
+        And the "dep_title" property equals "Sales Division"
+        And the "dep_status" property equals "ACTIVE"
+        And the "dep_manager" property equals ""
+        And the "dep_ldap_dn" property equals ""
+        And the "dep_last" property equals "0"
+        And the "dep_manager_username" property equals ""
+        And the "dep_manager_lastname" property equals ""
+        And the "has_children" property equals "0"
+        
+  
+    Scenario Outline: Create a new departments in the workspace
+        Given POST this data:
+            """
+            {
+
+                "dep_title" : "<dep_title>",
+                "dep_parent" : "<dep_parent>",
+                "dep_status" : "<dep_status>"
+
+            }
+            """
+        And I request "department"
+        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"
+        And store "dep_uid" in session array as variable "dep_uid_<dep_uid_number>"
+
+        Examples:
+
+        | test_description                                | dep_uid_number | dep_title           | dep_parent                       | dep_status |
+        | Created a department padre with status active   | 1              | Department 1        |                                  | ACTIVE     |
+        | Created a department hijo with status active    | 2              | Department 2        | 28036037252d56752770585009591640 | ACTIVE     |
+        | Created a department padre with status inactive | 3              | Department 3        |                                  | INACTIVE   |
+        | Created a department hijo with status inactive  | 4              | Department 4        | 28036037252d56752770585009591640 | INACTIVE   |
+        | Created a department with character special     | 5              | Department 5!@#$%^& |                                  | ACTIVE     |
+
+
+    Scenario: Create a department with same name
+        Given POST this data:
+            """
+            {
+
+                "dep_title" : "Department 1",
+                "dep_parent" : "",
+                "dep_status" : "ACTIVE"
+
+            }
+            """
+        And I request "department"
+        Then the response status code should be 400
+        And the response status message should have the following text "exist"
+    
+    
+    Scenario: List all Departaments in the workspace when exactly are 21 departaments created
+        Given I request "department"
+        Then the response status code should be 200
+        And the response charset is "UTF-8"
+        And the type is "array"
+        And the response has 19 record
+
+           
+    Scenario Outline: Update a department created in this script
+        Given PUT this data:
+            """
+            {
+
+                "dep_title" : "<dep_title>",
+                "dep_status" : "<dep_status>"
+
+            }
+            """
+        And that I want to update a resource with the key "dep_uid" stored in session array as variable "dep_uid_<dep_uid_number>"
+        And I request "department"
+        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 "object"
+
+        Examples:
+
+        | test_description                                | dep_uid_number | dep_title           | dep_status |
+        | Update of field title and status of department  | 1              | Department 1 UPDATE | INACTIVE   |
+        | Update of field title and status of department  | 3              | Department 3 UPDATE | ACTIVE     |
+        
+
+    Scenario Outline: Get a single department after update of the department created of this script 
+        Given that I want to get a resource with the key "dep_uid" stored in session array as variable "dep_uid_<dep_uid_number>"
+        And I request "department"
+        Then the response status code should be 200
+        And the content type is "application/json"
+        And the response charset is "UTF-8"
+        And the type is "object"
+        And that "dep_title" is set to "<dep_title>"
+        And that "dep_status" is set to "<dep_status>"
+
+        Examples:
+
+        | dep_uid_number | dep_title            | dep_status |
+        | 1              | Department 1 UPDATE  | INACTIVE   |
+        | 3              | Department 3 UPDATE  | ACTIVE     |
+
+
+     #Scenario: Assign user to department created in this script
+   #     Given POST this data:
+    #        """
+     #       {
+
+             #  "dep_title" : "TestDepartment",
+              #  "dep_parent" : "",git 
+               # "dep_status" : "ACTIVE"
+
+            #}
+            #"""
+        #And I request "department/<dep_uid>/assign-user/62511352152d5673bba9cd4062743508 "
+        #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"
+        #And store "dep_uid" in session array
+
+   
+    Scenario Outline: Delete a department created in this script
+        Given that I want to delete a resource with the key "dep_uid" stored in session array as variable "dep_uid_<dep_uid_number>"
+        And I request "department"
+        Then the response status code should be 200
+        And the content type is "application/json"
+        And the response charset is "UTF-8"
+        And the type is "object"
+
+        Examples:
+
+        | dep_uid_number |
+        | 1              |
+        | 2              |
+        | 3              |
+        | 4              |
+        | 5              |
+
+
+    Scenario: List all Departaments in the workspace when exactly are 16 departaments created
+        Given I request "department"
+        Then the response status code should be 200
+        And the response charset is "UTF-8"
+        And the type is "array"
+        And the response has 16 record
\ No newline at end of file
diff --git a/features/backend/admin_setup/users/departments/negative_tests_department.feature b/features/backend/admin_setup/users/departments/negative_tests_department.feature
new file mode 100644
index 000000000..11a98b6d9
--- /dev/null
+++ b/features/backend/admin_setup/users/departments/negative_tests_department.feature
@@ -0,0 +1,28 @@
+@ProcessMakerMichelangelo @RestAPI
+Feature: Departments Negative Tests
+
+
+Background:
+    Given that I have a valid access_token
+
+Scenario Outline: Create a new departments in the workspace with bad parameters (negative tests)
+        Given POST this data:
+            """
+            {
+
+                "dep_title" : "<dep_title>",
+                "dep_parent" : "<dep_parent>",
+                "dep_status" : "<dep_status>"
+
+            }
+            """
+        And I request "department"
+        Then the response status code should be <error_code>
+        And the response status message should have the following text "<error_message>"
+
+        Examples:
+
+        | test_description                   | dep_title           | dep_parent                       | dep_status | error_code | error_message |
+        | without dep_title                  |                     |                                  | ACTIVE     | 400        | dep_title     |
+        | Invalid dep_parent                 | Department 2        | 28036030000000000000005009591640 | ACTIVE     | 400        | dep_parent    |
+        | Invalid dep_status                 | Department 3        |                                  | TRIGGER    | 400        | dep_status    |
\ No newline at end of file
diff --git a/features/backend/pm_group/basic_sequence_pm_group.feature b/features/backend/admin_setup/users/pm_group/basic_sequence_pm_group.feature
similarity index 100%
rename from features/backend/pm_group/basic_sequence_pm_group.feature
rename to features/backend/admin_setup/users/pm_group/basic_sequence_pm_group.feature
diff --git a/features/backend/pm_group/main_tests_pm_group.feature b/features/backend/admin_setup/users/pm_group/main_tests_pm_group.feature
similarity index 100%
rename from features/backend/pm_group/main_tests_pm_group.feature
rename to features/backend/admin_setup/users/pm_group/main_tests_pm_group.feature
diff --git a/features/backend/pm_group/negative_tests_pm_group.feature b/features/backend/admin_setup/users/pm_group/negative_tests_pm_group.feature
similarity index 100%
rename from features/backend/pm_group/negative_tests_pm_group.feature
rename to features/backend/admin_setup/users/pm_group/negative_tests_pm_group.feature
diff --git a/features/backend/pm_user/basic_sequence_pm_user.feature b/features/backend/admin_setup/users/pm_user/basic_sequence_pm_user.feature
similarity index 100%
rename from features/backend/pm_user/basic_sequence_pm_user.feature
rename to features/backend/admin_setup/users/pm_user/basic_sequence_pm_user.feature
diff --git a/features/backend/pm_user/main_tests_pm_user.feature b/features/backend/admin_setup/users/pm_user/main_tests_pm_user.feature
similarity index 100%
rename from features/backend/pm_user/main_tests_pm_user.feature
rename to features/backend/admin_setup/users/pm_user/main_tests_pm_user.feature
diff --git a/features/backend/pm_user/negative_tests_pm_user.feature b/features/backend/admin_setup/users/pm_user/negative_tests_pm_user.feature
similarity index 100%
rename from features/backend/pm_user/negative_tests_pm_user.feature
rename to features/backend/admin_setup/users/pm_user/negative_tests_pm_user.feature
diff --git a/features/backend/application_cases/case note/basic_sequence_case_note.feature b/features/backend/application_cases/case note/basic_sequence_case_note.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/case note/main_tests_case_note.feature b/features/backend/application_cases/case note/main_tests_case_note.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/case note/negative_tests_case_note.feature b/features/backend/application_cases/case note/negative_tests_case_note.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/case variables/basic_sequence_case_variables.feature b/features/backend/application_cases/case variables/basic_sequence_case_variables.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/case variables/main_tests_case_variables.feature b/features/backend/application_cases/case variables/main_tests_case_variables.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/case variables/negative_tests_case_variables.feature b/features/backend/application_cases/case variables/negative_tests_case_variables.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/cases actions1 7-12/basic_sequence_cases_actions_7_12.feature b/features/backend/application_cases/cases actions1 7-12/basic_sequence_cases_actions_7_12.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/cases actions1 7-12/main_tests_cases_actions_7_12.feature b/features/backend/application_cases/cases actions1 7-12/main_tests_cases_actions_7_12.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/cases actions1 7-12/negative_tests_cases_actions_7_12.feature b/features/backend/application_cases/cases actions1 7-12/negative_tests_cases_actions_7_12.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/cases actions2 13-17/basic_sequence_cases_actions_13_17.feature b/features/backend/application_cases/cases actions2 13-17/basic_sequence_cases_actions_13_17.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/cases actions2 13-17/main_tests_cases_actions_13_17.feature b/features/backend/application_cases/cases actions2 13-17/main_tests_cases_actions_13_17.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/cases actions2 13-17/negative_tests_cases_actions_13_17.feature b/features/backend/application_cases/cases actions2 13-17/negative_tests_cases_actions_13_17.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/cases lists 1-6/basic_sequence_cases_lists_1_6.feature b/features/backend/application_cases/cases lists 1-6/basic_sequence_cases_lists_1_6.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/cases lists 1-6/main_tests_cases_lists_1_6.feature b/features/backend/application_cases/cases lists 1-6/main_tests_cases_lists_1_6.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/cases lists 1-6/negative_tests_cases_lists_1_6.feature b/features/backend/application_cases/cases lists 1-6/negative_tests_cases_lists_1_6.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/input documents_case/basic_sequence_input_document_case.feature b/features/backend/application_cases/input documents_case/basic_sequence_input_document_case.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/input documents_case/main_tests_input_document_case.feature b/features/backend/application_cases/input documents_case/main_tests_input_document_case.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/input documents_case/negative_tests_input_document_case.feature b/features/backend/application_cases/input documents_case/negative_tests_input_document_case.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/output document_case/basic_sequence_output_document_case.feature b/features/backend/application_cases/output document_case/basic_sequence_output_document_case.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/output document_case/main_sequence_output_document_case.feature b/features/backend/application_cases/output document_case/main_sequence_output_document_case.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/application_cases/output document_case/negative_tests_output_document_case.feature b/features/backend/application_cases/output document_case/negative_tests_output_document_case.feature
new file mode 100644
index 000000000..e69de29bb
diff --git a/features/backend/activity/main_tests_activity.feature b/features/backend/projects/activity/main_tests_activity.feature
similarity index 100%
rename from features/backend/activity/main_tests_activity.feature
rename to features/backend/projects/activity/main_tests_activity.feature
diff --git a/features/backend/activity/negative_tests_activity.feature b/features/backend/projects/activity/negative_tests_activity.feature
similarity index 100%
rename from features/backend/activity/negative_tests_activity.feature
rename to features/backend/projects/activity/negative_tests_activity.feature
diff --git a/features/backend/adhoc_assignee/main_tests_adhoc_assignee.feature b/features/backend/projects/adhoc_assignee/main_tests_adhoc_assignee.feature
similarity index 100%
rename from features/backend/adhoc_assignee/main_tests_adhoc_assignee.feature
rename to features/backend/projects/adhoc_assignee/main_tests_adhoc_assignee.feature
diff --git a/features/backend/adhoc_assignee/negative_tests_adhoc_assignee.feature b/features/backend/projects/adhoc_assignee/negative_tests_adhoc_assignee.feature
similarity index 100%
rename from features/backend/adhoc_assignee/negative_tests_adhoc_assignee.feature
rename to features/backend/projects/adhoc_assignee/negative_tests_adhoc_assignee.feature
diff --git a/features/backend/assignee/activity_assignee.feature b/features/backend/projects/assignee/activity_assignee.feature
similarity index 100%
rename from features/backend/assignee/activity_assignee.feature
rename to features/backend/projects/assignee/activity_assignee.feature
diff --git a/features/backend/assignee/main_tests_assignee.feature b/features/backend/projects/assignee/main_tests_assignee.feature
similarity index 100%
rename from features/backend/assignee/main_tests_assignee.feature
rename to features/backend/projects/assignee/main_tests_assignee.feature
diff --git a/features/backend/assignee/negative_tests_assignee.feature b/features/backend/projects/assignee/negative_tests_assignee.feature
similarity index 100%
rename from features/backend/assignee/negative_tests_assignee.feature
rename to features/backend/projects/assignee/negative_tests_assignee.feature
diff --git a/features/backend/case_scheduler/basic_sequence_case_scheduler.feature b/features/backend/projects/case_scheduler/basic_sequence_case_scheduler.feature
similarity index 100%
rename from features/backend/case_scheduler/basic_sequence_case_scheduler.feature
rename to features/backend/projects/case_scheduler/basic_sequence_case_scheduler.feature
diff --git a/features/backend/case_scheduler/main_tests_case_scheduler.feature b/features/backend/projects/case_scheduler/main_tests_case_scheduler.feature
similarity index 100%
rename from features/backend/case_scheduler/main_tests_case_scheduler.feature
rename to features/backend/projects/case_scheduler/main_tests_case_scheduler.feature
diff --git a/features/backend/case_scheduler/negative_tests_case_scheduler.feature b/features/backend/projects/case_scheduler/negative_tests_case_scheduler.feature
similarity index 100%
rename from features/backend/case_scheduler/negative_tests_case_scheduler.feature
rename to features/backend/projects/case_scheduler/negative_tests_case_scheduler.feature
diff --git a/features/backend/case_tracker/basic_sequence_case_tracker.feature b/features/backend/projects/case_tracker/basic_sequence_case_tracker.feature
similarity index 100%
rename from features/backend/case_tracker/basic_sequence_case_tracker.feature
rename to features/backend/projects/case_tracker/basic_sequence_case_tracker.feature
diff --git a/features/backend/case_tracker/main_tests_case_tracker.feature b/features/backend/projects/case_tracker/main_tests_case_tracker.feature
similarity index 100%
rename from features/backend/case_tracker/main_tests_case_tracker.feature
rename to features/backend/projects/case_tracker/main_tests_case_tracker.feature
diff --git a/features/backend/case_tracker/negative_tests_case_tracker.feature b/features/backend/projects/case_tracker/negative_tests_case_tracker.feature
similarity index 100%
rename from features/backend/case_tracker/negative_tests_case_tracker.feature
rename to features/backend/projects/case_tracker/negative_tests_case_tracker.feature
diff --git a/features/backend/database_connections/basic_sequence_database_connections.feature b/features/backend/projects/database_connections/basic_sequence_database_connections.feature
similarity index 100%
rename from features/backend/database_connections/basic_sequence_database_connections.feature
rename to features/backend/projects/database_connections/basic_sequence_database_connections.feature
diff --git a/features/backend/database_connections/main_tests_database_connections.feature b/features/backend/projects/database_connections/main_tests_database_connections.feature
similarity index 100%
rename from features/backend/database_connections/main_tests_database_connections.feature
rename to features/backend/projects/database_connections/main_tests_database_connections.feature
diff --git a/features/backend/database_connections/negative_tests_database_connections.feature b/features/backend/projects/database_connections/negative_tests_database_connections.feature
similarity index 100%
rename from features/backend/database_connections/negative_tests_database_connections.feature
rename to features/backend/projects/database_connections/negative_tests_database_connections.feature
diff --git a/features/backend/dynaforms/basic_sequence_dynaform.feature b/features/backend/projects/dynaforms/basic_sequence_dynaform.feature
similarity index 100%
rename from features/backend/dynaforms/basic_sequence_dynaform.feature
rename to features/backend/projects/dynaforms/basic_sequence_dynaform.feature
diff --git a/features/backend/dynaforms/main_tests_dynaform.feature b/features/backend/projects/dynaforms/main_tests_dynaform.feature
similarity index 100%
rename from features/backend/dynaforms/main_tests_dynaform.feature
rename to features/backend/projects/dynaforms/main_tests_dynaform.feature
diff --git a/features/backend/dynaforms/negative_tests_dynaform.feature b/features/backend/projects/dynaforms/negative_tests_dynaform.feature
similarity index 100%
rename from features/backend/dynaforms/negative_tests_dynaform.feature
rename to features/backend/projects/dynaforms/negative_tests_dynaform.feature
diff --git a/features/backend/events/basic_sequence_event.feature b/features/backend/projects/events/basic_sequence_event.feature
similarity index 100%
rename from features/backend/events/basic_sequence_event.feature
rename to features/backend/projects/events/basic_sequence_event.feature
diff --git a/features/backend/events/main_tests_event.feature b/features/backend/projects/events/main_tests_event.feature
similarity index 100%
rename from features/backend/events/main_tests_event.feature
rename to features/backend/projects/events/main_tests_event.feature
diff --git a/features/backend/events/negative_tests_event.feature b/features/backend/projects/events/negative_tests_event.feature
similarity index 100%
rename from features/backend/events/negative_tests_event.feature
rename to features/backend/projects/events/negative_tests_event.feature
diff --git a/features/backend/files_manager/basic_sequence_files_manager.feature b/features/backend/projects/files_manager/basic_sequence_files_manager.feature
similarity index 100%
rename from features/backend/files_manager/basic_sequence_files_manager.feature
rename to features/backend/projects/files_manager/basic_sequence_files_manager.feature
diff --git a/features/backend/files_manager/main_test_files_manager.feature b/features/backend/projects/files_manager/main_test_files_manager.feature
similarity index 87%
rename from features/backend/files_manager/main_test_files_manager.feature
rename to features/backend/projects/files_manager/main_test_files_manager.feature
index 90e4b1393..ee0795817 100644
--- a/features/backend/files_manager/main_test_files_manager.feature
+++ b/features/backend/projects/files_manager/main_test_files_manager.feature
@@ -108,21 +108,22 @@ Feature: Files Manager Resources Main Tests
 
 
   Scenario Outline: Get a single Files Manager and check some properties
-  Given I request "project/1265557095225ff5c688f46031700471/file-manager?path=<prf_path>"
+  Given that I want to get a resource with the key "prf_uid" stored in session array as variable "prf_uid_<prf_number>"
+  Given I request "project/1265557095225ff5c688f46031700471/file-manager"
     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 "prf_filename" property in row <row> equals "<prf_filename>"
-    And the "prf_path" property in row <row> equals "<prf_path>"
-    And the "prf_content" property in row <row> equals "<prf_content>"
+    And the type is "object"
+    And that "prf_filename" is set to "<prf_filename>"
+    And that "prf_path" is set to "<prf_path>"
+    And that "prf_content" is set to "<prf_content>"
   
       Examples:
       | test_description                 | prf_filename      | prf_content                                  | http_code | type   | prf_number | row | prf_path                      |
       | put into public folder           | file_test_1.txt   | only text - modified                         | 200       | object | 0          | 1   | public/                       |
       | put into mailtemplates folder    | file_test_2.html  | <h1>Test</h1><p>html test</p><i>modified</i> | 200       | object | 1          | 1   | templates/                    |
-      | put into public subfolder        | file_test_3.txt   | put test                                     | 200       | object | 2          | 0   | public/public_subfolder       |
-      | put into mailtemplates subfolder | file_test_4.html  | put test                                     | 200       | object | 3          | 0   | templates/templates_subfolder |
+      | put into public subfolder        | file_test_3       | put test                                     | 200       | object | 2          | 0   | public/public_subfolder       |
+      | put into mailtemplates subfolder | file_test_4       | put test                                     | 200       | object | 3          | 0   | templates/templates_subfolder |
 
   
   Scenario Outline: Upload files to same folders
@@ -134,21 +135,25 @@ Feature: Files Manager Resources Main Tests
       |/home/wendy/uploadfiles/test1.html | templates | 4          | 
       |/home/wendy/uploadfiles/test2.html | templates | 5          |
       |/home/wendy/uploadfiles/test.txt   | public    | 6          |
+      |/home/wendy/uploadfiles/TestQA.html| templates | 7          |
 
 
-  Scenario: Upload files when the file already exists in the folder but with different content. must overwrite
-    Given POST I want to upload the file "/home/wendy/uploadfiles/TestQA.html" to path "templates". Url "project/1265557095225ff5c688f46031700471/file-manager"
-    Then the response status code should be 200
     
-  
-  Scenario: Get a single Files Manager and check some properties the overwritten file
-  Given I request "project/1265557095225ff5c688f46031700471/file-manager?path=templates"
+
+  Scenario Outline: Verify if TestQA was overwrited 
+  Given that I want to get a resource with the key "prf_uid" stored in session array as variable "prf_uid_<prf_number>"
+  Given I request "project/1265557095225ff5c688f46031700471/file-manager"
     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 "prf_filename" property in row 4 equals "TestQA.html"
-    And the "prf_content" property in row 4 equals "Test QA -  cuando se realiza la sobreescritura desde upload"
+    And the type is "object"
+    And that "prf_filename" is set to "<prf_filename>"
+    And that "prf_content" is set to "<prf_content>"
+
+  Examples:
+      | prf_ filename | prf_content                                                 | prf_number |
+      | TestQA.html   | Test QA -  cuando se realiza la sobreescritura desde upload | 7          | 
+
    
 
   Scenario: Update the overwritten file to return to their original values
diff --git a/features/backend/files_manager/negative_tests_files_manager.feature b/features/backend/projects/files_manager/negative_tests_files_manager.feature
similarity index 100%
rename from features/backend/files_manager/negative_tests_files_manager.feature
rename to features/backend/projects/files_manager/negative_tests_files_manager.feature
diff --git a/features/backend/input_documents/basic_sequence_input.feature b/features/backend/projects/input_documents/basic_sequence_input.feature
similarity index 100%
rename from features/backend/input_documents/basic_sequence_input.feature
rename to features/backend/projects/input_documents/basic_sequence_input.feature
diff --git a/features/backend/input_documents/main_tests_input.feature b/features/backend/projects/input_documents/main_tests_input.feature
similarity index 100%
rename from features/backend/input_documents/main_tests_input.feature
rename to features/backend/projects/input_documents/main_tests_input.feature
diff --git a/features/backend/input_documents/negative_tests_input.feature b/features/backend/projects/input_documents/negative_tests_input.feature
similarity index 100%
rename from features/backend/input_documents/negative_tests_input.feature
rename to features/backend/projects/input_documents/negative_tests_input.feature
diff --git a/features/backend/output_documents/main_tests_output.feature b/features/backend/projects/output_documents/main_tests_output.feature
similarity index 100%
rename from features/backend/output_documents/main_tests_output.feature
rename to features/backend/projects/output_documents/main_tests_output.feature
diff --git a/features/backend/output_documents/negative_tests_output.feature b/features/backend/projects/output_documents/negative_tests_output.feature
similarity index 100%
rename from features/backend/output_documents/negative_tests_output.feature
rename to features/backend/projects/output_documents/negative_tests_output.feature
diff --git a/features/backend/process/basic_sequence_process.feature b/features/backend/projects/process/basic_sequence_process.feature
similarity index 100%
rename from features/backend/process/basic_sequence_process.feature
rename to features/backend/projects/process/basic_sequence_process.feature
diff --git a/features/backend/process/main_tests_process.feature b/features/backend/projects/process/main_tests_process.feature
similarity index 100%
rename from features/backend/process/main_tests_process.feature
rename to features/backend/projects/process/main_tests_process.feature
diff --git a/features/backend/process/negative_tests_process.feature b/features/backend/projects/process/negative_tests_process.feature
similarity index 100%
rename from features/backend/process/negative_tests_process.feature
rename to features/backend/projects/process/negative_tests_process.feature
diff --git a/features/backend/process_permissions/basic_sequence_permissions.feature b/features/backend/projects/process_permissions/basic_sequence_permissions.feature
similarity index 100%
rename from features/backend/process_permissions/basic_sequence_permissions.feature
rename to features/backend/projects/process_permissions/basic_sequence_permissions.feature
diff --git a/features/backend/process_permissions/main_tests_permissions.feature b/features/backend/projects/process_permissions/main_tests_permissions.feature
similarity index 100%
rename from features/backend/process_permissions/main_tests_permissions.feature
rename to features/backend/projects/process_permissions/main_tests_permissions.feature
diff --git a/features/backend/process_permissions/negative_tests_permissions.feature b/features/backend/projects/process_permissions/negative_tests_permissions.feature
similarity index 100%
rename from features/backend/process_permissions/negative_tests_permissions.feature
rename to features/backend/projects/process_permissions/negative_tests_permissions.feature
diff --git a/features/backend/process_supervisor/main_tests_supervisor.feature b/features/backend/projects/process_supervisor/main_tests_supervisor.feature
similarity index 100%
rename from features/backend/process_supervisor/main_tests_supervisor.feature
rename to features/backend/projects/process_supervisor/main_tests_supervisor.feature
diff --git a/features/backend/process_supervisor/negative_tests_supervisor.feature b/features/backend/projects/process_supervisor/negative_tests_supervisor.feature
similarity index 100%
rename from features/backend/process_supervisor/negative_tests_supervisor.feature
rename to features/backend/projects/process_supervisor/negative_tests_supervisor.feature
diff --git a/features/backend/process_variables/basic_sequence.feature b/features/backend/projects/process_variables/basic_sequence.feature
similarity index 100%
rename from features/backend/process_variables/basic_sequence.feature
rename to features/backend/projects/process_variables/basic_sequence.feature
diff --git a/features/backend/process_variables/main_tests_process_variables.feature b/features/backend/projects/process_variables/main_tests_process_variables.feature
similarity index 100%
rename from features/backend/process_variables/main_tests_process_variables.feature
rename to features/backend/projects/process_variables/main_tests_process_variables.feature
diff --git a/features/backend/process_variables/negative_tests_process_variables.feature b/features/backend/projects/process_variables/negative_tests_process_variables.feature
similarity index 100%
rename from features/backend/process_variables/negative_tests_process_variables.feature
rename to features/backend/projects/process_variables/negative_tests_process_variables.feature
diff --git a/features/backend/project/project.feature b/features/backend/projects/project/project.feature
similarity index 100%
rename from features/backend/project/project.feature
rename to features/backend/projects/project/project.feature
diff --git a/features/backend/project_user/basic_sequence_project_user.feature b/features/backend/projects/project_user/basic_sequence_project_user.feature
similarity index 100%
rename from features/backend/project_user/basic_sequence_project_user.feature
rename to features/backend/projects/project_user/basic_sequence_project_user.feature
diff --git a/features/backend/project_user/main_tests_project_user.feature b/features/backend/projects/project_user/main_tests_project_user.feature
similarity index 100%
rename from features/backend/project_user/main_tests_project_user.feature
rename to features/backend/projects/project_user/main_tests_project_user.feature
diff --git a/features/backend/project_user/negative_tests_project_user.feature b/features/backend/projects/project_user/negative_tests_project_user.feature
similarity index 100%
rename from features/backend/project_user/negative_tests_project_user.feature
rename to features/backend/projects/project_user/negative_tests_project_user.feature
diff --git a/features/backend/report_tables/basic_sequence_report_tables.feature b/features/backend/projects/report_tables/basic_sequence_report_tables.feature
similarity index 100%
rename from features/backend/report_tables/basic_sequence_report_tables.feature
rename to features/backend/projects/report_tables/basic_sequence_report_tables.feature
diff --git a/features/backend/report_tables/main_tests_report_tables.feature b/features/backend/projects/report_tables/main_tests_report_tables.feature
similarity index 100%
rename from features/backend/report_tables/main_tests_report_tables.feature
rename to features/backend/projects/report_tables/main_tests_report_tables.feature
diff --git a/features/backend/report_tables/negative_tests_report_tables.feature b/features/backend/projects/report_tables/negative_tests_report_tables.feature
similarity index 100%
rename from features/backend/report_tables/negative_tests_report_tables.feature
rename to features/backend/projects/report_tables/negative_tests_report_tables.feature
diff --git a/features/backend/step/basic_sequence_step.feature b/features/backend/projects/step/basic_sequence_step.feature
similarity index 100%
rename from features/backend/step/basic_sequence_step.feature
rename to features/backend/projects/step/basic_sequence_step.feature
diff --git a/features/backend/step/main_step_update_move_position.feature b/features/backend/projects/step/main_step_update_move_position.feature
similarity index 100%
rename from features/backend/step/main_step_update_move_position.feature
rename to features/backend/projects/step/main_step_update_move_position.feature
diff --git a/features/backend/step/main_tests_step.feature b/features/backend/projects/step/main_tests_step.feature
similarity index 94%
rename from features/backend/step/main_tests_step.feature
rename to features/backend/projects/step/main_tests_step.feature
index 167cc08f4..32375b0b0 100644
--- a/features/backend/step/main_tests_step.feature
+++ b/features/backend/projects/step/main_tests_step.feature
@@ -67,6 +67,21 @@ Feature: Project Properties - Step Resources Main Tests
         Then the response status code should be 400
         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"
+        And the content type is "application/json"
+        Then the response status code should be 400
+        
+
+    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 "83199959452cd62589576c1018679557" stored in session array
+        And I request "project/<project>/output-document"
+        And the content type is "application/json"
+        Then the response status code should be 400
+          
+
 
     Scenario Outline: Update the five steps and then check if the values had changed
       Given PUT this data:
@@ -200,8 +215,22 @@ Feature: Project Properties - Step Resources Main Tests
         | Trigger assigned to Task 2 in type After    | 16062437052cd6141881e06088349078 | 89706843252cd9decdcf9b3047762708 | 4           | 24             | 57401970252cd6393531551040242546 | AFTER    |                   | 3           |
 
 
+Scenario Outline: Trigger assigned to the step when it was already assigned
+       Given POST this data:
+        """
+        {
+            "tri_uid": "81919273152cd636c665080083928728",
+            "st_type": "BEFORE",
+            "st_condition": "",
+            "st_position": "1"
+        }
+        """
+        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"
 
-Scenario Outline: Delete all Triggers created previously in this script
+
+    Scenario Outline: Try delete a trigger when it is assigned to a step
       Given that I want to delete a "trigger"
         And I request "project/<project>/trigger/<tri_uid>"
         Then the response status code should be 400
@@ -210,9 +239,9 @@ Scenario Outline: Delete all Triggers created previously in this script
 
         Examples:
 
-        | project                          | tri_uid  |
-        | 16062437052cd6141881e06088349078 | 81919273152cd636c665080083928728           |
-        | 16062437052cd6141881e06088349078 | 57401970252cd6393531551040242546           |
+        | project                          | tri_uid                          |
+        | 16062437052cd6141881e06088349078 | 81919273152cd636c665080083928728 |
+        | 16062437052cd6141881e06088349078 | 57401970252cd6393531551040242546 |
     
 
     Scenario Outline: List available Triggers for each assigned step
diff --git a/features/backend/step/negative_tests_step.feature b/features/backend/projects/step/negative_tests_step.feature
similarity index 100%
rename from features/backend/step/negative_tests_step.feature
rename to features/backend/projects/step/negative_tests_step.feature
diff --git a/features/backend/step/reordenamiento.feature b/features/backend/projects/step/reordenamiento.feature
similarity index 100%
rename from features/backend/step/reordenamiento.feature
rename to features/backend/projects/step/reordenamiento.feature
diff --git a/features/backend/step/step_update_move_position.feature b/features/backend/projects/step/step_update_move_position.feature
similarity index 100%
rename from features/backend/step/step_update_move_position.feature
rename to features/backend/projects/step/step_update_move_position.feature
diff --git a/features/backend/sub_process/basic_sequence_sub_process.feature b/features/backend/projects/sub_process/basic_sequence_sub_process.feature
similarity index 100%
rename from features/backend/sub_process/basic_sequence_sub_process.feature
rename to features/backend/projects/sub_process/basic_sequence_sub_process.feature
diff --git a/features/backend/sub_process/main_tests_sub_process.feature b/features/backend/projects/sub_process/main_tests_sub_process.feature
similarity index 100%
rename from features/backend/sub_process/main_tests_sub_process.feature
rename to features/backend/projects/sub_process/main_tests_sub_process.feature
diff --git a/features/backend/sub_process/negative_tests_sub_process.feature b/features/backend/projects/sub_process/negative_tests_sub_process.feature
similarity index 100%
rename from features/backend/sub_process/negative_tests_sub_process.feature
rename to features/backend/projects/sub_process/negative_tests_sub_process.feature
diff --git a/features/backend/trigger_wizard/basic_sequence_trigger_wizard.feature b/features/backend/projects/trigger_wizard/basic_sequence_trigger_wizard.feature
similarity index 100%
rename from features/backend/trigger_wizard/basic_sequence_trigger_wizard.feature
rename to features/backend/projects/trigger_wizard/basic_sequence_trigger_wizard.feature
diff --git a/features/backend/trigger_wizard/main_tests_trigger_wizards.feature b/features/backend/projects/trigger_wizard/main_tests_trigger_wizards.feature
similarity index 100%
rename from features/backend/trigger_wizard/main_tests_trigger_wizards.feature
rename to features/backend/projects/trigger_wizard/main_tests_trigger_wizards.feature
diff --git a/features/backend/trigger_wizard/negative_tests_triggers_wizards.feature b/features/backend/projects/trigger_wizard/negative_tests_triggers_wizards.feature
similarity index 100%
rename from features/backend/trigger_wizard/negative_tests_triggers_wizards.feature
rename to features/backend/projects/trigger_wizard/negative_tests_triggers_wizards.feature
diff --git a/features/backend/triggers/main_tests_triggers.feature b/features/backend/projects/triggers/main_tests_triggers.feature
similarity index 100%
rename from features/backend/triggers/main_tests_triggers.feature
rename to features/backend/projects/triggers/main_tests_triggers.feature
diff --git a/features/backend/triggers/negative_tests_triggers.feature b/features/backend/projects/triggers/negative_tests_triggers.feature
similarity index 100%
rename from features/backend/triggers/negative_tests_triggers.feature
rename to features/backend/projects/triggers/negative_tests_triggers.feature
diff --git a/features/backend/web_entry/basic_sequence_web_entry.feature b/features/backend/projects/web_entry/basic_sequence_web_entry.feature
similarity index 100%
rename from features/backend/web_entry/basic_sequence_web_entry.feature
rename to features/backend/projects/web_entry/basic_sequence_web_entry.feature
diff --git a/features/backend/web_entry/main_tests_web_entry.feature b/features/backend/projects/web_entry/main_tests_web_entry.feature
similarity index 100%
rename from features/backend/web_entry/main_tests_web_entry.feature
rename to features/backend/projects/web_entry/main_tests_web_entry.feature
diff --git a/features/backend/web_entry/negative_tests_web_entry.feature b/features/backend/projects/web_entry/negative_tests_web_entry.feature
similarity index 100%
rename from features/backend/web_entry/negative_tests_web_entry.feature
rename to features/backend/projects/web_entry/negative_tests_web_entry.feature
diff --git a/features/backend/web_entry/remove_users_and_web_entry.feature b/features/backend/projects/web_entry/remove_users_and_web_entry.feature
similarity index 100%
rename from features/backend/web_entry/remove_users_and_web_entry.feature
rename to features/backend/projects/web_entry/remove_users_and_web_entry.feature