Merge remote-tracking branch 'origin/MC-21814-cart' into pr-2.3.4

Author: danielrenaud

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

@@ -68,7 +68,7 @@ public function testGetActiveCustomerCart()
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
-     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_maskedQuoteId.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_masked_quote_id.php
      */
     public function testGetLoggedInCustomerCartWithoutMaskedQuoteId()
     {

dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_maskedQuoteId.php renamed to dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_masked_quote_id.php

@@ -7,15 +7,12 @@
 
 use Magento\Quote\Api\CartManagementInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /** @var CartManagementInterface $cartManagement */
 $cartManagement = Bootstrap::getObjectManager()->get(CartManagementInterface::class);
 /** @var CartRepositoryInterface $cartRepository */
 $cartRepository = Bootstrap::getObjectManager()->get(CartRepositoryInterface::class);
-/** @var QuoteIdMaskFactory $quoteIdMaskFactory */
-$quoteIdMaskFactory = Bootstrap::getObjectManager()->get(QuoteIdMaskFactory::class);
 
 $cartId = $cartManagement->createEmptyCartForCustomer(1);
 $cart = $cartRepository->get($cartId);

dev/tests/integration/testsuite/Magento/GraphQl/Quote/_files/customer/create_empty_cart_without_masked_quote_id_rollback.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, '1', 'customer_id');
+$quoteResource->delete($quote);