ACPT-1572: Slow saving of stores/websites

- Fix static and integration tests;

Author: adifucan

app/code/Magento/Store/Model/Website.php

@@ -44,9 +44,9 @@ class Website extends \Magento\Framework\Model\AbstractExtensibleModel implement
     \Magento\Framework\App\ScopeInterface,
     \Magento\Store\Api\Data\WebsiteInterface
 {
-    const ENTITY = 'store_website';
+    public const ENTITY = 'store_website';
 
-    const CACHE_TAG = 'website';
+    public const CACHE_TAG = 'website';
 
     /**
      * @var bool

app/code/Magento/Store/composer.json

@@ -14,7 +14,8 @@
         "magento/module-ui": "*",
         "magento/module-customer": "*",
         "magento/module-authorization": "*",
-        "magento/module-backend": "*"
+        "magento/module-backend": "*",
+        "magento/module-page-cache": "*"
     },
     "suggest": {
         "magento/module-deploy": "*"

dev/tests/integration/testsuite/Magento/Customer/Ui/Component/Listing/AttributeRepositoryTest.php

@@ -7,7 +7,9 @@
 
 namespace Magento\Customer\Ui\Component\Listing;
 
+use Magento\Framework\App\Cache\Manager;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -22,12 +24,18 @@ class AttributeRepositoryTest extends TestCase
      */
     private $model;
 
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $this->model = Bootstrap::getObjectManager()->create(AttributeRepository::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->create(AttributeRepository::class);
     }
 
     /**
@@ -38,6 +46,9 @@ protected function setUp(): void
      */
     public function testGetOptionArray(): void
     {
+        $cache = $this->objectManager->get(Manager::class);
+        $cache->clean(['full_page', 'config']);
+
         $result = $this->model->getMetadataByCode('store_id');
 
         $this->assertTrue(isset($result['options']['1']['value']));

dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_two_stores.php

@@ -3,16 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-$website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Website::class);
+
+use Magento\Framework\App\Cache\Manager;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$website = $objectManager->create(\Magento\Store\Model\Website::class);
 /** @var $website \Magento\Store\Model\Website */
 if (!$website->load('test', 'code')->getId()) {
     $website->setData(['code' => 'test', 'name' => 'Test Website', 'default_group_id' => '1', 'is_default' => '0']);
     $website->save();
 }
 $websiteId = $website->getId();
-$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+$store = $objectManager->create(\Magento\Store\Model\Store::class);
 if (!$store->load('fixture_second_store', 'code')->getId()) {
-    $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    $groupId = $objectManager->get(
         \Magento\Store\Model\StoreManagerInterface::class
     )->getWebsite()->getDefaultGroupId();
     $store->setCode(
@@ -31,9 +35,9 @@
     $store->save();
 }
 
-$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+$store = $objectManager->create(\Magento\Store\Model\Store::class);
 if (!$store->load('fixture_third_store', 'code')->getId()) {
-    $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    $groupId = $objectManager->get(
         \Magento\Store\Model\StoreManagerInterface::class
     )->getWebsite()->getDefaultGroupId();
     $store->setCode(
@@ -54,6 +58,8 @@
 
 /* Refresh CatalogSearch index */
 /** @var \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry */
-$indexerRegistry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(\Magento\Framework\Indexer\IndexerRegistry::class);
+$indexerRegistry = $objectManager->create(\Magento\Framework\Indexer\IndexerRegistry::class);
 $indexerRegistry->get(\Magento\CatalogSearch\Model\Indexer\Fulltext::INDEXER_ID)->reindexAll();
+
+$cache = $objectManager->get(Manager::class);
+$cache->clean(['full_page', 'config']);