MAGETWO-32554: Refactor Adminhtml/order/invoice directory

vpaladiychuk · vpaladiychuk · commit e33293ddf89a · 2015-01-21T15:59:21.000+02:00
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Start.php
@@ -29,8 +29,7 @@ public function __construct(
         Registry $registry,
         \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
         RedirectFactory $resultRedirectFactory
-    )
-    {
+    ) {
         $this->resultRedirectFactory = $resultRedirectFactory;
         parent::__construct($context, $registry, $resultForwardFactory);
     }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/View.php
@@ -29,8 +29,7 @@ public function __construct(
         Registry $registry,
         \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
         PageFactory $resultPageFactory
-    )
-    {
+    ) {
         $this->resultPageFactory = $resultPageFactory;
         parent::__construct($context, $registry, $resultForwardFactory);
     }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Void.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Void.php
@@ -7,6 +7,8 @@
 namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;
 
 use Magento\Framework\Model\Exception;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\Registry;
 
 class Void extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View
 {
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/ViewTest.php b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/ViewTest.php
@@ -55,7 +55,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
     protected $objectManagerMock;
 
     /**
-     * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Backend\Model\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $resultPageMock;
 
@@ -74,6 +74,16 @@ class ViewTest extends \PHPUnit_Framework_TestCase
      */
     protected $controller;
 
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultPageFactoryMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\ForwardFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultForwardFactoryMock;
+
     public function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -103,7 +113,7 @@ public function setUp()
             ->setMethods(['getCommentText', 'setIsUrlNotice'])
             ->getMock();
         $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
-        $this->resultPageMock = $this->getMockBuilder('Magento\Framework\View\Result\Page')
+        $this->resultPageMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\Page')
             ->disableOriginalConstructor()
             ->getMock();
         $this->pageConfigMock = $this->getMockBuilder('Magento\Framework\View\Page\Config')
@@ -148,10 +158,22 @@ public function setUp()
             ->method('getTitle')
             ->willReturn($this->pageTitleMock);
 
+        $this->resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->resultForwardFactoryMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\ForwardFactory')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
         $this->controller = $objectManager->getObject(
             'Magento\Sales\Controller\Adminhtml\Order\Invoice\View',
             [
-                'context' => $contextMock
+                'context' => $contextMock,
+                'resultPageFactory' => $this->resultPageFactoryMock,
+                'resultForwardFactory' => $this->resultForwardFactoryMock
             ]
         );
     }
@@ -191,15 +213,11 @@ public function testExecute()
             ->setMethods([])
             ->getMock();
         $layoutMock->expects($this->at(0))
-            ->method('getBlock')
-            ->with('menu')
-            ->will($this->returnValue($menuBlockMock));
-        $layoutMock->expects($this->at(1))
             ->method('getBlock')
             ->with('sales_invoice_view')
             ->will($this->returnValue($invoiceViewBlockMock));
 
-        $this->viewMock->expects($this->any())
+        $this->resultPageMock->expects($this->any())
             ->method('getLayout')
             ->will($this->returnValue($layoutMock));
 
@@ -216,7 +234,13 @@ public function testExecute()
             ->with('Magento\Sales\Model\Order\Invoice')
             ->willReturn($invoiceMock);
 
-        $this->assertNull($this->controller->execute());
+        $this->resultPageMock->expects($this->once())->method('setActiveMenu')->with('Magento_Sales::sales_order');
+
+        $this->resultPageFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($this->resultPageMock));
+
+        $this->assertSame($this->resultPageMock, $this->controller->execute());
     }
 
     public function testExecuteNoInvoice()
@@ -240,6 +264,16 @@ public function testExecuteNoInvoice()
             ->with('Magento\Sales\Model\Order\Invoice')
             ->willReturn($invoiceMock);
 
