diff --git a/VERSIONS_HOTLINE/hotline_#17941_fix_noreply_adress_workflow_cms b/VERSIONS_HOTLINE/hotline_#17941_fix_noreply_adress_workflow_cms new file mode 100644 index 0000000000000000000000000000000000000000..b8e811d20b51478c7f079a14e8bafe164e92e5c8 --- /dev/null +++ b/VERSIONS_HOTLINE/hotline_#17941_fix_noreply_adress_workflow_cms @@ -0,0 +1,3 @@ +- 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 diff --git a/application/modules/admin/controllers/CmsController.php b/application/modules/admin/controllers/CmsController.php index 12a835d227b2b9837961f452c2164f51324c7ba5..a5bad041afa95251f60c54c19fe1eebc57269332 100644 --- a/application/modules/admin/controllers/CmsController.php +++ b/application/modules/admin/controllers/CmsController.php @@ -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); diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php index 0cdb25eece7e03ac9ab7c5dd18e3bdbc14dc5dc7..6505cb6024ba5756df16124d0409c1da4283d583 100644 --- a/tests/application/modules/admin/controllers/CmsControllerTest.php +++ b/tests/application/modules/admin/controllers/CmsControllerTest.php @@ -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');