Merged in bugfix/PMCORE-3542-2 (pull request #8299)

PMCORE-3542

Approved-by: Julio Cesar Laura Avendaño

tests/unit/workflow/engine/src/ProcessMaker/Model/TaskTest.php

@@ -20,6 +20,31 @@ class TaskTest extends TestCase
 {
     use DatabaseTransactions;
 
+    /**
+     * It tests the get taskId
+     *
+     * @covers \ProcessMaker\Model\Task::getTask()
+     * @test
+     */
+    public function it_get_task()
+    {
+        $task = factory(Task::class)->create();
+        $result = Task::getTask($task->TAS_ID);
+        $this->assertNotEmpty($result);
+    }
+
+    /**
+     * This test scopeExcludedTasks
+     *
+     * @covers \ProcessMaker\Model\Task::scopeExcludedTasks()
+     * @test
+     */
+    public function it_scope_exclude_tasks()
+    {
+        $table = factory(Task::class)->create();
+        $this->assertNotEmpty($table->excludedTasks()->get());
+    }
+
     /**
      * This checks to make get the name of the task
      *
@@ -30,32 +55,60 @@ class TaskTest extends TestCase
     {
         // Intermediate email event
         $task = factory(Task::class)->create([
-            'TAS_TITLE' => 'INTERMEDIATE-THROW-EMAIL-EVENT'
+            'TAS_TITLE' => 'INTERMEDIATE-THROW-EMAIL-EVENT',
+            'TAS_TYPE' => 'INTERMEDIATE-THROW-EMAIL-EVENT'
         ]);
         $taskInstance = new Task();
         $title = $taskInstance->title($task->TAS_ID);
         $this->assertEquals($title['title'], G::LoadTranslation('ID_INTERMEDIATE_THROW_EMAIL_EVENT'));
         // Intermediate throw message event
         $task = factory(Task::class)->create([
-            'TAS_TITLE' => 'INTERMEDIATE-THROW-MESSAGE-EVENT'
+            'TAS_TITLE' => 'INTERMEDIATE-THROW-MESSAGE-EVENT',
+            'TAS_TYPE' => 'INTERMEDIATE-THROW-MESSAGE-EVENT'
         ]);
         $taskInstance = new Task();
         $title = $taskInstance->title($task->TAS_ID);
         $this->assertEquals($title['title'], G::LoadTranslation('ID_INTERMEDIATE_THROW_MESSAGE_EVENT'));
         // Intermediate catch message event
         $task = factory(Task::class)->create([
-            'TAS_TITLE' => 'INTERMEDIATE-CATCH-MESSAGE-EVENT'
+            'TAS_TITLE' => 'INTERMEDIATE-CATCH-MESSAGE-EVENT',
+            'TAS_TYPE' => 'INTERMEDIATE-CATCH-MESSAGE-EVENT'
         ]);
         $taskInstance = new Task();
         $title = $taskInstance->title($task->TAS_ID);
         $this->assertEquals($title['title'], G::LoadTranslation('ID_INTERMEDIATE_CATCH_MESSAGE_EVENT'));
         // Intermediate timer event
         $task = factory(Task::class)->create([
-            'TAS_TITLE' => 'INTERMEDIATE-CATCH-TIMER-EVENT'
+            'TAS_TITLE' => 'INTERMEDIATE-CATCH-TIMER-EVENT',
+            'TAS_TYPE' => 'INTERMEDIATE-CATCH-TIMER-EVENT'
         ]);
         $taskInstance = new Task();
         $title = $taskInstance->title($task->TAS_ID);
         $this->assertEquals($title['title'], G::LoadTranslation('ID_INTERMEDIATE_CATCH_TIMER_EVENT'));
+        // Script task
+        $task = factory(Task::class)->create([
+            'TAS_TITLE' => 'SCRIPT-TASK',
+            'TAS_TYPE' => 'SCRIPT-TASK'
+        ]);
+        $taskInstance = new Task();
+        $title = $taskInstance->title($task->TAS_ID);
+        $this->assertEquals($title['title'], G::LoadTranslation('ID_SCRIPT_TASK_UNTITLED'));
+        // Service task
+        $task = factory(Task::class)->create([
+            'TAS_TITLE' => 'SERVICE-TASK',
+            'TAS_TYPE' => 'SERVICE-TASK'
+        ]);
+        $taskInstance = new Task();
+        $title = $taskInstance->title($task->TAS_ID);
+        $this->assertEquals($title['title'], G::LoadTranslation('ID_SERVICE_TASK_UNTITLED'));
+        // None
+        $task = factory(Task::class)->create([
+            'TAS_TITLE' => 'SUBPROCESS',
+            'TAS_TYPE' => 'SUBPROCESS'
+        ]);
+        $taskInstance = new Task();
+        $title = $taskInstance->title($task->TAS_ID);
+        $this->assertEquals($title['title'], G::LoadTranslation('ID_ANONYMOUS'));
     }
 
     /**
@@ -191,6 +244,8 @@ class TaskTest extends TestCase
      * It test get tasks for the new home view
      *
      * @covers \ProcessMaker\Model\Task::getTasksForHome()
+     * @covers \ProcessMaker\Model\Task::scopeTitle()
+     * @covers \ProcessMaker\Model\Task::scopeProcess()
      * @test
      */
     public function it_should_test_get_tasks_for_home_method()

workflow/engine/src/ProcessMaker/BusinessModel/Cases/Inbox.php

@@ -163,6 +163,7 @@ class Inbox extends AbstractCases
             }
             $result = [];
             $result['del_previous'] = $item['DEL_PREVIOUS'];
+            $result['key_name'] = !empty($userInfo) ? 'user_tooltip' : 'dummy_task';
             $result['user_tooltip'] = $userInfo;
             $result['dummy_task'] = $dummyInfo;
             $item['SEND_BY_INFO'] = $result;

workflow/engine/src/ProcessMaker/BusinessModel/Cases/Paused.php

@@ -157,6 +157,7 @@ class Paused extends AbstractCases
             }
             $result = [];
             $result['del_previous'] = $item['DEL_PREVIOUS'];
+            $result['key_name'] = !empty($userInfo) ? 'user_tooltip' : 'dummy_task';
             $result['user_tooltip'] = $userInfo;
             $result['dummy_task'] = $dummyInfo;
             $item['SEND_BY_INFO'] = $result;

workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php

@@ -166,6 +166,7 @@ class Unassigned extends AbstractCases
             }
             $result = [];
             $result['del_previous'] = $item['DEL_PREVIOUS'];
+            $result['key_name'] = !empty($userInfo) ? 'user_tooltip' : 'dummy_task';
             $result['user_tooltip'] = $userInfo;
             $result['dummy_task'] = $dummyInfo;
             $item['SEND_BY_INFO'] = $result;

workflow/engine/src/ProcessMaker/Model/Task.php

@@ -151,6 +151,8 @@ class Task extends Model
                 case "SERVICE-TASK":
                     $title = G::LoadTranslation('ID_SERVICE_TASK_UNTITLED');
                     break;
+                default:
+                    $title = G::LoadTranslation('ID_ANONYMOUS');
             }
             switch ($type) {
                 case "INTERMEDIATE-THROW-EMAIL-EVENT":
@@ -169,6 +171,8 @@ class Task extends Model
                 case "SERVICE-TASK":
                     $type = G::LoadTranslation('ID_SERVICE_TASK');
                     break;
+                default:
+                    $type = G::LoadTranslation('ID_NONE');
             }
         });