diff --git a/mailpoet/tests/integration/API/JSON/v1/MailerTest.php b/mailpoet/tests/integration/API/JSON/v1/MailerTest.php index 90dece6908..bd036d73a4 100644 --- a/mailpoet/tests/integration/API/JSON/v1/MailerTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/MailerTest.php @@ -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(); } } diff --git a/mailpoet/tests/integration/API/JSON/v1/ServicesTest.php b/mailpoet/tests/integration/API/JSON/v1/ServicesTest.php index 6f29bd69de..112575cf9b 100644 --- a/mailpoet/tests/integration/API/JSON/v1/ServicesTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/ServicesTest.php @@ -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) ); } } diff --git a/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php b/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php index 6d3fb0e0fb..d2cd395301 100644 --- a/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php @@ -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(), diff --git a/mailpoet/tests/integration/Services/AuthorizedEmailsControllerTest.php b/mailpoet/tests/integration/Services/AuthorizedEmailsControllerTest.php index 9b8abfd770..cc79bc9448 100644 --- a/mailpoet/tests/integration/Services/AuthorizedEmailsControllerTest.php +++ b/mailpoet/tests/integration/Services/AuthorizedEmailsControllerTest.php @@ -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() {