MAGETWO-33059: Refactor CMS module

Author: Evgeniy Miskov

app/code/Magento/Cms/Controller/Adminhtml/Block.php

@@ -35,7 +35,7 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      * @param \Magento\Backend\Model\View\Result\Page $resultPage
      * @return \Magento\Backend\Model\View\Result\Page
      */
-    protected function _initPage($resultPage)
+    protected function initPage($resultPage)
     {
         $resultPage->setActiveMenu(
             'Magento_Cms::cms_block'
@@ -49,27 +49,6 @@ protected function _initPage($resultPage)
         return $resultPage;
     }
 
-    /**
-     * Init actions
-     *
-     * @return $this
-     */
-    protected function _initAction()
-    {
-        // load layout, set active menu and breadcrumbs
-        $this->_view->loadLayout();
-        $this->_setActiveMenu(
-            'Magento_Cms::cms_block'
-        )->_addBreadcrumb(
-            __('CMS'),
-            __('CMS')
-        )->_addBreadcrumb(
-            __('Static Blocks'),
-            __('Static Blocks')
-        );
-        return $this;
-    }
-
     /**
      * Check the permission to run it
      *

app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php

@@ -70,7 +70,7 @@ public function execute()
         $resultPage = $this->resultPageFactory->create();
 
         // 5. Build edit form
-        $this->_initPage($resultPage)->addBreadcrumb(
+        $this->initPage($resultPage)->addBreadcrumb(
             $id ? __('Edit Block') : __('New Block'),
             $id ? __('Edit Block') : __('New Block')
         );

app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php

@@ -36,7 +36,7 @@ public function execute()
     {
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
-        $this->_initPage($resultPage)->getConfig()->getTitle()->prepend(__('Blocks'));
+        $this->initPage($resultPage)->getConfig()->getTitle()->prepend(__('Blocks'));
         return $resultPage;
     }
 }

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

@@ -9,31 +9,31 @@
 class DefaultNoCookies extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var \Magento\Framework\View\Result\LayoutFactory
+     * @var \Magento\Framework\View\Result\PageFactory
      */
-    protected $resultLayoutFactory;
+    protected $resultPageFactory;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory
     ) {
-        $this->resultLayoutFactory = $resultLayoutFactory;
+        $this->resultPageFactory = $resultPageFactory;
         parent::__construct($context);
     }
 
     /**
      * Default no cookies page action
      * Used if no cookies page don't configure or available
      *
-     * @return \Magento\Framework\View\Result\LayoutFactory
+     * @return \Magento\Framework\View\Result\PageFactory
      */
     public function execute()
     {
-        $resultLayout = $this->resultLayoutFactory->create();
-        return $resultLayout;
+        $resultPage = $this->resultPageFactory->create();
+        return $resultPage;
     }
 }

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

@@ -186,7 +186,7 @@ public function testExecute()
             ->method('create')
             ->willReturn($this->rawMock);
 
-        $this->wysiwygDirective->execute();
+        $this->assertSame($this->rawMock, $this->wysiwygDirective->execute());
     }
 
     /**
@@ -231,7 +231,7 @@ public function testExecuteException()
             ->method('create')
             ->willReturn($this->rawMock);
 
-        $this->wysiwygDirective->execute();
+        $this->assertSame($this->rawMock, $this->wysiwygDirective->execute());
     }
 
     protected function prepareExecuteTest()

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

@@ -62,7 +62,7 @@ protected function setUp()
         $valueMap = [
             [
                 'Magento\Framework\App\Config\ScopeConfigInterface',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
                 $scopeConfigMock,
             ],
             ['Magento\Cms\Helper\Page', $this->_cmsHelperMock],
@@ -114,7 +114,7 @@ public function testExecuteResultPage()
         )->will(
             $this->returnValue($this->resultPageMock)
         );
-        $this->assertInstanceOf('Magento\Framework\View\Result\Page', $this->_controller->execute());
+        $this->assertSame($this->resultPageMock, $this->_controller->execute());
     }
 
     public function testExecuteResultForward()