MAGETWO-70498: [Magento Cloud] - /rest/default/V1/order/<order id>/ship and configurable products - for 2.1

RuslanKostiv1 · RuslanKostiv1 · commit 256b60e0ef50 · 2017-10-10T21:11:55.000+03:00
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php
@@ -7,13 +7,9 @@
 
 use Magento\Framework\DataObject;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Message\ManagerInterface;
-use Magento\Framework\Registry;
 use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
 use Magento\Sales\Api\Data\ShipmentTrackCreationInterfaceFactory;
 use Magento\Sales\Api\Data\ShipmentItemCreationInterfaceFactory;
-use Magento\Sales\Api\ShipmentRepositoryInterface;
-use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
 
@@ -33,22 +29,22 @@
 class ShipmentLoader extends DataObject
 {
     /**
-     * @var ManagerInterface
+     * @var \Magento\Framework\Message\ManagerInterface
      */
     protected $messageManager;
 
     /**
-     * @var Registry
+     * @var \Magento\Framework\Registry
      */
     protected $registry;
 
     /**
-     * @var ShipmentRepositoryInterface
+     * @var \Magento\Sales\Api\ShipmentRepositoryInterface
      */
     protected $shipmentRepository;
 
     /**
-     * @var OrderRepositoryInterface
+     * @var \Magento\Sales\Api\OrderRepositoryInterface
      */
     protected $orderRepository;
 
@@ -57,46 +53,80 @@ class ShipmentLoader extends DataObject
      */
     protected $documentFactory;
 
+    /**
+     * @var \Magento\Sales\Model\Order\ShipmentFactory
+     * @deprecated
+     */
+    protected $shipmentFactory;
+
     /**
      * @var ShipmentTrackCreationInterfaceFactory
      */
+    protected $shipmentTrackCreationFactory;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Shipment\TrackFactory
+     * @deprecated
+     */
     protected $trackFactory;
 
     /**
      * @var ShipmentItemCreationInterfaceFactory
      */
-    private $itemFactory;
+    private $shipmentItemCreationFactory;
 
     /**
-     * @param ManagerInterface $messageManager
-     * @param Registry $registry
-     * @param ShipmentRepositoryInterface $shipmentRepository
-     * @param OrderRepositoryInterface $orderRepository
-     * @param ShipmentDocumentFactory $documentFactory
-     * @param ShipmentTrackCreationInterfaceFactory $trackFactory
-     * @param ShipmentItemCreationInterfaceFactory $itemFactory
+     * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository
+     * @param \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory
+     * @param \Magento\Sales\Model\Order\Shipment\TrackFactory $trackFactory
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
      * @param array $data
+     * @param ShipmentDocumentFactory|null $documentFactory
+     * @param ShipmentTrackCreationInterfaceFactory|null $trackFactory
+     * @param ShipmentItemCreationInterfaceFactory|null $shipmentItemCreationFactory
      */
     public function __construct(
-        ManagerInterface $messageManager,
-        Registry $registry,
-        ShipmentRepositoryInterface $shipmentRepository,
-        OrderRepositoryInterface $orderRepository,
-        ShipmentDocumentFactory $documentFactory,
-        ShipmentTrackCreationInterfaceFactory $trackFactory,
-        ShipmentItemCreationInterfaceFactory $itemFactory,
-        array $data = []
+        \Magento\Framework\Message\ManagerInterface $messageManager,
+        \Magento\Framework\Registry $registry,
+        \Magento\Sales\Api\ShipmentRepositoryInterface $shipmentRepository,
+        \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory,
+        \Magento\Sales\Model\Order\Shipment\TrackFactory $trackFactory,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        array $data = [],
+        ShipmentDocumentFactory $documentFactory = null,
+        ShipmentTrackCreationInterfaceFactory $shipmentTrackCreationFactory = null,
+        ShipmentItemCreationInterfaceFactory $shipmentItemCreationFactory = null
     ) {
         $this->messageManager = $messageManager;
         $this->registry = $registry;
         $this->shipmentRepository = $shipmentRepository;
-        $this->orderRepository = $orderRepository;
-        $this->documentFactory = $documentFactory;
+        $this->shipmentFactory = $shipmentFactory;
         $this->trackFactory = $trackFactory;
-        $this->itemFactory = $itemFactory;
+        $this->orderRepository = $orderRepository;
+        $this->documentFactory = $documentFactory ?: ObjectManager::getInstance()->get(ShipmentDocumentFactory::class);
+        $this->shipmentTrackCreationFactory = $shipmentTrackCreationFactory
+            ?: ObjectManager::getInstance()->get(ShipmentTrackCreationInterfaceFactory::class);
+        $this->shipmentItemCreationFactory = $shipmentItemCreationFactory
+            ?: ObjectManager::getInstance()->get(ShipmentItemCreationInterfaceFactory::class);
+
         parent::__construct($data);
     }
 
+    /**
+     * Initialize shipment items QTY
+     *
+     * @return array
+     * @deprecated
+     */
+    protected function getItemQtys()
+    {
+        $data = $this->getShipment();
+
+        return isset($data['items']) ? $data['items'] : [];
+    }
+
     /**
      * Initialize shipment model instance
      *
@@ -165,7 +195,7 @@ private function getTrackingArray()
                 );
             }
             /** @var ShipmentTrackCreationInterface $trackCreation */
-            $trackCreation = $this->trackFactory->create();
+            $trackCreation = $this->shipmentTrackCreationFactory->create();
             $trackCreation->setTrackNumber($track['number']);
             $trackCreation->setTitle($track['title']);
             $trackCreation->setCarrierCode($track['carrier_code']);
@@ -187,7 +217,7 @@ private function getShipmentItems(array $shipmentData)
         $itemQty = isset($shipmentData['items']) ? $shipmentData['items'] : [];
         foreach ($itemQty as $itemId => $quantity) {
             /** @var ShipmentItemCreationInterface $item */
-            $item = $this->itemFactory->create();
+            $item = $this->shipmentItemCreationFactory->create();
             $item->setOrderItemId($itemId);
             $item->setQty($quantity);
             $shipmentItems[] = $item;
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/ShipmentLoaderTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/ShipmentLoaderTest.php
@@ -38,64 +38,90 @@ class ShipmentLoaderTest extends \PHPUnit_Framework_TestCase
      */
     protected $shipmentRepositoryMock;
 
+    /**
+     * @var \Magento\Sales\Model\Order\ShipmentFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $shipmentFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $trackFactoryMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $orderRepository;
+
     /**
      * @var ShipmentDocumentFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $documentFactoryMock;
+    private $documentFactoryMock;
 
     /**
      * @var ShipmentTrackCreationInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $trackFactoryMock;
+    private $shipmentTrackCreationFactoryMock;
 
     /**
      * @var ShipmentItemCreationInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $itemFactoryMock;
+    private $shipmentItemCreationFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var array
      */
-    protected $orderRepositoryMock;
+    private $data;
 
     /**
      * @var \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader
      */
     protected $loader;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->objectManagerMock = new ObjectManager($this);
-        $this->shipmentRepositoryMock = $this->getMockBuilder(\Magento\Sales\Model\Order\ShipmentRepository::class)
+        $this->shipmentRepositoryMock = $this->getMockBuilder('Magento\Sales\Model\Order\ShipmentRepository')
             ->disableOriginalConstructor()
             ->setMethods(['get'])
             ->getMock();
-        $this->registryMock = $this->getMockBuilder(\Magento\Framework\Registry::class)
+        $this->registryMock = $this->getMockBuilder('Magento\Framework\Registry')
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $this->trackFactoryMock = $this->getMockBuilder(ShipmentTrackCreationInterfaceFactory::class)
+        $this->shipmentFactory = $this->getMockBuilder('Magento\Sales\Model\Order\ShipmentFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->messageManagerMock = $this->getMockBuilder(\Magento\Framework\Message\Manager::class)
+        $this->trackFactoryMock = $this->getMockBuilder('Magento\Sales\Model\Order\Shipment\TrackFactory')
             ->disableOriginalConstructor()
-            ->setMethods([])
+            ->setMethods(['create'])
             ->getMock();
-        $this->orderRepositoryMock = $this->getMockBuilder(\Magento\Sales\Api\OrderRepositoryInterface::class)
+        $this->messageManagerMock = $this->getMockBuilder('Magento\Framework\Message\Manager')
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
-        $this->itemFactoryMock = $this->getMockBuilder(ShipmentItemCreationInterfaceFactory::class)
+        $this->orderRepository = $this->getMockBuilder('Magento\Sales\Api\OrderRepositoryInterface')
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
+            ->setMethods([])
             ->getMock();
         $this->documentFactoryMock = $this->getMockBuilder(ShipmentDocumentFactory::class)
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
+        $this->shipmentTrackCreationFactoryMock = $this->getMockBuilder(ShipmentTrackCreationInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->shipmentItemCreationFactoryMock = $this->getMockBuilder(ShipmentItemCreationInterfaceFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
 
-        $data = [
+        $this->data = [
             'order_id' => 100032,
             'shipment_id' => 1000065,
             'shipment' => ['items' => [1 => 1, 2 => 2]],
@@ -111,18 +137,20 @@ protected function setUp()
                 'messageManager' => $this->messageManagerMock,
                 'registry' => $this->registryMock,
                 'shipmentRepository' => $this->shipmentRepositoryMock,
-                'orderRepository' => $this->orderRepositoryMock,
-                'documentFactory' => $this->documentFactoryMock,
+                'shipmentFactory' => $this->shipmentFactory,
                 'trackFactory' => $this->trackFactoryMock,
-                'itemFactory' => $this->itemFactoryMock,
-                'data' => $data
+                'orderRepository' => $this->orderRepository,
+                'data' => $this->data,
+                'documentFactory' => $this->documentFactoryMock,
+                'shipmentTrackCreationFactory' => $this->shipmentTrackCreationFactoryMock,
+                'shipmentItemCreationFactory' => $this->shipmentItemCreationFactoryMock,
             ]
         );
     }
 
     public function testLoadShipmentId()
     {
-        $shipmentModelMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
+        $shipmentModelMock = $this->getMockBuilder('Magento\Sales\Model\Order\Shipment')
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
@@ -139,13 +167,14 @@ public function testLoadShipmentId()
     public function testLoadOrderId()
     {
         $this->loader->unsetData('shipment_id');
-        $orderMock = $this->getMockBuilder(\Magento\Sales\Model\Order::class)
+        $orderMock = $this->getMockBuilder('Magento\Sales\Model\Order')
             ->disableOriginalConstructor()
             ->setMethods(['getForcedShipmentWithInvoice', 'getId', 'canShip'])
             ->getMock();
-        $this->orderRepositoryMock->expects($this->once())
+        $this->orderRepository->expects($this->once())
             ->method('get')
             ->will($this->returnValue($orderMock));
+
         $orderMock->expects($this->once())
             ->method('getId')
             ->will($this->returnValue($this->loader->getOrderId()));
@@ -155,30 +184,43 @@ public function testLoadOrderId()
         $orderMock->expects($this->once())
             ->method('canShip')
             ->will($this->returnValue(true));
-        $shipmentModelMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Shipment::class)
+        $shipmentModelMock = $this->getMockBuilder('Magento\Sales\Model\Order\Shipment')
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMock();
         $trackMock = $this->getMockBuilder(ShipmentTrackCreationInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['setCarrierCode', 'setTrackNumber', 'setTitle'])
             ->getMockForAbstractClass();
-        $this->trackFactoryMock->expects($this->any())
+
+        $trackMock->expects($this->exactly(count($this->data['tracking'])))->method('setCarrierCode')->willReturnSelf();
+        $trackMock->expects($this->exactly(count($this->data['tracking'])))->method('setTrackNumber')->willReturnSelf();
+        $trackMock->expects($this->exactly(count($this->data['tracking'])))->method('setTitle')->willReturnSelf();
+
+        $this->shipmentTrackCreationFactoryMock->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($trackMock));
+            ->willReturn($trackMock);
         $shipmentModelMock->expects($this->any())
             ->method('addTrack')
             ->with($this->equalTo($trackMock))
             ->will($this->returnSelf());
         $this->registryMock->expects($this->once())
             ->method('register')
             ->with('current_shipment', $shipmentModelMock);
-        $itemMock = $this->getMockBuilder(ShipmentItemCreationInterface::class)
+
+        $shipmentItemMock = $this->getMockBuilder(ShipmentItemCreationInterface::class)
             ->disableOriginalConstructor()
+            ->setMethods(['setOrderItemId', 'setQty'])
             ->getMockForAbstractClass();
-        $this->itemFactoryMock->expects($this->any())
+
+        $shipmentItemMock->expects($this->exactly(count($this->data['shipment']['items'])))
+            ->method('setOrderItemId')->willReturnSelf();
+        $shipmentItemMock->expects($this->exactly(count($this->data['shipment']['items'])))
+            ->method('setQty')->willReturnSelf();
+        $this->shipmentItemCreationFactoryMock->expects($this->any())
             ->method('create')
-            ->will($this->returnValue($itemMock));
+            ->will($this->returnValue($shipmentItemMock));
+
         $this->documentFactoryMock->expects($this->once())->method('create')->willReturn($shipmentModelMock);
 
         $this->assertEquals($shipmentModelMock, $this->loader->load());
