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

Update tests, update dependencies

Browse Source 
MAILPOET-4601
This commit is contained in:
Oluwaseun Olorunsola
2022-09-13 22:02:44 +01:00
committed by Aschepikov
parent 5bcb80d2a0
commit 31732dbf3b
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mailpoet/tests/integration/API/JSON/v1/MailerTest.php
View File

@@ -9,6 +9,7 @@ use MailPoet\Mailer\MailerFactory;
use MailPoet\Mailer\MailerLog;
use MailPoet\Mailer\MetaInfo;
use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\AuthorizedSenderDomainController;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController;
@@ -22,9 +23,10 @@ class MailerTest extends \MailPoetTest {
expect($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
$settings = SettingsController::getInstance();
$authorizedEmailsController = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::never()]);
$senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
// resumeSending() method should clear the mailer log's status
$bridge = new Bridge($settings);
$mailerEndpoint = new Mailer($authorizedEmailsController, $settings, $bridge, $this->diContainer->get(MailerFactory::class), new MetaInfo);
$mailerEndpoint = new Mailer($authorizedEmailsController, $settings, $bridge, $this->diContainer->get(MailerFactory::class), new MetaInfo, $senderDomainController);
$response = $mailerEndpoint->resumeSending();
expect($response->status)->equals(APIResponse::STATUS_OK);
$mailerLog = MailerLog::getMailerLog();
@@ -35,8 +37,9 @@ class MailerTest extends \MailPoetTest {
$settings = SettingsController::getInstance();
$settings->set(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, ['invalid_sender_address' => 'a@b.c']);
$authorizedEmailsController = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::once()]);
$senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
$bridge = new Bridge($settings);
$mailerEndpoint = new Mailer($authorizedEmailsController, $settings, $bridge, $this->diContainer->get(MailerFactory::class), new MetaInfo);
$mailerEndpoint = new Mailer($authorizedEmailsController, $settings, $bridge, $this->diContainer->get(MailerFactory::class), new MetaInfo, $senderDomainController);
$mailerEndpoint->resumeSending();
}
}

4
mailpoet/tests/integration/API/JSON/v1/ServicesTest.php
View File

@@ -12,6 +12,7 @@ use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck;
use MailPoet\Cron\Workers\KeyCheck\SendingServiceKeyCheck;
use MailPoet\Mailer\Mailer;
use MailPoet\Mailer\MailerLog;
use MailPoet\Services\AuthorizedSenderDomainController;
use MailPoet\Services\Bridge;
use MailPoet\Services\CongratulatoryMssEmailController;
use MailPoet\Settings\SettingsController;
@@ -549,7 +550,8 @@ class ServicesTest extends \MailPoetTest {
$this->diContainer->get(PremiumKeyCheck::class),
$this->diContainer->get(ServicesChecker::class),
$mocks['congratulatoryEmailController'] ?? $this->diContainer->get(CongratulatoryMssEmailController::class),
$this->diContainer->get(WPFunctions::class)
$this->diContainer->get(WPFunctions::class),
$this->diContainer->get(AuthorizedSenderDomainController::class)
);
}
}

9
mailpoet/tests/integration/API/JSON/v1/SettingsTest.php
View File

@@ -130,10 +130,11 @@ class SettingsTest extends \MailPoetTest {
public function testItSetsAuthorizedFromAddressAndResumesSending() {
$bridgeMock = $this->make(Bridge::class, ['getAuthorizedEmailAddresses' => Expected::once(['authorized@email.com'])]);
$senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
$this->endpoint = new Settings(
$this->settings,
$bridgeMock,
new AuthorizedEmailsController($this->settings, $bridgeMock, $this->diContainer->get(NewslettersRepository::class)),
new AuthorizedEmailsController($this->settings, $bridgeMock, $this->diContainer->get(NewslettersRepository::class), $senderDomainController),
$this->diContainer->get(AuthorizedSenderDomainController::class),
$this->make(TransactionalEmails::class),
WPFunctions::get(),
@@ -160,10 +161,11 @@ class SettingsTest extends \MailPoetTest {
public function testItSaveUnauthorizedAddressAndReturnsMeta() {
$this->settings->set(Mailer::MAILER_CONFIG_SETTING_NAME, ['method' => Mailer::METHOD_MAILPOET]);
$bridgeMock = $this->make(Bridge::class, ['getAuthorizedEmailAddresses' => Expected::once(['authorized@email.com'])]);
$senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
$this->endpoint = new Settings(
$this->settings,
$bridgeMock,
new AuthorizedEmailsController($this->settings, $bridgeMock, $this->diContainer->get(NewslettersRepository::class)),
new AuthorizedEmailsController($this->settings, $bridgeMock, $this->diContainer->get(NewslettersRepository::class), $senderDomainController),
$this->diContainer->get(AuthorizedSenderDomainController::class),
$this->make(TransactionalEmails::class),
WPFunctions::get(),
@@ -192,10 +194,11 @@ class SettingsTest extends \MailPoetTest {
public function testItRejectsUnauthorizedFromAddress() {
$bridgeMock = $this->make(Bridge::class, ['getAuthorizedEmailAddresses' => Expected::once(['authorized@email.com'])]);
$senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
$this->endpoint = new Settings(
$this->settings,
$bridgeMock,
new AuthorizedEmailsController($this->settings, $bridgeMock, $this->diContainer->get(NewslettersRepository::class)),
new AuthorizedEmailsController($this->settings, $bridgeMock, $this->diContainer->get(NewslettersRepository::class), $senderDomainController),
$this->diContainer->get(AuthorizedSenderDomainController::class),
$this->make(TransactionalEmails::class),
WPFunctions::get(),

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

@@ -11,6 +11,7 @@ use MailPoet\Mailer\MailerError;
use MailPoet\Mailer\MailerLog;
use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\AuthorizedSenderDomainController;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController;
use MailPoet\Test\DataFactories\Newsletter as NewsletterFactory;
@@ -267,7 +268,8 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
'createAuthorizedEmailAddress' => Expected::once($response)
]);
$newslettersRepository = $this->diContainer->get(NewslettersRepository::class);
$controller = new AuthorizedEmailsController($this->settings, $bridgeMock, $newslettersRepository);
$senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
$controller = new AuthorizedEmailsController($this->settings, $bridgeMock, $newslettersRepository, $senderDomainController);
$result = $controller->createAuthorizedEmailAddress('new-authorized@email.com');
expect($result)->equals($response);
}
@@ -282,7 +284,8 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
'createAuthorizedEmailAddress' => Expected::once(['error' => $errorMessage])
]);
$newslettersRepository = $this->diContainer->get(NewslettersRepository::class);
$controller = new AuthorizedEmailsController($this->settings, $bridgeMock, $newslettersRepository);
$senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
$controller = new AuthorizedEmailsController($this->settings, $bridgeMock, $newslettersRepository, $senderDomainController);
$controller->createAuthorizedEmailAddress('new-authorized@email.com');
}
@@ -324,7 +327,9 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
}
$bridgeMock = $this->make(Bridge::class, ['getAuthorizedEmailAddresses' => $getEmailsExpectaton]);
$newslettersRepository = $this->diContainer->get(NewslettersRepository::class);
return new AuthorizedEmailsController($this->settings, $bridgeMock, $newslettersRepository);
$senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
return new AuthorizedEmailsController($this->settings, $bridgeMock, $newslettersRepository, $senderDomainController);
}
public function _after() {