MAGETWO-96522: Fix action behavior

Author: StasKozar

app/code/Magento/Customer/Test/Unit/Controller/Account/ForgotPasswordPostTest.php

@@ -73,6 +73,9 @@ class ForgotPasswordPostTest extends \PHPUnit_Framework_TestCase
      */
     private $formKeyValidatorMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->prepareContext();
@@ -92,12 +95,6 @@ protected function setUp()
             ->setMethods(['validate'])
             ->getMock();
 
-        $this->request->expects($this->once())->method('isPost')->willReturn(true);
-        $this->formKeyValidatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->request)
-            ->willReturn(true);
-
         $this->controller = new ForgotPasswordPost(
             $this->context,
             $this->session,
@@ -107,8 +104,12 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testExecuteEmptyEmail()
     {
+        $this->validateRequest();
         $this->request->expects($this->once())
             ->method('getPost')
             ->with('email')
@@ -127,10 +128,14 @@ public function testExecuteEmptyEmail()
         $this->assertSame($this->resultRedirect, $this->controller->execute());
     }
 
+    /**
+     * @return void
+     */
     public function testExecute()
     {
         $email = 'user1@example.com';
 
+        $this->validateRequest();
         $this->request->expects($this->once())
             ->method('getPost')
             ->with('email')
@@ -163,10 +168,14 @@ public function testExecute()
         $this->controller->execute();
     }
 
+    /**
+     * @return void
+     */
     public function testExecuteNoSuchEntityException()
     {
         $email = 'user1@example.com';
 
+        $this->validateRequest();
         $this->request->expects($this->once())
             ->method('getPost')
             ->with('email')
@@ -199,11 +208,15 @@ public function testExecuteNoSuchEntityException()
         $this->controller->execute();
     }
 
+    /**
+     * @return void
+     */
     public function testExecuteException()
     {
         $email = 'user1@example.com';
         $exception = new \Exception(__('Exception'));
 
+        $this->validateRequest();
         $this->request->expects($this->once())
             ->method('getPost')
             ->with('email')
@@ -227,6 +240,38 @@ public function testExecuteException()
         $this->controller->execute();
     }
 
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\NotFoundException
+     * @expectedExceptionMessage Page not found.
+     */
+    public function testExecuteWithNonPostRequest()
+    {
+        $this->request->expects($this->once())->method('isPost')->willReturn(false);
+
+        $this->controller->execute();
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithInvalidFormKey()
+    {
+        $this->request->expects($this->once())->method('isPost')->willReturn(true);
+        $this->formKeyValidatorMock->expects($this->once())
+            ->method('validate')
+            ->with($this->request)
+            ->willReturn(false);
+        $this->resultRedirect->expects($this->once())->method('setPath')->with('*/*/forgotpassword')->willReturnSelf();
+
+        $this->controller->execute();
+    }
+
+    /**
+     * Prepare action context.
+     *
+     * @return void
+     */
     protected function prepareContext()
     {
         $this->resultRedirect = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
@@ -267,4 +312,18 @@ protected function prepareContext()
             ->method('getMessageManager')
             ->willReturn($this->messageManager);
     }
+
+    /**
+     * Validate request.
+     *
+     * @return void
+     */
+    private function validateRequest()
+    {
+        $this->request->expects($this->once())->method('isPost')->willReturn(true);
+        $this->formKeyValidatorMock->expects($this->once())
+            ->method('validate')
+            ->with($this->request)
+            ->willReturn(true);
+    }
 }

app/code/Magento/Sales/Test/Unit/Controller/Guest/ViewTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Sales\Test\Unit\Controller\Guest;
 
+use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
@@ -56,7 +57,12 @@ class ViewTest extends \PHPUnit_Framework_TestCase
     private $formKeyValidatorMock;
 
     /**
-     * @return void
+     * @var RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resultRedirectFactoryMock;
+
+    /**
+     * @inheritdoc
      */
     protected function setUp()
     {
@@ -80,18 +86,16 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['validate'])
             ->getMock();
-
-        $this->requestMock->expects($this->once())->method('isPost')->willReturn(true);
-        $this->formKeyValidatorMock->expects($this->once())
-            ->method('validate')
-            ->with($this->requestMock)
-            ->willReturn(true);
+        $this->resultRedirectFactoryMock = $this->getMockBuilder(RedirectFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->context = $this->objectManagerHelper->getObject(
             \Magento\Framework\App\Action\Context::class,
             [
-                'request' => $this->requestMock
+                'request' => $this->requestMock,
+                'resultRedirectFactory' => $this->resultRedirectFactoryMock,
             ]
         );
         $this->viewController = $this->objectManagerHelper->getObject(
@@ -110,6 +114,7 @@ protected function setUp()
      */
     public function testExecuteOrderLoaded()
     {
+        $this->validateRequest();
         $this->guestHelperMock->expects($this->once())
             ->method('loadValidOrder')
             ->with($this->requestMock)
@@ -129,11 +134,59 @@ public function testExecuteOrderLoaded()
      */
     public function testExecuteOrderNotFound()
     {
+        $this->validateRequest();
         $this->guestHelperMock->expects($this->once())
             ->method('loadValidOrder')
             ->with($this->requestMock)
             ->willReturn($this->resultRedirectMock);
 
         $this->assertSame($this->resultRedirectMock, $this->viewController->execute());
     }
+
+    /**
+     * @return void
+     * @expectedException \Magento\Framework\Exception\NotFoundException
+     * @expectedExceptionMessage Page not found.
+     */
+    public function testExecuteWithNonPostRequest()
+    {
+        $this->requestMock->expects($this->once())->method('isPost')->willReturn(false);
+
+        $this->viewController->execute();
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithInvalidFormKey()
+    {
+        $this->resultRedirectFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultRedirectMock);
+        $this->requestMock->expects($this->once())->method('isPost')->willReturn(true);
+        $this->formKeyValidatorMock->expects($this->once())
+            ->method('validate')
+            ->with($this->requestMock)
+            ->willReturn(false);
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('*/*/form/')
+            ->willReturnSelf();
+
+        $this->viewController->execute();
+    }
+
+    /**
+     * Validate request.
+     *
+     * @return void
+     */
+    private function validateRequest()
+    {
+        $this->requestMock->expects($this->once())->method('isPost')->willReturn(true);
+        $this->formKeyValidatorMock->expects($this->once())
+            ->method('validate')
+            ->with($this->requestMock)
+            ->willReturn(true);
+    }
 }