Merge remote-tracking branch 'tango/MAGETWO-31522' into MAGETWO-31522

Dmytro Poperechnyy · Dmytro Poperechnyy · commit 453f2df764b3 · 2015-01-21T14:14:56.000+02:00
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewActionTest.php b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/NewActionTest.php
@@ -49,7 +49,7 @@ class NewActionTest extends \PHPUnit_Framework_TestCase
     protected $sessionMock;
 
     /**
-     * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Backend\Model\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $resultPageMock;
 
@@ -73,6 +73,17 @@ class NewActionTest extends \PHPUnit_Framework_TestCase
      */
     protected $messageManagerMock;
 
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultPageFactoryMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRedirectFactoryMock;
+
+
     public function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -112,8 +123,9 @@ public function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getCommentText', 'setIsUrlNotice'])
             ->getMock();
-        $this->resultPageMock = $this->getMockBuilder('Magento\Framework\View\Result\Page')
+        $this->resultPageMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\Page')
             ->disableOriginalConstructor()
+            ->setMethods([])
             ->getMock();
         $this->pageConfigMock = $this->getMockBuilder('Magento\Framework\View\Page\Config')
             ->disableOriginalConstructor()
@@ -166,9 +178,23 @@ public function setUp()
             ->method('getTitle')
             ->willReturn($this->pageTitleMock);
 
+        $this->resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->resultRedirectFactoryMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\RedirectFactory')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
         $this->controller = $objectManager->getObject(
             'Magento\Sales\Controller\Adminhtml\Order\Invoice\NewAction',
-            ['context' => $contextMock]
+            [
+                'context' => $contextMock,
+                'resultRedirectFactory' => $this->resultRedirectFactoryMock,
+                'resultPageFactory' => $this->resultPageFactoryMock
+            ]
         );
     }
 
@@ -230,19 +256,6 @@ public function testExecute()
             ->with('Magento_Sales::sales_order')
             ->will($this->returnValue([]));
 
-        $layoutMock = $this->getMockBuilder('Magento\Framework\View\Layout')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-        $layoutMock->expects($this->once())
-            ->method('getBlock')
-            ->with('menu')
-            ->will($this->returnValue($menuBlockMock));
-
-        $this->viewMock->expects($this->once())
-            ->method('getLayout')
-            ->will($this->returnValue($layoutMock));
-
         $this->sessionMock->expects($this->once())
             ->method('getCommentText')
             ->with(true)
@@ -261,7 +274,12 @@ public function testExecute()
             ->with('Magento\Backend\Model\Session')
             ->will($this->returnValue($this->sessionMock));
 
-        $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 testExecuteNoOrder()
@@ -295,6 +313,16 @@ public function testExecuteNoOrder()
             ->with('Magento\Sales\Model\Order')
             ->willReturn($orderMock);
 
-        $this->assertNull($this->controller->execute());
+        $resultRedirect = $this->getMockBuilder('Magento\Backend\Model\View\Result\Redirect')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $resultRedirect->expects($this->once())->method('setPath')->with('sales/order/view', ['order_id' => $orderId]);
+
+        $this->resultRedirectFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($resultRedirect));
+
+        $this->assertSame($resultRedirect, $this->controller->execute());
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php b/dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/UpdateQtyTest.php
@@ -55,6 +55,21 @@ class UpdateQtyTest extends \PHPUnit_Framework_TestCase
      */
     protected $controller;
 
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultPageFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRawFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\JSONFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultJsonFactoryMock;
+
     public function setUp()
     {
         $objectManager = new ObjectManager($this);
@@ -69,8 +84,8 @@ public function setUp()
         $this->responseMock = $this->getMockBuilder('Magento\Framework\App\Response\Http')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultPageMock = $this->getMockBuilder('Magento\Framework\View\Result\Page')
-            ->setMethods(['getConfig'])
+        $this->resultPageMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\Page')
+            ->setMethods([])
             ->disableOriginalConstructor()
             ->getMock();
         $this->pageConfigMock = $this->getMockBuilder('Magento\Framework\View\Page\Config')
@@ -110,10 +125,28 @@ public function setUp()
             ->method('getObjectManager')
             ->will($this->returnValue($this->objectManagerMock));
 
+        $this->resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->resultRawFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RawFactory')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
+        $this->resultJsonFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\JSONFactory')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+
         $this->controller = $objectManager->getObject(
             'Magento\Sales\Controller\Adminhtml\Order\Invoice\UpdateQty',
             [
-                'context' => $contextMock
+                'context' => $contextMock,
+                'resultPageFactory' => $this->resultPageFactoryMock,
+                'resultRawFactory' => $this->resultRawFactoryMock,
+                'resultJsonFactory' => $this->resultJsonFactoryMock
             ]
         );
     }
