PMCORE-2524: Conflicts with develop

This commit is contained in:
Paula Quispe
2020-12-09 12:26:20 -04:00
26 changed files with 969 additions and 547 deletions

View File

@@ -415,8 +415,7 @@ class DelegationTest extends TestCase
->states('foreign_keys')
->create();
$title = $delegations->last()
->application
->APP_TITLE;
->DEL_TITLE;
// We need to commit the records inserted because is needed for the "fulltext" index
DB::commit();
@@ -2510,4 +2509,33 @@ class DelegationTest extends TestCase
$result = Delegation::participation($application->APP_UID, $user->USR_UID);
$this->assertFalse($result);
}
/**
* This check the return of thread title
*
* @covers \ProcessMaker\Model\Delegation::getThreadTitle()
* @test
*/
public function it_get_thread_title()
{
$delegation = factory(Delegation::class)->states('foreign_keys')->create();
$result = Delegation::getThreadTitle($delegation->TAS_UID, $delegation->APP_NUMBER, $delegation->DEL_INDEX, []);
$this->assertNotEmpty($result);
}
/**
* This tests the getDeltitle() method
*
* @covers \ProcessMaker\Model\Delegation::getDeltitle()
* @test
*/
public function it_should_test_the_get_del_title_method()
{
$delegation = factory(Delegation::class)->create([
'DEL_TITLE' => "test"
]);
$result = Delegation::getDeltitle($delegation->APP_NUMBER, $delegation->DEL_INDEX);
$this->assertNotEmpty($result);
$this->assertEquals($result, $delegation->DEL_TITLE);
}
}

View File

@@ -5,6 +5,8 @@ namespace Tests\unit\workflow\engine\src\ProcessMaker\Model;
use G;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use ProcessMaker\Model\Delegation;
use ProcessMaker\Model\ElementTaskRelation;
use ProcessMaker\Model\Process;
use ProcessMaker\Model\Task;
use Tests\TestCase;
@@ -124,4 +126,64 @@ class TaskTest extends TestCase
$result .= ' 01 '. G::LoadTranslation('ID_SECOND_ABBREVIATE');
$this->assertEquals($taskInfo['DURATION'], $result);
}
/**
* It tests the setTaskDefTitle() method
*
* @covers \ProcessMaker\Model\Task::setTaskDefTitle()
* @test
*/
public function it_should_test_set_task_title_method()
{
$project = factory(Process::class)->create();
$task = factory(Task::class)->create([
'TAS_DEF_TITLE' => 'something'
]);
$elementTask = factory(ElementTaskRelation::class)->create([
'PRJ_UID' => $project->PRO_UID,
'TAS_UID' => $task->TAS_UID,
]);
Task::setTaskDefTitle($elementTask->ELEMENT_UID, "Task title new");
$query = Task::query();
$query->select()->where('TASK.TAS_UID', $task->TAS_UID);
$res = $query->get()->values()->toArray();
$this->assertEquals($res[0]['TAS_DEF_TITLE'], 'Task title new');
}
/**
* It tests the getTaskDefTitle() method
*
* @covers \ProcessMaker\Model\Task::getTaskDefTitle()
* @test
*/
public function it_should_test_get_task_def_title_method()
{
$project = factory(Process::class)->create();
$task = factory(Task::class)->create([
'TAS_DEF_TITLE' => 'something'
]);
$elementTask = factory(ElementTaskRelation::class)->create([
'PRJ_UID' => $project->PRO_UID,
'TAS_UID' => $task->TAS_UID,
]);
$res = Task::getTaskDefTitle($elementTask->ELEMENT_UID);
$this->assertEquals($res, $task->TAS_DEF_TITLE);
}
/**
* It tests the get case title defined in the task
*
* @covers \ProcessMaker\Model\Task::taskCaseTitle()
* @test
*/
public function it_get_case_title()
{
$task = factory(Task::class)->create();
$tas = new Task();
$result = $tas->taskCaseTitle($task->TAS_UID);
$this->assertNotEmpty($result);
}
}