Skip to content

Commit dca6fc4

Browse files
committed
ACPT-1572: Slow saving of stores/websites
- Fix integration tests;
1 parent a46ac0a commit dca6fc4

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ protected function setUp(): void
3939
*/
4040
public function testGetOptionArray(): void
4141
{
42-
CacheCleaner::cleanAll();
42+
CacheCleaner::clean(['config', 'full_page']);
4343
$result = $this->model->getMetadataByCode('store_id');
4444

4545
$this->assertTrue(isset($result['options']['1']['value']));

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66

77
use Magento\TestFramework\Helper\CacheCleaner;
88

9-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
10-
$website = $objectManager->create(\Magento\Store\Model\Website::class);
9+
$website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Website::class);
1110
/** @var $website \Magento\Store\Model\Website */
1211
if (!$website->load('test', 'code')->getId()) {
1312
$website->setData(['code' => 'test', 'name' => 'Test Website', 'default_group_id' => '1', 'is_default' => '0']);
1413
$website->save();
1514
}
1615
$websiteId = $website->getId();
17-
$store = $objectManager->create(\Magento\Store\Model\Store::class);
16+
$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
1817
if (!$store->load('fixture_second_store', 'code')->getId()) {
19-
$groupId = $objectManager->get(
18+
$groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
2019
\Magento\Store\Model\StoreManagerInterface::class
2120
)->getWebsite()->getDefaultGroupId();
2221
$store->setCode(
@@ -35,9 +34,9 @@
3534
$store->save();
3635
}
3736

38-
$store = $objectManager->create(\Magento\Store\Model\Store::class);
37+
$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
3938
if (!$store->load('fixture_third_store', 'code')->getId()) {
40-
$groupId = $objectManager->get(
39+
$groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
4140
\Magento\Store\Model\StoreManagerInterface::class
4241
)->getWebsite()->getDefaultGroupId();
4342
$store->setCode(
@@ -58,7 +57,8 @@
5857

5958
/* Refresh CatalogSearch index */
6059
/** @var \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry */
61-
$indexerRegistry = $objectManager->create(\Magento\Framework\Indexer\IndexerRegistry::class);
60+
$indexerRegistry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
61+
->create(\Magento\Framework\Indexer\IndexerRegistry::class);
6262
$indexerRegistry->get(\Magento\CatalogSearch\Model\Indexer\Fulltext::INDEXER_ID)->reindexAll();
6363

64-
CacheCleaner::cleanAll();
64+
CacheCleaner::clean(['config', 'full_page']);

0 commit comments

Comments
 (0)