@@ -173,10 +206,6 @@ public function testExecute()
             ->with('Magento\Sales\Model\Service\Order')
             ->willReturn($orderService);
 
-        $this->responseMock->expects($this->once())
-            ->method('setBody')
-            ->with($response);
-
         $blockItemMock = $this->getMockBuilder('Magento\Sales\Block\Order\Items')
             ->disableOriginalConstructor()
             ->setMethods([])
@@ -193,16 +222,29 @@ public function testExecute()
             ->method('getBlock')
             ->with('order_items')
             ->will($this->returnValue($blockItemMock));
-        $this->viewMock->expects($this->once())->method('getPage')->will($this->returnValue($this->resultPageMock));
-        $this->viewMock->expects($this->once())
+
+        $this->resultPageMock->expects($this->once())
             ->method('getLayout')
             ->will($this->returnValue($layoutMock));
-        $this->resultPageMock->expects($this->once())->method('getConfig')->will(
-            $this->returnValue($this->pageConfigMock)
-        );
+        $this->resultPageMock->expects($this->once())
+            ->method('getConfig')
+            ->will($this->returnValue($this->pageConfigMock));
+
         $this->pageConfigMock->expects($this->once())->method('getTitle')->will($this->returnValue($this->titleMock));
 
-        $this->assertNull($this->controller->execute());
+        $this->resultPageFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($this->resultPageMock));
+
+        $resultRaw = $this->getMockBuilder('Magento\Framework\Controller\Result\Raw')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $resultRaw->expects($this->once())->method('setContents')->with($response);
+
+        $this->resultRawFactoryMock->expects($this->once())->method('create')->will($this->returnValue($resultRaw));
+
+        $this->assertSame($resultRaw, $this->controller->execute());
     }
 
     public function testExecuteModelException()
@@ -229,10 +271,6 @@ public function testExecuteModelException()
             ->method('prepend')
             ->with('Invoices');
 
-        $this->responseMock->expects($this->once())
-            ->method('representJson')
-            ->with(json_encode($response));
-
         $helperMock = $this->getMockBuilder('Magento\Core\Helper\Data')
             ->disableOriginalConstructor()
             ->setMethods([])
@@ -247,7 +285,18 @@ public function testExecuteModelException()
             ->with('Magento\Core\Helper\Data')
             ->will($this->returnValue($helperMock));
 
-        $this->assertNull($this->controller->execute());
+        /** @var \Magento\Framework\Controller\Result\JSON|\PHPUnit_Framework_MockObject_MockObject */
+        $resultJsonMock = $this->getMockBuilder('Magento\Framework\Controller\Result\JSON')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $resultJsonMock->expects($this->once())->method('setJsonData')->with(json_encode($response));
+
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($resultJsonMock));
+
+        $this->assertSame($resultJsonMock, $this->controller->execute());
     }
 
     public function testExecuteException()
@@ -269,14 +318,11 @@ public function testExecuteException()
             ->method('create')
             ->with('Magento\Sales\Model\Order')
             ->willReturn($orderMock);
+
         $this->titleMock->expects($this->never())
             ->method('prepend')
             ->with('Invoices');
 
-        $this->responseMock->expects($this->once())
-            ->method('representJson')
-            ->with(json_encode($response));
-
         $helperMock = $this->getMockBuilder('Magento\Core\Helper\Data')
             ->disableOriginalConstructor()
             ->setMethods([])
@@ -291,6 +337,17 @@ public function testExecuteException()
             ->with('Magento\Core\Helper\Data')
             ->will($this->returnValue($helperMock));
 
-        $this->assertNull($this->controller->execute());
+        /** @var \Magento\Framework\Controller\Result\JSON|\PHPUnit_Framework_MockObject_MockObject */
+        $resultJsonMock = $this->getMockBuilder('Magento\Framework\Controller\Result\JSON')
+            ->disableOriginalConstructor()
+            ->setMethods([])
+            ->getMock();
+        $resultJsonMock->expects($this->once())->method('setJsonData')->with(json_encode($response));
+
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($resultJsonMock));
+
+        $this->assertSame($resultJsonMock, $this->controller->execute());
     }
 }
