MC-30604: Storefront: Subscribe/unsubscribe to email newsletter

Author: ysapiga

dev/tests/integration/testsuite/Magento/Newsletter/Controller/Manage/SaveTest.php

@@ -62,17 +62,15 @@ protected function tearDown()
      *
      * @dataProvider subscriptionDataProvider
      *
-     * @param string $isSubscribed
+     * @param bool $isSubscribed
      * @param string $expectedMessage
      * @return void
      */
-    public function testSaveAction(string $isSubscribed, string $expectedMessage): void
+    public function testSaveAction(bool $isSubscribed, string $expectedMessage): void
     {
         $this->loginCustomer('new_customer@example.com');
-        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())
-            ->setParam('is_subscribed', $isSubscribed);
         $this->_objectManager->removeSharedInstance(CustomerPlugin::class);
-        $this->dispatch('newsletter/manage/save');
+        $this->dispatchSaveAction($isSubscribed);
         $this->assertSuccessSubscription($expectedMessage);
     }
 
@@ -83,11 +81,11 @@ public function subscriptionDataProvider(): array
     {
         return [
             'subscribe_customer' => [
-                'is_subscribed' => 1,
+                'is_subscribed' => true,
                 'expected_message' => 'We have saved your subscription.',
             ],
             'unsubscribe_customer' => [
-                'is_subscribed' => 0,
+                'is_subscribed' => false,
                 'expected_message' => 'We have updated your subscription.',
             ],
         ];
@@ -102,8 +100,7 @@ public function subscriptionDataProvider(): array
     public function testSubscribeWithEnabledConfirmation(): void
     {
         $this->loginCustomer('new_customer@example.com');
-        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())->setParam('is_subscribed', '1');
-        $this->dispatch('newsletter/manage/save');
+        $this->dispatchSaveAction(true);
         $this->assertSuccessSubscription('A confirmation request has been sent.');
     }
 
@@ -115,12 +112,25 @@ public function testSubscribeWithEnabledConfirmation(): void
     public function testUnsubscribeSubscribedCustomer(): void
     {
         $this->loginCustomer('new_customer@example.com');
-        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())->setParam('is_subscribed', '0');
         $this->_objectManager->removeSharedInstance(CustomerPlugin::class);
-        $this->dispatch('newsletter/manage/save');
+        $this->dispatchSaveAction(false);
         $this->assertSuccessSubscription('We have removed your newsletter subscription.');
     }
 
+    /**
+     * Dispatch save action with parameters
+     *
+     * @param string $isSubscribed
+     * @return void
+     */
+    private function dispatchSaveAction(bool $isSubscribed): void
+    {
+        $this->_objectManager->removeSharedInstance(CustomerPlugin::class);
+        $this->getRequest()->setParam('form_key', $this->formKey->getFormKey())
+            ->setParam('is_subscribed', $isSubscribed);
+        $this->dispatch('newsletter/manage/save');
+    }
+
     /**
      * Login customer by email
      *

dev/tests/integration/testsuite/Magento/Newsletter/Controller/NewActionTest.php renamed to dev/tests/integration/testsuite/Magento/Newsletter/Controller/Subscriber/NewActionTest.php

@@ -7,9 +7,10 @@
 
 namespace Magento\Newsletter\Controller;
 
+use Laminas\Stdlib\Parameters;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Session;
-use Magento\Framework\Webapi\Rest\Request;
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Newsletter\Model\ResourceModel\Subscriber as SubscriberResource;
 use Magento\Newsletter\Model\ResourceModel\Subscriber\CollectionFactory;
 use Magento\TestFramework\TestCase\AbstractController;
@@ -207,7 +208,10 @@ public function testWithEmailAssignedToAnotherCustomer(): void
      */
     private function prepareRequest(string $email): void
     {
-        $this->getRequest()->setMethod(Request::HTTP_METHOD_POST);
+        $parameters = $this->_objectManager->create(Parameters::class);
+        $parameters->set('HTTP_REFERER', 'http://localhost/testRedirect');
+        $this->getRequest()->setServer($parameters);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(['email' => $email]);
     }
 
@@ -222,7 +226,7 @@ private function performAsserts(string $message): void
         if ($message) {
             $this->assertSessionMessages($this->equalTo([(string)__($message)]));
         }
-        $this->assertRedirect($this->stringContains('/index.php'));
+        $this->assertRedirect($this->equalTo('http://localhost/testRedirect'));
     }
 
     /**