MAGETWO-52512: Newsletter subscription is not subscribing when Need to confirm is set to yes

Author: Yaroslav Onischenko

dev/tests/integration/testsuite/Magento/Newsletter/Model/ResourceModel/Subscriber/CollectionTest.php

@@ -30,16 +30,15 @@ public function testShowCustomerInfo()
         $subscribers = $this->_collectionModel->getItems();
         $this->assertCount(3, $subscribers);
 
-        $subscriber = array_shift($subscribers);
-        $this->assertEquals('John', $subscriber->getFirstname(), $subscriber->getSubscriberEmail());
-        $this->assertEquals('Smith', $subscriber->getLastname(), $subscriber->getSubscriberEmail());
-
-        $subscriber = array_shift($subscribers);
-        $this->assertEquals('John', $subscriber->getFirstname(), $subscriber->getSubscriberEmail());
-        $this->assertEquals('Smith', $subscriber->getLastname(), $subscriber->getSubscriberEmail());
-
-        $subscriber = array_shift($subscribers);
-        $this->assertNull($subscriber->getFirstname(), $subscriber->getSubscriberEmail());
-        $this->assertNull($subscriber->getLastname(), $subscriber->getSubscriberEmail());
+        while ($subscribers) {
+            $subscriber = array_shift($subscribers);
+            if ($subscriber->getCustomerId()) {
+                $this->assertEquals('John', $subscriber->getFirstname(), $subscriber->getSubscriberEmail());
+                $this->assertEquals('Smith', $subscriber->getLastname(), $subscriber->getSubscriberEmail());
+            } else {
+                $this->assertNull($subscriber->getFirstname(), $subscriber->getSubscriberEmail());
+                $this->assertNull($subscriber->getLastname(), $subscriber->getSubscriberEmail());
+            }
+        }
     }
 }