Merge pull request #532 from magento-performance/ACPT-1257

ACPT-1257: Fix Sales GraphQl tests on App Server

Author: andimov

app/code/Magento/Sales/Model/OrderRepository.php

@@ -12,6 +12,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Sales\Api\Data\OrderExtensionFactory;
 use Magento\Sales\Api\Data\OrderExtensionInterface;
 use Magento\Sales\Api\Data\OrderInterface;
@@ -29,7 +30,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface
+class OrderRepository implements \Magento\Sales\Api\OrderRepositoryInterface, ResetAfterRequestInterface
 {
     /**
      * @var Metadata
@@ -347,4 +348,12 @@ protected function addFilterGroupToCollection(
             $searchResult->addFieldToFilter($fields, $conditions);
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->registry = [];
+    }
 }

app/code/Magento/Tax/Model/Config.php

@@ -11,14 +11,15 @@
  */
 namespace Magento\Tax\Model;
 
+use Magento\Framework\ObjectManager\ResetAfterRequestInterface;
 use Magento\Store\Model\Store;
 
 /**
  * Class to set flags for tax display setting
  *
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  */
-class Config
+class Config implements ResetAfterRequestInterface
 {
     /**
      * Tax notifications
@@ -952,4 +953,14 @@ public function needPriceConversion($store = null)
         }
         return $res;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        $this->_priceIncludesTax = null;
+        $this->_shippingPriceIncludeTax = null;
+        $this->_needUseShippingExcludeTax = false;
+    }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/ReorderTest.php

@@ -7,10 +7,13 @@
 
 namespace Magento\GraphQl\Sales;
 
+use Magento\Customer\Model\ResourceModel\CustomerRepository;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\QuoteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
@@ -185,6 +188,12 @@ public function testReorderWithLowStock()
         $expectedResponse['cart']['items'][0]['quantity'] = 20;
 
         $this->assertResponseFields($response['reorderItems'], $expectedResponse);
+        $customer = ObjectManager::getInstance()->get(CustomerRepository::class)
+            ->get(self::CUSTOMER_EMAIL);
+        $quoteRepository = ObjectManager::getInstance()->get(QuoteRepository::class);
+        $quote = $quoteRepository->getActiveForCustomer($customer->getId());
+        $quote->setIsActive(false);
+        $quoteRepository->save($quote);
     }
 
     /**