Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ProcessMaker/Nayra/Managers/WorkflowManagerDefault.php
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,10 @@ private function runInlineTask(Token $token, $jobClass)
private function canRunInlineTask(Token $token, EntityInterface $element): bool
{
$instance = $token->getInstance();
$engine = $instance->getEngine();
if (!$engine->isInlineTaskExecutionEnabled()) {
// A persisted token, such as one copied during rollback, is not attached
// to a running engine and must be queued instead of executed inline.
$engine = $instance?->getEngine();
if ($engine === null || !$engine->isInlineTaskExecutionEnabled()) {
return false;
}

Expand Down Expand Up @@ -265,6 +267,7 @@ public function runScripTask(ScriptTaskInterface $scriptTask, Token $token)

if ($this->canRunInlineTask($token, $scriptTask)) {
$this->runInlineTask($token, RunScriptTask::class);

return;
}

Expand All @@ -285,6 +288,7 @@ public function runServiceTask(ServiceTaskInterface $serviceTask, Token $token)

if ($this->canRunInlineTask($token, $serviceTask)) {
$this->runInlineTask($token, RunServiceTask::class);

return;
}

Expand Down
25 changes: 23 additions & 2 deletions tests/unit/ProcessMaker/RollbackProcessRequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

use Facades\ProcessMaker\RollbackProcessRequest;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Bus;
use Mockery;
use ProcessMaker\Facades\WorkflowManager;
use ProcessMaker\Jobs\RunServiceTask;
use ProcessMaker\Models\Comment;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\ProcessRequest;
Expand Down Expand Up @@ -82,6 +84,25 @@ public function testRollbackToServiceTask()
$this->assertEquals('ACTIVE', $this->processRequest->refresh()->status);
}

public function testServiceTaskWithoutEngineIsQueued(): void
{
Bus::fake();

$token = ProcessRequestToken::factory()->create([
'status' => 'ACTIVE',
'element_type' => 'serviceTask',
'element_id' => 'node_2',
]);
$serviceTask = Mockery::mock(ServiceTaskInterface::class);
$serviceTask->shouldReceive('getId')->andReturn('node_2');

WorkflowManager::runServiceTask($serviceTask, $token);

Bus::assertDispatched(RunServiceTask::class, function (RunServiceTask $job) use ($token) {
return $job->tokenId === $token->id;
});
}

private function mockRunScriptTask()
{
$mocksScriptTask = Mockery::mock(ScriptTaskInterface::class);
Expand All @@ -91,7 +112,7 @@ private function mockRunScriptTask()
->andReturn($mocksScriptTask);
WorkflowManager::shouldReceive('runScripTask')
->withArgs(function ($scriptTask, $task) use ($mocksScriptTask) {
return $scriptTask === $mocksScriptTask && $task->element_id = 'node_5';
return $scriptTask === $mocksScriptTask && $task->element_id === 'node_5';
});

return $mockProcessDefinitions;
Expand All @@ -106,7 +127,7 @@ private function mockRunServiceTask()
->andReturn($mockServiceTask);
WorkflowManager::shouldReceive('runServiceTask')
->withArgs(function ($serviceTask, $task) use ($mockServiceTask) {
return $serviceTask === $mockServiceTask && $task->element_id = 'node_5';
return $serviceTask === $mockServiceTask && $task->element_id === 'node_5';
});

return $mockProcessDefinitions;
Expand Down
Loading