MAGETWO-34995: Refactor controllers from the list (Part2)

Author: vpaladiychuk

app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php

@@ -24,16 +24,18 @@ public function execute()
         if (!$txn) {
             return $resultRedirect->setPath('sales/*/');
         }
-        try {
-            $txn->getOrderPaymentObject()->setOrder($txn->getOrder())->importTransactionInfo($txn);
-            $txn->save();
-            $this->messageManager->addSuccess(__('The transaction details have been updated.'));
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
-        } catch (\Exception $e) {
-            $this->messageManager->addError(__('We can\'t update the transaction details.'));
-            $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
-        }
+        $txn->getOrderPaymentObject()->setOrder($txn->getOrder())->importTransactionInfo($txn);
+        $txn->save();
+        $this->messageManager->addSuccess(__('The transaction details have been updated.'));
+        return $this->getDefaultRedirect();
+    }
+
+    /**
+     * @return Redirect
+     */
+    public function getDefaultRedirect()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
         return $resultRedirect->setPath('sales/transactions/view', ['_current' => true]);
     }
 }

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php

@@ -45,27 +45,32 @@ protected function _isAllowed()
     /**
      * Send email with shipment data to customer
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
-        try {
-            $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
-            $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id'));
-            $this->shipmentLoader->setShipment($this->getRequest()->getParam('shipment'));
-            $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking'));
-            $shipment = $this->shipmentLoader->load();
-            if ($shipment) {
-                $this->_objectManager->create('Magento\Shipping\Model\ShipmentNotifier')
-                    ->notify($shipment);
-                $shipment->save();
-                $this->messageManager->addSuccess(__('You sent the shipment.'));
-            }
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
-        } catch (\Exception $e) {
-            $this->messageManager->addError(__('Cannot send shipment information.'));
+        $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
+        $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id'));
+        $this->shipmentLoader->setShipment($this->getRequest()->getParam('shipment'));
+        $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking'));
+        $shipment = $this->shipmentLoader->load();
+        if ($shipment) {
+            $this->_objectManager->create('Magento\Shipping\Model\ShipmentNotifier')
+                ->notify($shipment);
+            $shipment->save();
+            $this->messageManager->addSuccess(__('You sent the shipment.'));
         }
-        $this->_redirect('*/*/view', ['shipment_id' => $this->getRequest()->getParam('shipment_id')]);
+        return $this->getDefaultRedirect();
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @return \Magento\Framework\Controller\Result\Redirect
+     */
+    public function getDefaultRedirect()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        return $resultRedirect->setPath('*/*/view', ['shipment_id' => $this->getRequest()->getParam('shipment_id')]);
     }
 }

app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php

@@ -63,6 +63,16 @@ class EmailTest extends \PHPUnit_Framework_TestCase
      */
     protected $helper;
 
+    /**
+     * @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRedirectFactory;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRedirect;
+
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -88,7 +98,8 @@ public function setUp()
                 'getObjectManager',
                 'getSession',
                 'getActionFlag',
-                'getHelper'
+                'getHelper',
+                'getResultRedirectFactory'
             ],
             [],
             '',
@@ -129,6 +140,15 @@ public function setUp()
         $this->session = $this->getMock('Magento\Backend\Model\Session', ['setIsUrlNotice'], [], '', false);
         $this->actionFlag = $this->getMock('Magento\Framework\App\ActionFlag', ['get'], [], '', false);
         $this->helper = $this->getMock('\Magento\Backend\Helper\Data', ['getUrl'], [], '', false);
+        $this->resultRedirect = $this->getMock('Magento\Framework\Controller\Result\Redirect', [], [], '', false);
+        $this->resultRedirectFactory = $this->getMock(
+            'Magento\Framework\Controller\Result\RedirectFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+        $this->resultRedirectFactory->expects($this->once())->method('create')->willReturn($this->resultRedirect);
         $this->context->expects($this->once())
             ->method('getMessageManager')
             ->will($this->returnValue($this->messageManager));
@@ -150,6 +170,9 @@ public function setUp()
         $this->context->expects($this->once())
             ->method('getHelper')
             ->will($this->returnValue($this->helper));
+        $this->context->expects($this->once())
+            ->method('getResultRedirectFactory')
+            ->willReturn($this->resultRedirectFactory);
         $this->shipmentEmail = $objectManagerHelper->getObject(
             'Magento\Shipping\Controller\Adminhtml\Order\Shipment\Email',
             [
@@ -240,14 +263,8 @@ protected function prepareRedirect($path, $arguments, $index)
         $this->session->expects($this->any())
             ->method('setIsUrlNotice')
             ->with(true);
-
-        $url = $path . '/' . (!empty($arguments) ? $arguments['shipment_id'] : '');
-        $this->helper->expects($this->at($index))
-            ->method('getUrl')
-            ->with($path, $arguments)
-            ->will($this->returnValue($url));
-        $this->response->expects($this->at($index))
-            ->method('setRedirect')
-            ->with($url);
+        $this->resultRedirect->expects($this->at($index))
+            ->method('setPath')
+            ->with($path, ['shipment_id' => $arguments['shipment_id']]);
     }
 }