-        $this->assertNull($this->controller->execute());
+        $resultForward = $this->getMockBuilder('Magento\Backend\Model\View\Result\Forward')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $resultForward->expects($this->once())->method('forward')->with(('noroute'))->will($this->returnSelf());
+
+        $this->resultForwardFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($resultForward));
+
+        $this->assertSame($resultForward, $this->controller->execute());
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidTest.php b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/VoidTest.php
@@ -59,6 +59,16 @@ class VoidTest extends \PHPUnit_Framework_TestCase
      */
     protected $controller;
 
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRedirectFactoryMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\ForwardFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultForwardFactoryMock;
+
     public function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -128,10 +138,22 @@ public function setUp()
             ->method('getHelper')
             ->will($this->returnValue($this->helperMock));
 
+        $this->resultRedirectFactoryMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\RedirectFactory')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->resultForwardFactoryMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\ForwardFactory')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
         $this->controller = $objectManager->getObject(
             'Magento\Sales\Controller\Adminhtml\Order\Invoice\Void',
             [
-                'context' => $contextMock
+                'context' => $contextMock,
+                'resultRedirectFactory' => $this->resultRedirectFactoryMock,
+                'resultForwardFactory' => $this->resultForwardFactoryMock
             ]
         );
     }
@@ -163,6 +185,9 @@ public function testExecute()
         $invoiceMock->expects($this->any())
             ->method('getOrder')
             ->will($this->returnValue($orderMock));
+        $invoiceMock->expects($this->once())
+            ->method('getId')
+            ->will($this->returnValue($invoiceId));
 
         $transactionMock = $this->getMockBuilder('Magento\Framework\DB\Transaction')
             ->disableOriginalConstructor()
@@ -192,7 +217,17 @@ public function testExecute()
             ->method('addSuccess')
             ->with('The invoice has been voided.');
 
-        $this->controller->execute();
+        $resultRedirect = $this->getMockBuilder('Magento\Backend\Model\View\Result\Redirect')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $resultRedirect->expects($this->once())->method('setPath')->with('sales/*/view', ['invoice_id' => $invoiceId]);
+
+        $this->resultRedirectFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($resultRedirect));
+
+        $this->assertSame($resultRedirect, $this->controller->execute());
     }
 
     public function testExecuteNoInvoice()
@@ -222,7 +257,17 @@ public function testExecuteNoInvoice()
         $this->messageManagerMock->expects($this->never())
             ->method('addSuccess');
 
-        $this->controller->execute();
+        $resultForward = $this->getMockBuilder('Magento\Backend\Model\View\Result\Forward')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $resultForward->expects($this->once())->method('forward')->with(('noroute'))->will($this->returnSelf());
+
+        $this->resultForwardFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($resultForward));
+
+        $this->assertSame($resultForward, $this->controller->execute());
     }
 
     public function testExecuteModelException()
@@ -247,6 +292,9 @@ public function testExecuteModelException()
         $invoiceMock->expects($this->once())
             ->method('void')
             ->will($this->throwException($e));
+        $invoiceMock->expects($this->once())
+            ->method('getId')
+            ->will($this->returnValue($invoiceId));
 
         $this->objectManagerMock->expects($this->once())
             ->method('create')
@@ -255,6 +303,17 @@ public function testExecuteModelException()
 
         $this->messageManagerMock->expects($this->once())
             ->method('addError');
-        $this->controller->execute();
+
+        $resultRedirect = $this->getMockBuilder('Magento\Backend\Model\View\Result\Redirect')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $resultRedirect->expects($this->once())->method('setPath')->with('sales/*/view', ['invoice_id' => $invoiceId]);
+
+        $this->resultRedirectFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($resultRedirect));
+
+        $this->assertSame($resultRedirect, $this->controller->execute());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`namespace Magento\Sales\Controller\Adminhtml\Order\Invoice;`
`8`	`8`
`9`	`9`	`use Magento\Framework\Model\Exception;`
	`10`	`+use Magento\Backend\App\Action\Context;`
	`11`	`+use Magento\Framework\Registry;`
`10`	`12`
`11`	`13`	`class Void extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoice\View`
`12`	`14`	`{`