diff --git a/lib/API/MP/v1/API.php b/lib/API/MP/v1/API.php index 04c7234390..fc40c3e580 100644 --- a/lib/API/MP/v1/API.php +++ b/lib/API/MP/v1/API.php @@ -303,15 +303,6 @@ class API { 'schedule_welcome_email' => $scheduleWelcomeEmail, 'skip_subscriber_notification' => $skipSubscriberNotification, ]); - - // schedule welcome email(s) - if ($scheduleWelcomeEmail && $newSubscriber->status === Subscriber::STATUS_SUBSCRIBED) { - $this->_scheduleWelcomeNotification($newSubscriber, $listIds); - } - - if (!$skipSubscriberNotification && ($newSubscriber->status === Subscriber::STATUS_SUBSCRIBED)) { - $this->sendSubscriberNotification($newSubscriber, $listIds); - } } return $newSubscriber->withCustomFields()->withSubscriptions()->asArray(); } diff --git a/tests/integration/API/MP/APITest.php b/tests/integration/API/MP/APITest.php index 4e5810bdaa..d8f56caf22 100644 --- a/tests/integration/API/MP/APITest.php +++ b/tests/integration/API/MP/APITest.php @@ -523,20 +523,27 @@ class APITest extends \MailPoetTest { } public function testItSchedulesWelcomeNotificationByDefaultAfterAddingSubscriber() { + $segment = Segment::createOrUpdate( + [ + 'name' => 'Default', + 'type' => Segment::TYPE_DEFAULT, + ] + ); $settings = SettingsController::getInstance(); $settings->set('signup_confirmation.enabled', false); - $API = Stub::makeEmptyExcept( + $API = Stub::make( \MailPoet\API\MP\v1\API::class, - 'addSubscriber', [ 'newSubscriberNotificationMailer' => Stub::makeEmpty(NewSubscriberNotificationMailer::class, ['send']), 'requiredCustomFieldValidator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']), '_scheduleWelcomeNotification' => Expected::once(), - ], $this); + ], + $this + ); $subscriber = [ 'email' => 'test@example.com', ]; - $segments = [1]; + $segments = [$segment->id]; $API->addSubscriber($subscriber, $segments); }