Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Modify the check for sender address

Browse Source 
to implement rule for existing campaigns.

[MAILPOET-5832]
This commit is contained in:
Brezo Cordero
2024-01-17 16:03:58 -06:00
committed by Aschepikov
parent 56556493fe
commit ab23a01423
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mailpoet/tests/integration/Services/AuthorizedEmailsControllerTest.php
View File

@@ -255,7 +255,7 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
'AuthorizedSenderDomainController' => $senderDomainMock,
];
$controller = $this->getControllerWithCustomMocks($mocks);
verify($controller->isSenderAddressValidForActivation($newsletter))->false();
verify($controller->isSenderAddressValid($newsletter))->false();
}
public function testSenderAddressIsValidForActivationIfRestrictionsApplyAndAuthorizedSender() {
@@ -276,7 +276,28 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
'AuthorizedSenderDomainController' => $senderDomainMock,
];
$controller = $this->getControllerWithCustomMocks($mocks);
verify($controller->isSenderAddressValidForActivation($newsletter))->true();
verify($controller->isSenderAddressValid($newsletter))->true();
}
public function testSenderAddressIsValidForSendingIfRestrictionsApplyAndAuthorizedSender() {
$this->settings->set('mta.method', Mailer::METHOD_MAILPOET);
$verifiedDomains = ['email.com'];
$senderDomainMock = $this->make(AuthorizedSenderDomainController::class, [
'isAuthorizedDomainRequiredForExistingCampaigns' => Expected::once(true),
'getVerifiedSenderDomainsIgnoringCache' => Expected::once($verifiedDomains),
]);
$newsletter = new NewsletterEntity();
$newsletter->setSubject('Subject');
$newsletter->setType(NewsletterEntity::TYPE_STANDARD);
$newsletter->setStatus(NewsletterEntity::STATUS_DRAFT);
$newsletter->setSenderAddress('contact@email.com');
$mocks = [
'AuthorizedSenderDomainController' => $senderDomainMock,
];
$controller = $this->getControllerWithCustomMocks($mocks);
verify($controller->isSenderAddressValid($newsletter, 'sending'))->true();
}
public function testSenderAddressIsValidForActivationIfNotACampaign() {
@@ -297,7 +318,7 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
'AuthorizedSenderDomainController' => $senderDomainMock,
];
$controller = $this->getControllerWithCustomMocks($mocks);
verify($controller->isSenderAddressValidForActivation($newsletter))->true();
verify($controller->isSenderAddressValid($newsletter))->true();
}
public function testSenderAddressIsValidForActivationIfRestrictionsDoNotApply() {
@@ -318,7 +339,7 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
'AuthorizedSenderDomainController' => $senderDomainMock,
];
$controller = $this->getControllerWithCustomMocks($mocks);
verify($controller->isSenderAddressValidForActivation($newsletter))->true();
verify($controller->isSenderAddressValid($newsletter))->true();
}
public function testItSetsFromAddressInScheduledEmails() {