fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/PMC-778 (pull request #7106)

Browse Source 
PMC-778

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Andrea Adamczyk
2019-10-18 19:10:19 +00:00
committed by Julio Cesar Laura Avendaño
parent 9dbfc8aee5 de1afc51f0
commit 9546fcf7ec
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmailTest.php
View File

@@ -205,4 +205,53 @@ class ActionsByEmailTest extends TestCase
//Assert the email was not sent
$this->assertContains('**ID_UNEXPECTED_ERROR_OCCURRED_PLEASE**', $res);
}
/**
* Test the forwardMail method with ssl
*
* @covers \ProcessMaker\BusinessModel\ActionsByEmail::forwardMail()
* @test
*/
public function it_should_test_the_forward_mail_method_with_ssl()
{
//Create the Task factory
factory(Task::class)->create();
//Create the Process factory
factory(Process::class)->create();
//Create the Dynaform factory
factory(Dynaform::class)->create();
//Create the EmailServerModel factory with smtp secure
factory(EmailServerModel::class)->create(
['SMTPSECURE' => 'ssl']
);
//Create the Application factory
factory(Application::class)->create();
//Create the Delegation factory
$delegation = factory(Delegation::class)->create();
//Create the AbeConfiguration factory
$abeConfiguration = factory(AbeConfiguration::class)->create();
//Create the AbeConfiguration factory
$abeRequest = factory(AbeRequest::class)->create([
'ABE_UID' => $abeConfiguration->ABE_UID,
'APP_UID' => $delegation->APP_UID,
'DEL_INDEX' => $delegation->DEL_INDEX,
'ABE_REQ_UID' => $abeConfiguration->ABE_UID,
]);
//Prepare the array send to the method
$arrayData = [
'action' => 'forwardMail',
'REQ_UID' => $abeRequest->ABE_REQ_UID,
'limit' => '',
'start' => ''
];
//Create the ActionsByEmail object
$abe = new ActionsByEmail();
//Call the forwardMail method
$res = $abe->forwardMail($arrayData);
//Assert the email was sent successfully
$this->assertContains('**ID_EMAIL_RESENT_TO**: ' . $abeRequest->ABE_REQ_SENT_TO, $res);
}
}

2
workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
View File

@@ -385,6 +385,8 @@ class ActionsByEmail
$emailServer = new EmailServerModel();
$criteria = $emailServer->getEmailServer($dataRes['ABE_EMAIL_SERVER_UID']);
$setup = !empty($criteria) ? $criteria : $emailServer->getEmailServerDefault();
$setup['SMTPSecure'] = $setup['SMTPSECURE'];
unset($setup['SMTPSECURE']);
$spool = new SpoolRun();
$spool->setConfig($setup);
$abeCore = new ActionsByEmailCoreClass();