GraphQL-481: [Test Coverage] 'RemoveCouponFromCart' functionality

Author: naydav

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

@@ -11,12 +11,27 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Quote\Api\CouponManagementInterface;
 
 /**
  * @inheritdoc
  */
 class AppliedCoupon implements ResolverInterface
 {
+    /**
+     * @var CouponManagementInterface
+     */
+    private $couponManagement;
+
+    /**
+     * @param CouponManagementInterface $couponManagement
+     */
+    public function __construct(
+        CouponManagementInterface $couponManagement
+    ) {
+        $this->couponManagement = $couponManagement;
+    }
+
     /**
      * @inheritdoc
      */
@@ -26,9 +41,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new LocalizedException(__('"model" value should be specified'));
         }
         $cart = $value['model'];
+        $cartId = $cart->getId();
 
-        $appliedCoupon = $cart->getCouponCode();
-
+        $appliedCoupon = $this->couponManagement->get($cartId);
         return $appliedCoupon ? ['code' => $appliedCoupon] : null;
     }
 }

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

@@ -62,7 +62,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         try {
             $this->couponManagement->remove($cartId);
         } 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 (CouldNotDeleteException $e) {
             throw new LocalizedException(__($e->getMessage()), $e);
         }