MAGETWO-56429: Shipment creation through API change order status. Back port for 2.0.x

Author: valdislav

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

@@ -7,7 +7,6 @@
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
 use Magento\Backend\App\Action;
-use Magento\Framework\App\ObjectManager;
 use Magento\Sales\Model\Order\Shipment\Validation\QuantityValidator;
 
 /**
@@ -194,7 +193,7 @@ public function execute()
     private function getShipmentValidator()
     {
         if ($this->shipmentValidator === null) {
-            $this->shipmentValidator = ObjectManager::getInstance()->get(
+            $this->shipmentValidator = $this->_objectManager->get(
                 \Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface::class
             );
         }

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

@@ -99,24 +99,25 @@ class SaveTest extends \PHPUnit_Framework_TestCase
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function setUp()
+    protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
-        $this->shipmentLoader = $this->getMockBuilder('Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader')
+        $this->shipmentLoader = $this->getMockBuilder(
+            \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $this->labelGenerator = $this->getMockBuilder('Magento\Shipping\Model\Shipping\LabelGenerator')
+        $this->labelGenerator = $this->getMockBuilder(\Magento\Shipping\Model\Shipping\LabelGenerator::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $this->shipmentSender = $this->getMockBuilder('Magento\Sales\Model\Order\Email\Sender\ShipmentSender')
+        $this->shipmentSender = $this->getMockBuilder(\Magento\Sales\Model\Order\Email\Sender\ShipmentSender::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->objectManager = $this->getMock(\Magento\Framework\ObjectManagerInterface::class);
         $this->context = $this->getMock(
-            'Magento\Backend\App\Action\Context',
+            \Magento\Backend\App\Action\Context::class,
             [
                 'getRequest', 'getResponse', 'getMessageManager', 'getRedirect',
                 'getObjectManager', 'getSession', 'getActionFlag', 'getHelper',
@@ -127,40 +128,40 @@ public function setUp()
             false
         );
         $this->response = $this->getMock(
-            'Magento\Framework\App\ResponseInterface',
+            \Magento\Framework\App\ResponseInterface::class,
             ['setRedirect', 'sendResponse'],
             [],
             '',
             false
         );
-        $this->request = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+        $this->request = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
             ->disableOriginalConstructor()->getMock();
         $this->objectManager = $this->getMock(
-            'Magento\Framework\ObjectManager\ObjectManager',
+            \Magento\Framework\ObjectManager\ObjectManager::class,
             ['create', 'get'],
             [],
             '',
             false
         );
         $this->messageManager = $this->getMock(
-            'Magento\Framework\Message\Manager',
+            \Magento\Framework\Message\Manager::class,
             ['addSuccess', 'addError'],
             [],
             '',
             false
         );
         $this->session = $this->getMock(
-            'Magento\Backend\Model\Session',
+            \Magento\Backend\Model\Session::class,
             ['setIsUrlNotice', 'getCommentText'],
             [],
             '',
             false
         );
-        $this->actionFlag = $this->getMock('Magento\Framework\App\ActionFlag', ['get'], [], '', false);
-        $this->helper = $this->getMock('Magento\Backend\Helper\Data', ['getUrl'], [], '', false);
+        $this->actionFlag = $this->getMock(\Magento\Framework\App\ActionFlag::class, ['get'], [], '', false);
+        $this->helper = $this->getMock(\Magento\Backend\Helper\Data::class, ['getUrl'], [], '', false);
 
         $this->resultRedirect = $this->getMock(
-            'Magento\Framework\Controller\Result\Redirect',
+            \Magento\Framework\Controller\Result\Redirect::class,
             ['setPath'],
             [],
             '',
@@ -171,7 +172,7 @@ public function setUp()
             ->willReturn($this->resultRedirect);
 
         $resultRedirectFactory = $this->getMock(
-            'Magento\Framework\Controller\Result\RedirectFactory',
+            \Magento\Framework\Controller\Result\RedirectFactory::class,
             ['create'],
             [],
             '',
@@ -182,7 +183,7 @@ public function setUp()
             ->willReturn($this->resultRedirect);
 
         $this->formKeyValidator = $this->getMock(
-            'Magento\Framework\Data\Form\FormKey\Validator',
+            \Magento\Framework\Data\Form\FormKey\Validator::class,
             ['validate'],
             [],
             '',
@@ -222,7 +223,7 @@ public function setUp()
             ->getMock();
 
         $this->saveAction = $objectManagerHelper->getObject(
-            'Magento\Shipping\Controller\Adminhtml\Order\Shipment\Save',
+            \Magento\Shipping\Controller\Adminhtml\Order\Shipment\Save::class,
             [
                 'labelGenerator' => $this->labelGenerator,
                 'shipmentSender' => $this->shipmentSender,
@@ -250,7 +251,6 @@ public function testExecute($formKeyIsValid, $isPost)
         $this->request->expects($this->any())
             ->method('isPost')
             ->willReturn($isPost);
-
         if (!$formKeyIsValid || !$isPost) {
             $this->messageManager->expects($this->once())
                 ->method('addError');
@@ -269,14 +269,14 @@ public function testExecute($formKeyIsValid, $isPost)
             $tracking = [];
             $shipmentData = ['items' => [], 'send_email' => ''];
             $shipment = $this->getMock(
-                'Magento\Sales\Model\Order\Shipment',
+                \Magento\Sales\Model\Order\Shipment::class,
                 ['load', 'save', 'register', 'getOrder', 'getOrderId', '__wakeup'],
                 [],
                 '',
                 false
             );
             $order = $this->getMock(
-                'Magento\Sales\Model\Order',
+                \Magento\Sales\Model\Order::class,
                 ['setCustomerNoteNotify', '__wakeup'],
                 [],
                 '',
@@ -324,7 +324,7 @@ public function testExecute($formKeyIsValid, $isPost)
                 ->method('create')
                 ->with($shipment, $this->request)
                 ->will($this->returnValue(true));
-            $saveTransaction = $this->getMockBuilder('Magento\Framework\DB\Transaction')
+            $saveTransaction = $this->getMockBuilder(\Magento\Framework\DB\Transaction::class)
                 ->disableOriginalConstructor()
                 ->setMethods([])
                 ->getMock();
@@ -342,15 +342,17 @@ public function testExecute($formKeyIsValid, $isPost)
             $this->session->expects($this->once())
                 ->method('getCommentText')
                 ->with(true);
-
             $this->objectManager->expects($this->once())
                 ->method('create')
-                ->with('Magento\Framework\DB\Transaction')
+                ->with(\Magento\Framework\DB\Transaction::class)
                 ->will($this->returnValue($saveTransaction));
-            $this->objectManager->expects($this->once())
+            $this->objectManager->expects($this->exactly(2))
                 ->method('get')
-                ->with('Magento\Backend\Model\Session')
-                ->will($this->returnValue($this->session));
+                ->withConsecutive(
+                    [\Magento\Sales\Model\Order\Shipment\ShipmentValidatorInterface::class],
+                    [\Magento\Backend\Model\Session::class]
+                )
+                ->willReturnOnConsecutiveCalls($this->shipmentValidatorMock, $this->session);
             $path = 'sales/order/view';
             $arguments = ['order_id' => $orderId];
             $shipment->expects($this->once())