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

Catches exceptions during sending

Browse Source
This commit is contained in:
Vlad
2017-11-27 20:32:11 -05:00
committed by pavel-mailpoet
parent 88ef454844
commit b6f62bd9bc
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Mailer/Methods/AmazonSES.php
View File

@@ -50,10 +50,14 @@ class AmazonSES {
} }
function send($newsletter, $subscriber, $extra_params = array()) { function send($newsletter, $subscriber, $extra_params = array()) {
$result = wp_remote_post( try {
$this->url, $result = wp_remote_post(
$this->request($newsletter, $subscriber, $extra_params) $this->url,
); $this->request($newsletter, $subscriber, $extra_params)
);
} catch(\Exception $e) {
return Mailer::formatMailerSendErrorResult($e->getMessage());
}
if(is_wp_error($result)) { if(is_wp_error($result)) {
return Mailer::formatMailerConnectionErrorResult($result->get_error_message()); return Mailer::formatMailerConnectionErrorResult($result->get_error_message());
} }

10
tests/unit/Mailer/Methods/AmazonSESTest.php
View File

@@ -216,6 +216,16 @@ class AmazonSESTest extends \MailPoetTest {
expect($result['response'])->false(); expect($result['response'])->false();
} }
function testItCatchesSendingErrors() {
$invalid_subscriber = 'john.@doe.com';
$result = $this->mailer->send(
$this->newsletter,
$invalid_subscriber
);
expect($result['response'])->false();
expect($result['error_message'])->contains('does not comply with RFC 2822');
}
function testItCanSend() { function testItCanSend() {
if(getenv('WP_TEST_MAILER_ENABLE_SENDING') !== 'true') return; if(getenv('WP_TEST_MAILER_ENABLE_SENDING') !== 'true') return;
$result = $this->mailer->send( $result = $this->mailer->send(