fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in bugfix/PMCORE-1578 (pull request #7403)

Browse Source 
PMCORE-1578

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2020-06-24 13:27:29 +00:00
committed by Julio Cesar Laura Avendaño
parent 983258c703 517c94aa78
commit f1a9039883
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unit/workflow/engine/src/ProcessMaker/Cases/CasesTraitTest.php
View File

@@ -396,15 +396,19 @@ class CasesTraitTest extends TestCase
];
$cases = new Cases();
$cases->routeCaseActionByEmail($appUid, $delIndex, $aber, $dynUid, $forms, $remoteAddr, $files);
$result = $cases->routeCaseActionByEmail($appUid, $delIndex, $aber, $dynUid, $forms, $remoteAddr, $files);
//asserts
$this->assertEquals($aber, $result['ABE_REQ_UID']);
$this->assertArrayHasKey('ABE_RES_STATUS', $result);
}
/**
* This test verifies if the ABE form has been completed.
* This test verifies if the ABE form has not been completed and hope for an exception.
* @test
* @covers Cases::routeCaseActionByEmail
*/
public function it_should_verify_if_abe_has_completed()
public function it_should_verify_if_abe_has_not_completed()
{
$delegation1 = factory(Delegation::class)->state('closed')->create();
$abeRequest = factory(AbeRequest::class)->create();
@@ -420,6 +424,7 @@ class CasesTraitTest extends TestCase
$remoteAddr = '127.0.0.1';
$files = [];
//assert exception
$this->expectException(\Exception::class);
$cases = new Cases();
$cases->routeCaseActionByEmail($appUid, $delIndex, $aber, $dynUid, $forms, $remoteAddr, $files);
@@ -446,6 +451,7 @@ class CasesTraitTest extends TestCase
$remoteAddr = '127.0.0.1';
$files = [];
//assert exception
$this->expectException(\Exception::class);
$cases = new Cases();
$cases->routeCaseActionByEmail($appUid, $delIndex, $aber, $dynUid, $forms, $remoteAddr, $files);

8
workflow/engine/src/ProcessMaker/Core/JobsManager.php
View File

@@ -185,9 +185,13 @@ class JobsManager
public function dispatch($name, $callback)
{
$environment = $this->getDataSnapshot();
$instance = $name::dispatch(function() use ($callback, $environment) {
global $RBAC;
$referrerRBAC = $RBAC;
$instance = $name::dispatch(function() use ($callback, $environment, $referrerRBAC) {
try {
global $RBAC;
$RBAC = $referrerRBAC;
$this->recoverDataSnapshot($environment);
$callback($environment);
} catch (Exception $e) {

4
workflow/engine/src/ProcessMaker/Model/SubApplication.php
View File

@@ -33,6 +33,7 @@ class SubApplication extends Model
'SA_INIT_DATE' => '',
'SA_FINISH_DATE' => ''
];
/**
* The attributes that are mass assignable.
*
@@ -49,4 +50,5 @@ class SubApplication extends Model
'SA_INIT_DATE',
'SA_FINISH_DATE'
];
}
}