Skip to content

Commit 198df36

Browse files
committed
MC-24262: Async multistore webapi test fails with elasticsearch on CI
1 parent f2ad426 commit 198df36

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleMultiStoreTest.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,12 @@ protected function setUp(): void
9595
$this->objectManager = Bootstrap::getObjectManager();
9696
$this->registry = $this->objectManager->get(Registry::class);
9797

98-
$params = array_merge_recursive(
99-
Bootstrap::getInstance()->getAppInitParams(),
100-
['MAGE_DIRS' => ['cache' => ['path' => TESTS_TEMP_DIR . '/cache']]]
101-
);
102-
10398
$this->publisherConsumerController = $this->objectManager->create(
10499
PublisherConsumerController::class,
105100
[
106101
'consumers' => $this->consumers,
107102
'logFilePath' => $logFilePath,
108-
'appInitParams' => $params,
103+
'appInitParams' => Bootstrap::getInstance()->getAppInitParams(),
109104
]
110105
);
111106
$this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
@@ -129,13 +124,13 @@ protected function setUp(): void
129124
* @param string|null $storeCode
130125
* @return void
131126
*/
132-
public function testAsyncScheduleBulkMultistore($storeCode): void
127+
public function testAsyncScheduleBulkMultistore(?string $storeCode): void
133128
{
134129
$product = $this->getProductData();
135130
$this->_markTestAsRestOnly();
136131

137132
/** @var Store $store */
138-
$store = $this->objectManager->create(Store::class);
133+
$store = $this->objectManager->get(Store::class);
139134
$store->load(self::STORE_CODE_FROM_FIXTURE);
140135
$this->assertEquals(
141136
self::STORE_NAME_FROM_FIXTURE,

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

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,28 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
use Magento\Store\Model\ResourceModel\Store as StoreResource;
8+
use Magento\Store\Model\StoreFactory;
9+
use Magento\Store\Model\StoreManagerInterface;
710
use Magento\TestFramework\Helper\Bootstrap;
811

9-
/** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
10-
$storeManager = Bootstrap::getObjectManager()->get(\Magento\Store\Model\StoreManagerInterface::class);
11-
12-
/** @var \Magento\Store\Model\Store $store */
13-
$store = Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
12+
$objectManager = Bootstrap::getObjectManager();
13+
/** @var StoreManagerInterface $storeManager */
14+
$storeManager = $objectManager->get(StoreManagerInterface::class);
15+
/** @var StoreFactory $storeFactory */
16+
$storeFactory = $objectManager->get(StoreFactory::class);
17+
/** @var StoreResource $storeResource */
18+
$storeResource = $objectManager->get(StoreResource::class);
1419
$storeCode = 'fixturestore';
1520

16-
if (!$store->load($storeCode)->getId()) {
17-
$store->setCode($storeCode)
18-
->setWebsiteId($storeManager->getWebsite()->getId())
19-
->setGroupId($storeManager->getWebsite()->getDefaultGroupId())
20-
->setName('Fixture Store')
21-
->setSortOrder(10)
22-
->setIsActive(1);
23-
$store->save();
24-
}
21+
$store = $storeFactory->create();
22+
$store->setCode($storeCode)
23+
->setWebsiteId($storeManager->getWebsite()->getId())
24+
->setGroupId($storeManager->getWebsite()->getDefaultGroupId())
25+
->setName('Fixture Store')
26+
->setSortOrder(10)
27+
->setIsActive(1);
28+
$storeResource->save($store);
2529

30+
$storeManager->reinitStores();
2631
//if test using this fixture relies on full text functionality it is required to explicitly perform re-indexation

0 commit comments

Comments
 (0)