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

Update integration tests

Browse Source 
[MAILPOET-2328]
This commit is contained in:
Amine Ben hammou
2019-09-09 18:49:38 +01:00
committed by Jack Kitterhing
parent c51a894f94
commit a71e7ff1eb
2 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,37 +42,15 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
function testItSetProperErrorForInvalidDefaultSender() { function testItSetProperErrorForInvalidDefaultSender() {
$this->settings->set('installed_at', new Carbon()); $this->settings->set('installed_at', new Carbon());
$this->settings->set('sender.address', 'invalid@email.com'); $this->settings->set('sender.address', 'invalid@email.com');
$this->settings->set('signup_confirmation.from.address', 'auth@email.com');
$this->setMailPoetSendingMethod(); $this->setMailPoetSendingMethod();
$controller = $this->getController($authorized_emails_from_api = ['auth@email.com']); $controller = $this->getController($authorized_emails_from_api = ['auth@email.com']);
$controller->checkAuthorizedEmailAddresses(); $controller->checkAuthorizedEmailAddresses();
expect($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->equals(['invalid_sender_address' => 'invalid@email.com']); expect($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->equals(['invalid_sender_address' => 'invalid@email.com']);
} }
function testItSetProperErrorForInvalidConfirmationSender() { function testItSetEmptyErrorWhenDefaultSenderAddressIsCorrect() {
$this->settings->set('installed_at', new Carbon()); $this->settings->set('installed_at', new Carbon());
$this->settings->set('sender.address', 'auth@email.com'); $this->settings->set('sender.address', 'auth@email.com');
$this->settings->set('signup_confirmation.from.address', 'invalid@email.com');
$this->setMailPoetSendingMethod();
$controller = $this->getController($authorized_emails_from_api = ['auth@email.com']);
$controller->checkAuthorizedEmailAddresses();
expect($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->equals(['invalid_confirmation_address' => 'invalid@email.com']);
}
function testItSetProperErrorForConfirmationAddressAndDefaultSender() {
$this->settings->set('installed_at', new Carbon());
$this->settings->set('sender.address', 'invalid@email.com');
$this->settings->set('signup_confirmation.from.address', 'invalid@email.com');
$this->setMailPoetSendingMethod();
$controller = $this->getController($authorized_emails_from_api = ['auth@email.com']);
$controller->checkAuthorizedEmailAddresses();
expect($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->equals(['invalid_sender_address' => 'invalid@email.com', 'invalid_confirmation_address' => 'invalid@email.com']);
}
function testItSetEmptyErrorWhenBothAdressesAreCorrect() {
$this->settings->set('installed_at', new Carbon());
$this->settings->set('sender.address', 'auth@email.com');
$this->settings->set('signup_confirmation.from.address', 'auth@email.com');
$this->setMailPoetSendingMethod(); $this->setMailPoetSendingMethod();
$controller = $this->getController($authorized_emails_from_api = ['auth@email.com']); $controller = $this->getController($authorized_emails_from_api = ['auth@email.com']);
$controller->checkAuthorizedEmailAddresses(); $controller->checkAuthorizedEmailAddresses();
@ -112,7 +90,6 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
$newsletter2->save(); $newsletter2->save();
$this->settings->set('installed_at', new Carbon()); $this->settings->set('installed_at', new Carbon());
$this->settings->set('sender.address', 'auth@email.com'); $this->settings->set('sender.address', 'auth@email.com');
$this->settings->set('signup_confirmation.from.address', 'auth@email.com');
$this->setMailPoetSendingMethod(); $this->setMailPoetSendingMethod();
$controller = $this->getController($authorized_emails_from_api = ['auth@email.com']); $controller = $this->getController($authorized_emails_from_api = ['auth@email.com']);
$controller->checkAuthorizedEmailAddresses(); $controller->checkAuthorizedEmailAddresses();
@ -125,7 +102,6 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
MailerLog::updateMailerLog($log); MailerLog::updateMailerLog($log);
$this->settings->set('installed_at', new Carbon()); $this->settings->set('installed_at', new Carbon());
$this->settings->set('sender.address', 'auth@email.com'); $this->settings->set('sender.address', 'auth@email.com');
$this->settings->set('signup_confirmation.from.address', 'auth@email.com');
$this->setMailPoetSendingMethod(); $this->setMailPoetSendingMethod();
$controller = $this->getController($authorized_emails_from_api = ['auth@email.com']); $controller = $this->getController($authorized_emails_from_api = ['auth@email.com']);
$controller->checkAuthorizedEmailAddresses(); $controller->checkAuthorizedEmailAddresses();
@ -138,7 +114,6 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
MailerLog::updateMailerLog($log); MailerLog::updateMailerLog($log);
$this->settings->set('installed_at', new Carbon()); $this->settings->set('installed_at', new Carbon());
$this->settings->set('sender.address', 'auth@email.com'); $this->settings->set('sender.address', 'auth@email.com');
$this->settings->set('signup_confirmation.from.address', 'auth@email.com');
$this->setMailPoetSendingMethod(); $this->setMailPoetSendingMethod();
$controller = $this->getController($authorized_emails_from_api = ['auth@email.com']); $controller = $this->getController($authorized_emails_from_api = ['auth@email.com']);
$controller->checkAuthorizedEmailAddresses(); $controller->checkAuthorizedEmailAddresses();
@ -151,7 +126,6 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
MailerLog::updateMailerLog($log); MailerLog::updateMailerLog($log);
$this->settings->set('installed_at', new Carbon()); $this->settings->set('installed_at', new Carbon());
$this->settings->set('sender.address', 'invalid@email.com'); $this->settings->set('sender.address', 'invalid@email.com');
$this->settings->set('signup_confirmation.from.address', 'invalid@email.com');
$this->setMailPoetSendingMethod(); $this->setMailPoetSendingMethod();
$controller = $this->getController($authorized_emails_from_api = ['auth@email.com']); $controller = $this->getController($authorized_emails_from_api = ['auth@email.com']);
$controller->checkAuthorizedEmailAddresses(); $controller->checkAuthorizedEmailAddresses();
@ -169,7 +143,6 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
$newsletter->save(); $newsletter->save();
$this->settings->set('installed_at', new Carbon()); $this->settings->set('installed_at', new Carbon());
$this->settings->set('sender.address', 'auth@email.com'); $this->settings->set('sender.address', 'auth@email.com');
$this->settings->set('signup_confirmation.from.address', 'auth@email.com');
$this->setMailPoetSendingMethod(); $this->setMailPoetSendingMethod();
$controller = $this->getController($authorized_emails_from_api = ['auth@email.com']); $controller = $this->getController($authorized_emails_from_api = ['auth@email.com']);
$controller->checkAuthorizedEmailAddresses(); $controller->checkAuthorizedEmailAddresses();

2
tests/integration/Subscribers/ConfirmationEmailMailerTest.php
View File

@ -84,7 +84,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
]); ]);
$settings = new SettingsController; $settings = new SettingsController;
$settings->set(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, ['invalid_confirmation_address' => 'email@email.com']); $settings->set(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, ['invalid_sender_address' => 'email@email.com']);
$settings->set(Mailer::MAILER_CONFIG_SETTING_NAME, ['method' => Mailer::METHOD_MAILPOET]); $settings->set(Mailer::MAILER_CONFIG_SETTING_NAME, ['method' => Mailer::METHOD_MAILPOET]);
$sender = new ConfirmationEmailMailer($mailer); $sender = new ConfirmationEmailMailer($mailer);