Skip to content
Snippets Groups Projects
Commit b1d534bc authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'hotline_#17941_fix_noreply_adress_used_for_cms_workflow' into 'hotline_6.57'

Hotline #17941 fix noreply adress used for cms workflow

See merge request !560
parents 51971a24 f0fe2813
Branches
Tags
2 merge requests!580Master,!566Hotline 6.57
- ticket hotline #17941
- Workflow de création des articles
- correction de l'adresse email utilisée pour envoyer les messages de trnasition d'état (no-reply@afi-sa.fr)
\ No newline at end of file
......@@ -325,7 +325,7 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
return;
}
$mail->setFrom('no-reply@no-reply-afi.fr')
$mail->setFrom('no-reply@afi-sa.fr')
->addTo($mail_address);
return $mail;
}
......@@ -385,7 +385,7 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
$body);
$mail
->setFrom('no-reply@no-reply-afi.fr')
->setFrom('no-reply@afi-sa.fr')
->addTo($mail_address)
->setSubject('[Bokeh] Validation d\'article en attente: '.$article->getTitre())
->setBodyText($body);
......
......@@ -1469,6 +1469,17 @@ class CmsControllerNewsAddActionPostWithWorkflowTest extends CmsControllerWorkfl
}
/** @test */
public function statusDraftToValidationPendingShouldSendByNoReplayAtAfiSaDotFr() {
Class_Article::find(18)->setStatus(Class_Article::STATUS_DRAFT)->save();
$data = $this->_basePostDatas;
$data['status'] = Class_Article::STATUS_VALIDATION_PENDING;
$this->postDispatch('/admin/cms/edit/id/18', $data);
$this->assertEquals('no-reply@afi-sa.fr' ,$this->mock_transport->getSentMails()[0]->getFrom());
}
public function postArticleAValider() {
Class_Article::find(18)->setStatus(Class_Article::STATUS_DRAFT)->save();
$data = $this->_basePostDatas;
......@@ -1550,6 +1561,15 @@ class CmsControllerWorkflowArticleRefusedTest extends CmsControllerWorkflowTestC
}
/** @test */
public function refusedMailFromShouldBeNoReplyAtAfiSaDotFr() {
$this->concert->getAuteur()->setMail('tom@acme.com');
$this->postArticleRefuser();
$this->assertEquals('no-reply@afi-sa.fr',
$this->mock_transport->getSentMails()[0]->getFrom());
}
/** @test */
public function statusBrouillonUpdatedToRefuserShouldSendMail() {
$this->concert->getAuteur()->setMail('tom@acme.com');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment