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

After rebase fix

Browse Source 
[MAILPOET-1985]
This commit is contained in:
Ján Mikláš
2019-06-04 09:52:03 +02:00
committed by M. Shull
parent 076478155b
commit 22d09538c5
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/API/JSON/v1/Mailer.php
View File

@@ -7,6 +7,7 @@ use MailPoet\API\JSON\Error as APIError;
use MailPoet\Config\AccessControl; use MailPoet\Config\AccessControl;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@@ -17,6 +18,9 @@ class Mailer extends APIEndpoint {
/** @var AuthorizedEmailsController */ /** @var AuthorizedEmailsController */
private $authorized_emails_controller; private $authorized_emails_controller;
/** @var Bridge */
private $bridge;
/** @var SettingsController */ /** @var SettingsController */
private $settings; private $settings;
@@ -24,9 +28,10 @@ class Mailer extends APIEndpoint {
'global' => AccessControl::PERMISSION_MANAGE_EMAILS, 'global' => AccessControl::PERMISSION_MANAGE_EMAILS,
]; ];
function __construct(AuthorizedEmailsController $authorized_emails_controller, SettingsController $settings) { function __construct(AuthorizedEmailsController $authorized_emails_controller, SettingsController $settings, Bridge $bridge) {
$this->authorized_emails_controller = $authorized_emails_controller; $this->authorized_emails_controller = $authorized_emails_controller;
$this->settings = $settings; $this->settings = $settings;
$this->bridge = $bridge;
} }
function send($data = []) { function send($data = []) {

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

@@ -6,6 +6,7 @@ use MailPoet\API\JSON\v1\Mailer;
use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\Response as APIResponse;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
class MailerTest extends \MailPoetTest { class MailerTest extends \MailPoetTest {
@@ -18,7 +19,8 @@ class MailerTest extends \MailPoetTest {
$settings = new SettingsController(); $settings = new SettingsController();
$authorized_emails_controller = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::never()]); $authorized_emails_controller = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::never()]);
// resumeSending() method should clear the mailer log's status // resumeSending() method should clear the mailer log's status
$mailer_endpoint = new Mailer($authorized_emails_controller, $settings); $bridge = new Bridge($settings);
$mailer_endpoint = new Mailer($authorized_emails_controller, $settings, $bridge);
$response = $mailer_endpoint->resumeSending(); $response = $mailer_endpoint->resumeSending();
expect($response->status)->equals(APIResponse::STATUS_OK); expect($response->status)->equals(APIResponse::STATUS_OK);
$mailer_log = MailerLog::getMailerLog(); $mailer_log = MailerLog::getMailerLog();
@@ -29,7 +31,8 @@ class MailerTest extends \MailPoetTest {
$settings = new SettingsController(); $settings = new SettingsController();
$settings->set(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, ['invalid_sender_address' => 'a@b.c']); $settings->set(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, ['invalid_sender_address' => 'a@b.c']);
$authorized_emails_controller = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::once()]); $authorized_emails_controller = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::once()]);
$mailer_endpoint = new Mailer($authorized_emails_controller, $settings); $bridge = new Bridge($settings);
$mailer_endpoint = new Mailer($authorized_emails_controller, $settings, $bridge);
$mailer_endpoint->resumeSending(); $mailer_endpoint->resumeSending();
} }
} }