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

Fixes condition that allowed unsubscribing from WP segments

Browse Source
This commit is contained in:
Vlad
2017-11-14 09:56:53 -05:00
parent 4f77ca31a3
commit adea1e9be1
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Models/SubscriberSegment.php
View File

@ -21,10 +21,7 @@ class SubscriberSegment extends Model {
foreach($segment_ids as $segment_id) { foreach($segment_ids as $segment_id) {
// do not remove subscriptions to the WP Users segment // do not remove subscriptions to the WP Users segment
if( if($wp_segment !== false && (int)$wp_segment->id === (int)$segment_id) {
$wp_segment !== false
&& ($wp_segment->id === (int)$segment_id)
) {
continue; continue;
} }

38
tests/unit/Models/SubscriberSegmentTest.php
View File

@ -77,6 +77,44 @@ class SubscriberSegmentTest extends \MailPoetTest {
expect($subscribed_segments[0]['name'])->equals($this->segment_2->name); expect($subscribed_segments[0]['name'])->equals($this->segment_2->name);
} }
function testItDoesNotUnsubscribeFromWPSegment() {
$subscriber = $this->subscriber;
$segment_1 = $this->segment_1;
$segment_1->type = Segment::TYPE_WP_USERS;
$segment_1->save();
$segment_2 = $this->segment_2;
$subscriber_segment = SubscriberSegment::createOrUpdate(
array(
'subscriber_id' => $subscriber->id,
'segment_id' => $segment_1->id,
'status' => Subscriber::STATUS_SUBSCRIBED
)
);
$subscriber_segment = SubscriberSegment::createOrUpdate(
array(
'subscriber_id' => $subscriber->id,
'segment_id' => $this->segment_2->id,
'status' => Subscriber::STATUS_SUBSCRIBED
)
);
// verify that subscriber is subscribed to 2 segments
$subscriber = Subscriber::findOne($subscriber->id)->withSubscriptions();
expect($subscriber->subscriptions[0]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
expect($subscriber->subscriptions[0]['segment_id'])->equals($segment_1->id);
expect($subscriber->subscriptions[1]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
expect($subscriber->subscriptions[1]['segment_id'])->equals($segment_2->id);
// verify that subscriber is not subscribed only to the non-WP segment (#2)
SubscriberSegment::unsubscribeFromSegments($subscriber, array($segment_1->id, $segment_2->id));
$subscriber = Subscriber::findOne($subscriber->id)->withSubscriptions();
expect($subscriber->subscriptions[0]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
expect($subscriber->subscriptions[0]['segment_id'])->equals($segment_1->id);
expect($subscriber->subscriptions[1]['status'])->equals(Subscriber::STATUS_UNSUBSCRIBED);
expect($subscriber->subscriptions[1]['segment_id'])->equals($segment_2->id);
}
function testItCanUnsubscribeFromAllSegments() { function testItCanUnsubscribeFromAllSegments() {
SubscriberSegment::createOrUpdate(array( SubscriberSegment::createOrUpdate(array(
'subscriber_id' => $this->subscriber->id, 'subscriber_id' => $this->subscriber->id,