Merge remote-tracking branch 'trigger/MAGETWO-95429' into BugFixPR

Author: joanhe

app/code/Magento/Sales/Model/Order/Shipment.php

@@ -277,6 +277,8 @@ public function register()
     }
 
     /**
+     * Retrieves the collection used to track the shipment's items
+     *
      * @return mixed
      */
     public function getItemsCollection()
@@ -295,6 +297,8 @@ public function getItemsCollection()
     }
 
     /**
+     * Retrieves all non-deleted items from the shipment
+     *
      * @return array
      */
     public function getAllItems()
@@ -309,6 +313,8 @@ public function getAllItems()
     }
 
     /**
+     * Retrieves an item from the shipment using its ID
+     *
      * @param string|int $itemId
      * @return bool|\Magento\Sales\Model\Order\Shipment\Item
      */
@@ -323,6 +329,8 @@ public function getItemById($itemId)
     }
 
     /**
+     * Adds an item to the shipment
+     *
      * @param \Magento\Sales\Model\Order\Shipment\Item $item
      * @return $this
      */
@@ -353,6 +361,8 @@ public function getTracksCollection()
     }
 
     /**
+     * Retrieves all available tracks in the collection that aren't deleted
+     *
      * @return array
      */
     public function getAllTracks()
@@ -367,6 +377,8 @@ public function getAllTracks()
     }
 
     /**
+     * Retrieves a track using its ID
+     *
      * @param string|int $trackId
      * @return bool|\Magento\Sales\Model\Order\Shipment\Track
      */
@@ -381,6 +393,8 @@ public function getTrackById($trackId)
     }
 
     /**
+     * Addes a track to the collection and associates the shipment to the track
+     *
      * @param \Magento\Sales\Model\Order\Shipment\Track $track
      * @return $this
      */
@@ -409,8 +423,7 @@ public function addTrack(\Magento\Sales\Model\Order\Shipment\Track $track)
     }
 
     /**
-     * Adds comment to shipment with additional possibility to send it to customer via email
-     * and show it in customer account
+     * Adds comment to shipment with option to send it to customer via email and show it in customer account
      *
      * @param \Magento\Sales\Model\Order\Shipment\Comment|string $comment
      * @param bool $notify
@@ -574,13 +587,10 @@ public function setItems($items)
     public function getTracks()
     {
         if ($this->getData(ShipmentInterface::TRACKS) === null) {
-            $collection =  $this->_trackCollectionFactory->create()->setShipmentFilter($this->getId());
-            if ($this->getId()) {
-                foreach ($collection as $item) {
-                    $item->setShipment($this);
-                }
-                $this->setData(ShipmentInterface::TRACKS, $collection->getItems());
+            foreach ($this->getTracksCollection() as $item) {
+                $item->setShipment($this);
             }
+            $this->setData(ShipmentInterface::TRACKS, $this->getTracksCollection()->getItems());
         }
         return $this->getData(ShipmentInterface::TRACKS);
     }

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipOrderTest.php

@@ -25,7 +25,6 @@ class ShipOrderTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 
     protected function setUp()
     {
-        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/1335');
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
         $this->shipmentRepository = $this->objectManager->get(
@@ -38,6 +37,7 @@ protected function setUp()
      */
     public function testConfigurableShipOrder()
     {
+        $this->markTestIncomplete('https://github.com/magento-engcom/msi/issues/1335');
         $productsQuantity = 1;
 
         /** @var \Magento\Sales\Model\Order $existingOrder */
@@ -132,6 +132,39 @@ public function testShipOrder()
         );
     }
 
+    /**
+     * Tests that not providing a tracking number produces the correct error. See MAGETWO-95429
+     * @expectedException \Exception
+     * @codingStandardsIgnoreStart
+     * @expectedExceptionMessageRegExp /Shipment Document Validation Error\(s\):(?:\n|\\n)Please enter a tracking number./
+     * @codingStandardsIgnoreEnd
+     * @magentoApiDataFixture Magento/Sales/_files/order_new.php
+     */
+    public function testShipOrderWithoutTrackingNumberReturnsError()
+    {
+        $this->_markTestAsRestOnly('SOAP requires an tracking number to be provided so this case is not possible.');
+
+        /** @var \Magento\Sales\Model\Order $existingOrder */
+        $existingOrder = $this->objectManager->create(\Magento\Sales\Model\Order::class)
+            ->loadByIncrementId('100000001');
+
+        $requestData = [
+            'orderId' => $existingOrder->getId(),
+            'comment' => [
+                'comment' => 'Test Comment',
+                'is_visible_on_front' => 1,
+            ],
+            'tracks' => [
+                [
+                    'title' => 'Simple shipment track',
+                    'carrier_code' => 'UPS'
+                ]
+            ]
+        ];
+
+        $this->_webApiCall($this->getServiceInfo($existingOrder), $requestData);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Bundle/_files/order_with_bundle_shipped_separately.php
      */