MAGETWO-36727: Refactor controller actions in GroupedProduct & ImportExport modules

Author: Yuri Kovsher

app/code/Magento/GroupedProduct/Controller/Adminhtml/Edit/Popup.php

@@ -1,12 +1,18 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\GroupedProduct\Controller\Adminhtml\Edit;
 
-class Popup extends \Magento\Backend\App\AbstractAction
+use Magento\Backend\App\AbstractAction;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
+use Magento\Catalog\Model\ProductFactory;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Controller\ResultFactory;
+
+class Popup extends AbstractAction
 {
     /**
      * @var \Magento\Framework\Registry
@@ -30,10 +36,10 @@ class Popup extends \Magento\Backend\App\AbstractAction
      * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Registry $registry,
-        \Magento\Catalog\Model\ProductFactory $factory,
-        \Psr\Log\LoggerInterface $logger
+        Context $context,
+        Registry $registry,
+        ProductFactory $factory,
+        LoggerInterface $logger
     ) {
         $this->registry = $registry;
         $this->factory = $factory;
@@ -54,7 +60,7 @@ protected function _isAllowed()
     /**
      * Get associated grouped products grid popup
      *
-     * @return void
+     * @return \Magento\Framework\View\Result\Layout
      */
     public function execute()
     {
@@ -84,8 +90,8 @@ public function execute()
             $product->setAttributeSetId($setId);
         }
         $this->registry->register('current_product', $product);
-
-        $this->_view->loadLayout(false);
-        $this->_view->renderLayout();
+        /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+        $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
+        return $resultLayout;
     }
 }

app/code/Magento/GroupedProduct/Test/Unit/Controller/Adminhtml/Edit/PopupTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\GroupedProduct\Test\Unit\Controller\Adminhtml\Edit;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class PopupTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -17,6 +19,11 @@ class PopupTest extends \PHPUnit_Framework_TestCase
      */
     protected $action;
 
+    /**
+     * @var \Magento\Backend\App\Action\Context
+     */
+    protected $context;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -33,25 +40,46 @@ class PopupTest extends \PHPUnit_Framework_TestCase
     protected $registry;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultFactoryMock;
+
+    /**
+     * @var \Magento\Framework\View\Result\Layout|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $view;
+    protected $resultLayoutMock;
 
     protected function setUp()
     {
         $this->request = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false);
         $this->factory = $this->getMock('Magento\Catalog\Model\ProductFactory', ['create'], [], '', false);
         $this->registry = $this->getMock('Magento\Framework\Registry', [], [], '', false);
-        $this->view = $this->getMock('Magento\Framework\App\ViewInterface', [], [], '', false);
+        $this->resultFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\ResultFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultLayoutMock = $this->getMockBuilder('Magento\Framework\View\Result\Layout')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->resultFactoryMock->expects($this->any())
+            ->method('create')
+            ->with(ResultFactory::TYPE_LAYOUT, [])
+            ->willReturn($this->resultLayoutMock);
 
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->context = $this->objectManager->getObject(
+            'Magento\Backend\App\Action\Context',
+            [
+                'request' => $this->request,
+                'resultFactory' => $this->resultFactoryMock
+            ]
+        );
         $this->action = $this->objectManager->getObject(
             'Magento\GroupedProduct\Controller\Adminhtml\Edit\Popup',
             [
-                'request' => $this->request,
+                'context' => $this->context,
                 'factory' => $this->factory,
-                'registry' => $this->registry,
-                'view' => $this->view
+                'registry' => $this->registry
             ]
         );
     }
@@ -90,10 +118,7 @@ public function testPopupActionNoProductId()
         $this->request->expects($this->at(3))->method('getParam')->with('set')->will($this->returnValue($setId));
         $this->registry->expects($this->once())->method('register')->with('current_product', $product);
 
-        $this->view->expects($this->once())->method('loadLayout')->with(false);
-        $this->view->expects($this->once())->method('renderLayout');
-
-        $this->action->execute();
+        $this->assertSame($this->resultLayoutMock, $this->action->execute());
     }
 
     public function testPopupActionWithProductIdNoSetId()
@@ -130,9 +155,6 @@ public function testPopupActionWithProductIdNoSetId()
         $this->request->expects($this->at(3))->method('getParam')->with('set')->will($this->returnValue($setId));
         $this->registry->expects($this->once())->method('register')->with('current_product', $product);
 
-        $this->view->expects($this->once())->method('loadLayout')->with(false);
-        $this->view->expects($this->once())->method('renderLayout');
-
-        $this->action->execute();
+        $this->assertSame($this->resultLayoutMock, $this->action->execute());
     }
 }