MAGETWO-33059: Refactor CMS module

Author: Evgeniy Miskov

app/code/Magento/Cms/Controller/Noroute/Index.php

@@ -8,35 +8,27 @@
 
 class Index extends \Magento\Framework\App\Action\Action
 {
-    /**
-     * @var \Magento\Framework\View\Result\LayoutFactory
-     */
-    protected $resultLayoutFactory;
-
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
         \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
     ) {
-        $this->resultLayoutFactory = $resultLayoutFactory;
         $this->resultForwardFactory = $resultForwardFactory;
         parent::__construct($context);
     }
 
     /**
      * Render CMS 404 Not found page
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Forward
      */
     public function execute()
     {

dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php

@@ -68,6 +68,16 @@ class DirectiveTest extends \PHPUnit_Framework_TestCase
      */
     protected $loggerMock;
 
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $rawFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\Raw|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $rawMock;
+
     protected function setUp()
     {
         $this->actionContextMock = $this->getMockBuilder('Magento\Backend\App\Action\Context')
@@ -117,6 +127,13 @@ protected function setUp()
         $this->loggerMock = $this->getMockBuilder('Psr\Log\LoggerInterface')
             ->disableOriginalConstructor()
             ->getMock();
+        $this->rawFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RawFactory')
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->rawMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Raw')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->actionContextMock->expects($this->any())
             ->method('getRequest')
@@ -133,7 +150,8 @@ protected function setUp()
             'Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive',
             [
                 'context' => $this->actionContextMock,
-                'urlDecoder' => $this->urlDecoderMock
+                'urlDecoder' => $this->urlDecoderMock,
+                'resultRawFactory' => $this->rawFactoryMock
             ]
         );
     }
@@ -153,17 +171,20 @@ public function testExecute()
         $this->imageAdapterMock->expects($this->once())
             ->method('getMimeType')
             ->willReturn($mimeType);
-        $this->responseMock->expects($this->once())
+        $this->rawMock->expects($this->once())
             ->method('setHeader')
             ->with('Content-Type', $mimeType)
             ->willReturnSelf();
+        $this->rawMock->expects($this->once())
+            ->method('setContents')
+            ->with($imageBody)
+            ->willReturnSelf();
         $this->imageAdapterMock->expects($this->once())
             ->method('getImage')
             ->willReturn($imageBody);
-        $this->responseMock->expects($this->once())
-            ->method('setBody')
-            ->with($imageBody)
-            ->willReturnSelf();
+        $this->rawFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->rawMock);
 
         $this->wysiwygDirective->execute();
     }
@@ -192,20 +213,23 @@ public function testExecuteException()
         $this->imageAdapterMock->expects($this->once())
             ->method('getMimeType')
             ->willReturn($mimeType);
-        $this->responseMock->expects($this->once())
+        $this->rawMock->expects($this->once())
             ->method('setHeader')
             ->with('Content-Type', $mimeType)
             ->willReturnSelf();
+        $this->rawMock->expects($this->once())
+            ->method('setContents')
+            ->with($imageBody)
+            ->willReturnSelf();
         $this->imageAdapterMock->expects($this->once())
             ->method('getImage')
             ->willReturn($imageBody);
-        $this->responseMock->expects($this->once())
-            ->method('setBody')
-            ->with($imageBody)
-            ->willReturnSelf();
         $this->loggerMock->expects($this->once())
             ->method('critical')
             ->with($exception);
+        $this->rawFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->rawMock);
 
         $this->wysiwygDirective->execute();
     }

dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php renamed to dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php

@@ -3,12 +3,12 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Cms\Controller;
+namespace Magento\Cms\Controller\Noroute;
 
-class NorouteTest extends \PHPUnit_Framework_TestCase
+class IndexTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Cms\Controller\Noroute
+     * @var \Magento\Cms\Controller\Noroute\Index
      */
     protected $_controller;
 
@@ -22,30 +22,50 @@ class NorouteTest extends \PHPUnit_Framework_TestCase
      */
     protected $_requestMock;
 
+    /**
+     * @var \Magento\Backend\Model\View\Result\ForwardFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $forwardFactoryMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\Forward|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $forwardMock;
+
     protected function setUp()
     {
         $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
         $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
         $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
-        $responseMock->expects(
+        $this->forwardFactoryMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\ForwardFactory')
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->forwardMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\Forward')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->forwardFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->forwardMock);
+        $this->forwardMock->expects(
             $this->at(0)
         )->method(
             'setHeader'
         )->with(
             'HTTP/1.1',
             '404 Not Found'
         )->will(
-            $this->returnValue($responseMock)
+            $this->returnSelf()
         );
-        $responseMock->expects(
+        $this->forwardMock->expects(
             $this->at(1)
         )->method(
             'setHeader'
         )->with(
             'Status',
             '404 File not found'
         )->will(
-            $this->returnValue($responseMock)
+            $this->returnSelf()
         );
 
         $scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
@@ -71,7 +91,9 @@ protected function setUp()
         );
         $this->_controller = $helper->getObject(
             'Magento\Cms\Controller\Noroute\Index',
-            ['response' => $responseMock, 'objectManager' => $objectManagerMock, 'request' => $this->_requestMock]
+            ['response' => $responseMock, 'objectManager' => $objectManagerMock, 'request' => $this->_requestMock,
+            'resultForwardFactory' => $this->forwardFactoryMock
+            ]
         );
     }