MAGETWO-84686: MAGETWO-84525 Send newsletter subscription success email after confirmation #12478

 - Merge Pull Request #12478 from RhodriOwainDavies/magento2:MAGETWO-84525
 - Merged commits:
   1. 7b88103
   2. 5140041

Author: Stanislav Idolov

app/code/Magento/Newsletter/Model/Subscriber.php

@@ -621,6 +621,8 @@ public function confirm($code)
             $this->setStatus(self::STATUS_SUBSCRIBED)
                 ->setStatusChanged(true)
                 ->save();
+
+            $this->sendConfirmationSuccessEmail();
             return true;
         }
 

dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php

@@ -12,11 +12,11 @@ class SubscriberTest extends \PHPUnit\Framework\TestCase
     /**
      * @var Subscriber
      */
-    protected $_model;
+    private $model;
 
     protected function setUp()
     {
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+        $this->model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Newsletter\Model\Subscriber::class
         );
     }
@@ -27,26 +27,26 @@ protected function setUp()
      */
     public function testEmailConfirmation()
     {
-        $this->_model->subscribe('customer_confirm@example.com');
+        $this->model->subscribe('customer_confirm@example.com');
         /** @var TransportBuilderMock $transportBuilder */
         $transportBuilder = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->get(\Magento\TestFramework\Mail\Template\TransportBuilderMock::class);
         // confirmationCode 'ysayquyajua23iq29gxwu2eax2qb6gvy' is taken from fixture
         $this->assertContains(
-            '/newsletter/subscriber/confirm/id/' . $this->_model->getSubscriberId()
+            '/newsletter/subscriber/confirm/id/' . $this->model->getSubscriberId()
             . '/code/ysayquyajua23iq29gxwu2eax2qb6gvy',
             $transportBuilder->getSentMessage()->getRawMessage()
         );
-        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->_model->getSubscriberStatus());
+        $this->assertEquals(Subscriber::STATUS_NOT_ACTIVE, $this->model->getSubscriberStatus());
     }
 
     /**
      * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
      */
     public function testLoadByCustomerId()
     {
-        $this->assertSame($this->_model, $this->_model->loadByCustomerId(1));
-        $this->assertEquals('customer@example.com', $this->_model->getSubscriberEmail());
+        $this->assertSame($this->model, $this->model->loadByCustomerId(1));
+        $this->assertEquals('customer@example.com', $this->model->getSubscriberEmail());
     }
 
     /**
@@ -56,13 +56,13 @@ public function testLoadByCustomerId()
     public function testUnsubscribeSubscribe()
     {
         // Unsubscribe and verify
-        $this->assertSame($this->_model, $this->_model->loadByCustomerId(1));
-        $this->assertEquals($this->_model, $this->_model->unsubscribe());
-        $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $this->_model->getSubscriberStatus());
+        $this->assertSame($this->model, $this->model->loadByCustomerId(1));
+        $this->assertEquals($this->model, $this->model->unsubscribe());
+        $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $this->model->getSubscriberStatus());
 
         // Subscribe and verify
-        $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->_model->subscribe('customer@example.com'));
-        $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->_model->getSubscriberStatus());
+        $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->model->subscribe('customer@example.com'));
+        $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->model->getSubscriberStatus());
     }
 
     /**
@@ -72,11 +72,32 @@ public function testUnsubscribeSubscribe()
     public function testUnsubscribeSubscribeByCustomerId()
     {
         // Unsubscribe and verify
-        $this->assertSame($this->_model, $this->_model->unsubscribeCustomerById(1));
-        $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $this->_model->getSubscriberStatus());
+        $this->assertSame($this->model, $this->model->unsubscribeCustomerById(1));
+        $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $this->model->getSubscriberStatus());
 
         // Subscribe and verify
-        $this->assertSame($this->_model, $this->_model->subscribeCustomerById(1));
-        $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->_model->getSubscriberStatus());
+        $this->assertSame($this->model, $this->model->subscribeCustomerById(1));
+        $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $this->model->getSubscriberStatus());
+    }
+
+    /**
+     * @magentoDataFixture Magento/Newsletter/_files/subscribers.php
+     * @magentoConfigFixture current_store newsletter/subscription/confirm 1
+     */
+    public function testConfirm()
+    {
+        $customerEmail = 'customer_confirm@example.com';
+        $this->model->subscribe($customerEmail);
+        $this->model->loadByEmail($customerEmail);
+        $this->model->confirm($this->model->getSubscriberConfirmCode());
+
+        $transportBuilder = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\TestFramework\Mail\Template\TransportBuilderMock::class
+        );
+
+        $this->assertContains(
+            'You have been successfully subscribed to our newsletter.',
+            $transportBuilder->getSentMessage()->getRawMessage()
+        );
     }
 }