diff --git a/lib/API/MP/v1/API.php b/lib/API/MP/v1/API.php index f495c776e4..40ee664473 100644 --- a/lib/API/MP/v1/API.php +++ b/lib/API/MP/v1/API.php @@ -177,7 +177,7 @@ class API { } } - if (!$skip_subscriber_notification) { + if (!$skip_subscriber_notification && ($subscriber->status === Subscriber::STATUS_SUBSCRIBED)) { $this->sendSubscriberNotification($subscriber, $found_segments_ids); } @@ -298,7 +298,7 @@ class API { $this->_scheduleWelcomeNotification($new_subscriber, $list_ids); } - if (!$skip_subscriber_notification) { + if (!$skip_subscriber_notification && ($new_subscriber->status === Subscriber::STATUS_SUBSCRIBED)) { $this->sendSubscriberNotification($new_subscriber, $list_ids); } } diff --git a/tests/integration/API/MP/APITest.php b/tests/integration/API/MP/APITest.php index ad485d55f9..f8d2ebfc32 100644 --- a/tests/integration/API/MP/APITest.php +++ b/tests/integration/API/MP/APITest.php @@ -265,7 +265,7 @@ class APITest extends \MailPoetTest { function testItSendsNotifiationEmailWhenBeingAddedToList() { $subscriber = Subscriber::create(); $subscriber->hydrate(Fixtures::get('subscriber_template')); - $subscriber->status = Subscriber::STATUS_UNCONFIRMED; + $subscriber->status = Subscriber::STATUS_SUBSCRIBED; $subscriber->save(); $segment = Segment::createOrUpdate([ 'name' => 'Default', @@ -555,7 +555,9 @@ class APITest extends \MailPoetTest { 'addSubscriber', [ '_scheduleWelcomeNotification' => Expected::never(), - 'new_subscriber_notification_mailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']), + 'new_subscriber_notification_mailer' => Stub::makeEmpty( + NewSubscriberNotificationMailer::class, ['send' => Expected::never()] + ), 'required_custom_field_validator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']), ], $this); $subscriber = [