MAGETWO-95429: ShipOrder API with No Tracking Number Error Message

- Build stabilization

Author: nathanjosiah

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

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

@@ -135,11 +135,15 @@ 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');