refactor cover changes with unit test

Nazar65 · Nazar65 · commit 511e16a3ce00 · 2020-02-12T14:59:27.000+02:00
diff --git a/app/code/Magento/Customer/Model/Account/Redirect.php b/app/code/Magento/Customer/Model/Account/Redirect.php
@@ -7,19 +7,19 @@
 
 use Magento\Customer\Model\Session;
 use Magento\Customer\Model\Url as CustomerUrl;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Forward as ResultForward;
+use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Framework\Url\DecoderInterface;
 use Magento\Framework\Url\HostChecker;
 use Magento\Framework\UrlInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
-use Magento\Framework\Controller\Result\Forward as ResultForward;
-use Magento\Framework\Url\DecoderInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Stdlib\CookieManagerInterface;
 
 /**
  * Account Redirect
@@ -298,11 +298,14 @@ public function getRedirectCookie()
      */
     public function setRedirectCookie($route)
     {
-        $cookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
-                                                      ->setHttpOnly(true)
-                                                      ->setDuration(3600)
-                                                      ->setPath($this->storeManager->getStore()->getStorePath());
-        $this->getCookieManager()->setPublicCookie(self::LOGIN_REDIRECT_URL, $route, $cookieMetadata);
+        $this->getCookieManager()->setPublicCookie(
+            self::LOGIN_REDIRECT_URL,
+            $route,
+            $this->cookieMetadataFactory->createPublicCookieMetadata()
+                ->setHttpOnly(true)
+                ->setDuration(3600)
+                ->setPath($this->storeManager->getStore()->getStorePath())
+        );
     }
 
     /**
@@ -314,8 +317,10 @@ public function setRedirectCookie($route)
      */
     public function clearRedirectCookie()
     {
-        $cookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
-                                                      ->setPath($this->storeManager->getStore()->getStorePath());
-        $this->getCookieManager()->deleteCookie(self::LOGIN_REDIRECT_URL, $cookieMetadata);
+        $this->getCookieManager()->deleteCookie(
+            self::LOGIN_REDIRECT_URL,
+            $this->cookieMetadataFactory->createPublicCookieMetadata()
+                ->setPath($this->storeManager->getStore()->getStorePath())
+        );
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php b/app/code/Magento/Customer/Test/Unit/Model/Account/RedirectTest.php
@@ -8,93 +8,99 @@
 
 namespace Magento\Customer\Test\Unit\Model\Account;
 
-use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Customer\Model\Account\Redirect;
 use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
+use Magento\Framework\Stdlib\Cookie\PublicCookieMetadata;
+use Magento\Framework\Stdlib\CookieManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Url\HostChecker;
 use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\FrameworkMockObject\MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class RedirectTest extends \PHPUnit\Framework\TestCase
+class RedirectTest extends TestCase
 {
     /**
      * @var Redirect
      */
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\RequestInterface
+     * @var MockObject|\Magento\Framework\App\RequestInterface
      */
     protected $request;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Model\Session
+     * @var MockObject|\Magento\Customer\Model\Session
      */
     protected $customerSession;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var MockObject|\Magento\Framework\App\Config\ScopeConfigInterface
      */
     protected $scopeConfig;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface
+     * @var MockObject|\Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\Store
+     * @var MockObject|\Magento\Store\Model\Store
      */
     protected $store;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\UrlInterface
+     * @var MockObject|\Magento\Framework\UrlInterface
      */
     protected $url;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Url\DecoderInterface
+     * @var MockObject|\Magento\Framework\Url\DecoderInterface
      */
     protected $urlDecoder;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Customer\Model\Url
+     * @var MockObject|\Magento\Customer\Model\Url
      */
     protected $customerUrl;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Controller\Result\Redirect
+     * @var MockObject|\Magento\Framework\Controller\Result\Redirect
      */
     protected $resultRedirect;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Controller\Result\Forward
+     * @var MockObject|\Magento\Framework\Controller\Result\Forward
      */
     protected $resultForward;
 
     /**
-     * @var ResultFactory | \PHPUnit_Framework_MockObject_MockObject
+     * @var ResultFactory|MockObject
      */
     protected $resultFactory;
 
     /**
-     * @var CookieMetadataFactory | \PHPUnit_Framework_MockObject_MockObject
+     * @var CookieMetadataFactory|MockObject
      */
     protected $cookieMetadataFactory;
 
     /**
-     * @var HostChecker | \PHPUnit_Framework_MockObject_MockObject
+     * @var HostChecker|MockObject
      */
     private $hostChecker;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
-
         $this->customerSession = $this->getMockBuilder(\Magento\Customer\Model\Session::class)
             ->disableOriginalConstructor()
             ->setMethods(
@@ -117,44 +123,27 @@ protected function setUp()
             ->getMock();
 
         $this->scopeConfig = $this->getMockForAbstractClass(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-
-        $this->store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
+        $this->store = $this->createMock(\Magento\Store\Model\Store::class);
         $this->storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
-        $this->storeManager->expects($this->once())
-            ->method('getStore')
-            ->willReturn($this->store);
-
         $this->url = $this->getMockForAbstractClass(\Magento\Framework\UrlInterface::class);
         $this->urlDecoder = $this->getMockForAbstractClass(\Magento\Framework\Url\DecoderInterface::class);
-
         $this->customerUrl = $this->getMockBuilder(\Magento\Customer\Model\Url::class)
-            ->setMethods(['DashboardUrl', 'getAccountUrl', 'getLoginUrl', 'getLogoutUrl', 'getDashboardUrl'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultRedirect = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultForward = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactory = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->cookieMetadataFactory = $this->getMockBuilder(CookieMetadataFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->hostChecker = $this->getMockBuilder(HostChecker::class)
-            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'DashboardUrl',
+                    'getAccountUrl',
+                    'getLoginUrl',
+                    'getLogoutUrl',
+                    'getDashboardUrl'
+                ]
+            )->disableOriginalConstructor()
             ->getMock();
 
+        $this->resultRedirect = $this->createMock(\Magento\Framework\Controller\Result\Redirect::class);
+        $this->resultForward = $this->createMock(\Magento\Framework\Controller\Result\Forward::class);
+        $this->resultFactory = $this->createMock(\Magento\Framework\Controller\ResultFactory::class);
+        $this->cookieMetadataFactory = $this->createMock(CookieMetadataFactory::class);
+        $this->hostChecker = $this->createMock(HostChecker::class);
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
             \Magento\Customer\Model\Account\Redirect::class,
@@ -174,6 +163,8 @@ protected function setUp()
     }
 
     /**
+     * Verify get redirect method
+     *
      * @param int $customerId
      * @param int $lastCustomerId
      * @param string $referer
@@ -214,6 +205,9 @@ public function testGetRedirect(
             ->willReturnSelf();
 
         // Preparations for method prepareRedirectUrl()
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->store);
         $this->store->expects($this->once())->method('getBaseUrl')->willReturn($baseUrl);
 
         $this->customerSession->expects($this->any())->method('getBeforeAuthUrl')->willReturn($beforeAuthUrl);
@@ -257,6 +251,8 @@ public function testGetRedirect(
     }
 
     /**
+     * Redirect data provider
+     *
      * @return array
      */
     public function getRedirectDataProvider()
@@ -305,7 +301,12 @@ public function getRedirectDataProvider()
         ];
     }
 
-    public function testBeforeRequestParams()
+    /**
+     * Verify before request params
+     *
+     * @return void
+     */
+    public function testBeforeRequestParams(): void
     {
         $requestParams = [
             'param1' => 'value1',
@@ -315,6 +316,9 @@ public function testBeforeRequestParams()
         $controller = 'controller';
         $action = 'action';
 
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->store);
         $this->customerSession->expects($this->exactly(2))
             ->method('getBeforeRequestParams')
             ->willReturn($requestParams);
@@ -327,7 +331,6 @@ public function testBeforeRequestParams()
         $this->customerSession->expects($this->once())
             ->method('getBeforeAction')
             ->willReturn($action);
-
         $this->resultForward->expects($this->once())
             ->method('setParams')
             ->with($requestParams)
@@ -344,7 +347,6 @@ public function testBeforeRequestParams()
             ->method('forward')
             ->with($action)
             ->willReturnSelf();
-
         $this->resultFactory->expects($this->once())
             ->method('create')
             ->with(ResultFactory::TYPE_FORWARD)
@@ -353,4 +355,82 @@ public function testBeforeRequestParams()
         $result = $this->model->getRedirect();
         $this->assertSame($this->resultForward, $result);
     }
+
+    /**
+     * Verify set redirect cokkie method
+     *
+     * @return void
+     */
+    public function testSetRedirectCookie(): void
+    {
+        $coockieManagerMock = $this->createMock(CookieManagerInterface::class);
+        $publicMetadataMock = $this->createMock(PublicCookieMetadata::class);
+        $routeMock = 'route';
+
+        $this->model->setCookieManager($coockieManagerMock);
+
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->store);
+        $this->store->expects($this->once())
+            ->method('getStorePath')
+            ->willReturn('storePath');
+        $this->cookieMetadataFactory->expects($this->once())
+            ->method('createPublicCookieMetadata')
+            ->willReturn($publicMetadataMock);
+        $publicMetadataMock->expects($this->once())
+            ->method('setHttpOnly')
+            ->with(true)
+            ->willReturnSelf();
+        $publicMetadataMock->expects($this->once())
+            ->method('setDuration')
+            ->with(3600)
+            ->willReturnSelf();
+        $publicMetadataMock->expects($this->once())
+            ->method('setPath')
+            ->with('storePath')
+            ->willReturnSelf();
+        $coockieManagerMock->expects($this->once())
+            ->method('setPublicCookie')
+            ->with(
+                Redirect::LOGIN_REDIRECT_URL,
+                $routeMock,
+                $publicMetadataMock
+            );
+        $this->model->setRedirectCookie($routeMock);
+    }
+
+    /**
+     * Verify clear redirect cookie
+     *
+     * @return void
+     */
+    public function testClearRedirectCookie(): void
+    {
+        $coockieManagerMock = $this->createMock(CookieManagerInterface::class);
+        $publicMetadataMock = $this->createMock(PublicCookieMetadata::class);
+
+        $this->model->setCookieManager($coockieManagerMock);
+
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->store);
+        $this->store->expects($this->once())
+            ->method('getStorePath')
+            ->willReturn('storePath');
+        $this->cookieMetadataFactory->expects($this->once())
+            ->method('createPublicCookieMetadata')
+            ->willReturn($publicMetadataMock);
+        $publicMetadataMock->expects($this->once())
+            ->method('setPath')
+            ->with('storePath')
+            ->willReturnSelf();
+        $coockieManagerMock->expects($this->once())
+            ->method('deleteCookie')
+            ->with(
+                Redirect::LOGIN_REDIRECT_URL,
+                $publicMetadataMock
+            );
+        $this->model->clearRedirectCookie();
+    }
 }
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
