Merge branch 'develop' into api_GiftMessage

Author: irenelagno

app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php

@@ -25,7 +25,7 @@ public function set($cartId, $carrierCode, $methodCode);
      * Returns selected shipping method for a specified quote.
      *
      * @param int $cartId The shopping cart ID.
-     * @return \Magento\Quote\Api\Data\ShippingMethodInterface|null Shipping method.
+     * @return \Magento\Quote\Api\Data\ShippingMethodInterface Shipping method.
      * @throws \Magento\Framework\Exception\NoSuchEntityException The specified shopping cart does not exist.
      * @throws \Magento\Framework\Exception\StateException The shipping address is not set.
      */

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -169,6 +169,7 @@ public function assignCustomer($cartId, $customerId, $storeId)
             $this->quoteRepository->getForCustomer($customerId);
             throw new StateException('Cannot assign customer to the given cart. Customer already has active cart.');
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+
         }
 
         $quote->setCustomer($customer);
@@ -205,8 +206,9 @@ protected function createCustomerCart($storeId)
 
         try {
             $this->quoteRepository->getActiveForCustomer($this->userContext->getUserId());
-        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
             throw new CouldNotSaveException('Cannot create quote');
+        } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+
         }
 
         /** @var \Magento\Quote\Model\Quote $quote */

dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementInterfaceTest.php renamed to dev/tests/api-functional/testsuite/Magento/Quote/Api/CartManagementTest.php

@@ -9,7 +9,7 @@
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\Webapi\Model\Rest\Config as RestConfig;
 
-class CartManagementInterfaceTest extends WebapiAbstract
+class CartManagementTest extends WebapiAbstract
 {
     const SERVICE_VERSION = 'V1';
     const SERVICE_NAME = 'quoteCartManagementV1';

dev/tests/api-functional/testsuite/Magento/Quote/Api/CartRepositoryInterfaceTest.php renamed to dev/tests/api-functional/testsuite/Magento/Quote/Api/CartRepositoryTest.php

@@ -14,7 +14,7 @@
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\Webapi\Model\Rest\Config as RestConfig;
 
-class CartRepositoryInterfaceTest extends WebapiAbstract
+class CartRepositoryTest extends WebapiAbstract
 {
     /**
      * @var ObjectManager