Merge remote-tracking branch 'tier4/ACP2E-3363' into PR-10-04-24

Author: dhorytskyi

dev/tests/integration/testsuite/Magento/GraphQl/App/State/GraphQlStateDiff.php

@@ -10,10 +10,12 @@
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Model\AccountManagement;
 use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\App\Area;
 use Magento\Framework\App\Http as HttpApp;
 use Magento\Framework\App\ObjectManager as AppObjectManager;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\Http as HttpResponse;
+use Magento\Framework\App\State;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
@@ -55,6 +57,16 @@ class GraphQlStateDiff
      */
     private readonly Comparator $comparator;
 
+    /**
+     * @var State
+     */
+    private State $appState;
+
+    /**
+     * @var string|null
+     */
+    private ?string $currentArea;
+
     /**
      * Constructor
      */
@@ -66,6 +78,9 @@ public function __construct()
         AppObjectManager::setInstance($this->objectManagerForTest);
         Bootstrap::setObjectManager($this->objectManagerForTest);
         $this->comparator = $this->objectManagerForTest->create(Comparator::class);
+        $this->appState = $this->objectManagerForTest->get(State::class);
+        $this->currentArea = $this->appState->getAreaCode();
+        $this->appState->setAreaCode(Area::AREA_GRAPHQL);
         $this->objectManagerForTest->_resetState();
     }
 
@@ -86,6 +101,7 @@ public function getTestObjectManager()
      */
     public function tearDown(): void
     {
+        $this->appState->setAreaCode($this->currentArea);
         $this->objectManagerBeforeTest->getFactory()->setObjectManager($this->objectManagerBeforeTest);
         AppObjectManager::setInstance($this->objectManagerBeforeTest);
         Bootstrap::setObjectManager($this->objectManagerBeforeTest);