GraphQL-191: Resolve random fails on Bamboo with \Magento\GraphQl\Quote\CouponTest::testApplyCouponToCartWithNoItems

Author: naydav

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

@@ -75,7 +75,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         try {
             $this->couponManagement->set($cartId, $couponCode);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+            $message = $e->getMessage();
+            if (preg_match('/The "\d+" Cart doesn\'t contain products/', $message)) {
+                $message = 'Cart does not contain products.';
+            }
+            throw new GraphQlNoSuchEntityException(__($message), $e);
         } catch (CouldNotSaveException $e) {
             throw new LocalizedException(__($e->getMessage()), $e);
         }

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

@@ -89,19 +89,17 @@ public function testApplyCouponTwice()
     /**
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      * @magentoApiDataFixture Magento/SalesRule/_files/coupon_code_with_wildcard.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Cart does not contain products.
      */
     public function testApplyCouponToCartWithNoItems()
     {
         $couponCode = '2?ds5!2d';
 
         $this->quoteResource->load($this->quote, 'test_order_1', 'reserved_order_id');
-        $cartId = (int)$this->quote->getId();
-        $maskedQuoteId = $this->quoteIdToMaskedId->execute($cartId);
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
         $query = $this->prepareAddCouponRequestQuery($maskedQuoteId, $couponCode);
 
-        self::expectExceptionMessage(
-            'The "' . $cartId . '" Cart doesn\'t contain products.'
-        );
         $this->graphQlQuery($query);
     }