PR 27956 Refactored test

Author: Usik2203

app/code/Magento/GiftMessageGraphQl/Model/Resolver/Cart/GiftMessage.php

@@ -7,6 +7,7 @@
 
 namespace Magento\GiftMessageGraphQl\Model\Resolver\Cart;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
@@ -62,16 +63,20 @@ public function resolve(
         }
         $cart = $value['model'];
 
-        $giftCartMessage = $this->cartRepository->get($cart->getId());
+        try {
+            $giftCartMessage = $this->cartRepository->get($cart->getId());
+        } catch (LocalizedException $e) {
+            throw new GraphQlInputException(__('Can\'t load cart.'));
+        }
 
-        if ($giftCartMessage === null) {
-            throw new GraphQlInputException(__("Gift message doesn't exist for current cart"));
+        if (!isset($giftCartMessage)) {
+            return null;
         }
 
         return [
             'to' => $giftCartMessage->getRecipient() ?? '',
-            'from' => $giftCartMessage->getSender() ?? '',
-            'message'=> $giftCartMessage->getMessage() ?? ''
+            'from' =>  $giftCartMessage->getSender() ?? '',
+            'message'=>  $giftCartMessage->getMessage() ?? ''
         ];
     }
 }

app/code/Magento/GiftMessageGraphQl/composer.json

@@ -3,7 +3,7 @@
   "description": "N/A",
   "type": "magento2-module",
   "require": {
-    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "php": "~7.3.0||~7.4.0",
     "magento/framework": "*",
     "magento/module-gift-message": "*"
   },

dev/tests/api-functional/testsuite/Magento/GraphQl/GiftMessage/Cart/GiftMessageTest.php

@@ -34,9 +34,40 @@ protected function setUp()
     public function testGiftMessageForCart()
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('message_order_21');
-        $query = <<<QUERY
+        $response = $this->requestCartAndAssertResult($maskedQuoteId);
+        self::assertArrayHasKey('gift_message', $response['cart']);
+        self::assertSame('Mercutio', $response['cart']['gift_message']['to']);
+        self::assertSame('Romeo', $response['cart']['gift_message']['from']);
+        self::assertSame('I thought all for the best.', $response['cart']['gift_message']['message']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @throws NoSuchEntityException
+     * @throws Exception
+     */
+    public function testGiftMessageForCartWithoutMessage()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+        $response = $this->requestCartAndAssertResult($maskedQuoteId);
+        self::assertArrayHasKey('gift_message', $response['cart']);
+        self::assertNull($response['cart']['gift_message']);
+    }
+
+    /**
+     * Get Gift Message Assertion
+     *
+     * @param string $quoteId
+     *
+     * @return array
+     * @throws Exception
+     */
+    private function requestCartAndAssertResult(string $quoteId)
+    {
+        $query =  <<<QUERY
 {
-    cart(cart_id: "$maskedQuoteId") {
+    cart(cart_id: "$quoteId") {
         gift_message {
             to
             from
@@ -45,10 +76,6 @@ public function testGiftMessageForCart()
     }
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
-        self::assertArrayHasKey('gift_message', $response['cart']);
-        self::assertArrayHasKey('to', $response['cart']['gift_message']);
-        self::assertArrayHasKey('from', $response['cart']['gift_message']);
-        self::assertArrayHasKey('message', $response['cart']['gift_message']);
+        return $this->graphQlQuery($query);
     }
 }