Merge remote-tracking branch 'origin/MC-32270' into honeycombined24

Author: avattam06

app/code/Magento/Quote/i18n/en_US.csv

@@ -31,6 +31,7 @@ Subtotal,Subtotal
 "Cart %1 does not contain item %2","Cart %1 does not contain item %2"
 "Could not save quote","Could not save quote"
 "Cart %1 doesn't contain item  %2","Cart %1 doesn't contain item  %2"
+"The cart doesn't contain the item","The cart doesn't contain the item"
 "Could not remove item from quote","Could not remove item from quote"
 "The qty value is required to update quote item.","The qty value is required to update quote item."
 "Minimum order amount is %1","Minimum order amount is %1"

app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php

@@ -65,7 +65,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         try {
             $this->cartItemRepository->deleteById((int)$cart->getId(), $itemId);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+            throw new GraphQlNoSuchEntityException(__('The cart doesn\'t contain the item'));
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()), $e);
         }

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php

@@ -84,7 +84,7 @@ public function testRemoveNonExistentItem()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $notExistentItemId = 999;
 
-        $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
+        $this->expectExceptionMessage("The cart doesn't contain the item");
 
         $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
@@ -106,7 +106,7 @@ public function testRemoveItemIfItemIsNotBelongToCart()
             'virtual-product'
         );
 
-        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+        $this->expectExceptionMessage("The cart doesn't contain the item");
 
         $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php

@@ -74,7 +74,7 @@ public function testRemoveNonExistentItem()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $notExistentItemId = 999;
 
-        $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
+        $this->expectExceptionMessage("The cart doesn't contain the item");
 
         $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
         $this->graphQlMutation($query);
@@ -95,7 +95,7 @@ public function testRemoveItemIfItemIsNotBelongToCart()
             'virtual-product'
         );
 
-        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+        $this->expectExceptionMessage("The cart doesn't contain the item");
 
         $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
         $this->graphQlMutation($query);