diff --git a/lib/Subscribers/ImportExport/Import/Import.php b/lib/Subscribers/ImportExport/Import/Import.php index 4b22b28087..ff16d5ddac 100644 --- a/lib/Subscribers/ImportExport/Import/Import.php +++ b/lib/Subscribers/ImportExport/Import/Import.php @@ -378,7 +378,7 @@ class Import { ); } $this->addSubscribersToSegments( - array_keys($result), + $result, $this->segments ); return $result; diff --git a/tests/unit/Subscribers/ImportExport/Import/ImportTest.php b/tests/unit/Subscribers/ImportExport/Import/ImportTest.php index 94505648fa..e33db597c2 100644 --- a/tests/unit/Subscribers/ImportExport/Import/ImportTest.php +++ b/tests/unit/Subscribers/ImportExport/Import/ImportTest.php @@ -318,7 +318,6 @@ class ImportTest extends MailPoetTest { ->equals($subscribers_data[$custom_field][1]); } - function testItCanAddSubscribersToSegments() { $subscribers_data = $this->subscribers_data; $this->import->createOrUpdateSubscribers( @@ -336,9 +335,17 @@ class ImportTest extends MailPoetTest { $db_subscribers, array($this->segment_1->id, $this->segment_2->id) ); - $subscribers_segments = SubscriberSegment::findArray(); // 2 subscribers * 2 segments - expect(count($subscribers_segments))->equals(4); + foreach($db_subscribers as $db_subscriber) { + $subscriber_segment_1 = SubscriberSegment::where('subscriber_id', $db_subscriber) + ->where('segment_id', $this->segment_1->id) + ->findOne(); + expect($subscriber_segment_1)->notEmpty(); + $subscriber_segment_2 = SubscriberSegment::where('subscriber_id', $db_subscriber) + ->where('segment_id', $this->segment_2->id) + ->findOne(); + expect($subscriber_segment_2)->notEmpty(); + } } function testItCanDeleteExistingTrashedSubscribers() {