Skip to content

Commit 6458cc8

Browse files
#22296: Integration test fix.
1 parent 48f213d commit 6458cc8

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function testGetUrlInStore()
4949
* @magentoConfigFixture fixturestore_store web/unsecure/base_url http://sample-second.com/
5050
* @magentoConfigFixture fixturestore_store web/unsecure/base_link_url http://sample-second.com/
5151
* @magentoDataFixture Magento/Catalog/_files/product_simple_multistore.php
52-
* @magentoDbIsolation disabled
52+
* @magentoDbIsolation enabled
5353
* @dataProvider getUrlsWithSecondStoreProvider
5454
* @magentoAppArea adminhtml
5555
*/

dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,13 @@ public function getBaseUrlDataProvider()
176176
*/
177177
public function testGetBaseUrlInPub()
178178
{
179-
\Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize([
180-
Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => [
181-
DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
182-
],
183-
]);
179+
\Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize(
180+
[
181+
Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => [
182+
DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
183+
],
184+
]
185+
);
184186

185187
$this->model = $this->_getStoreModel();
186188
$this->model->load('default');
@@ -283,7 +285,7 @@ public function testGetCurrentUrl()
283285
{
284286
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
285287
$objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
286-
->setValue('web/url/use_store', true, ScopeInterface::SCOPE_STORE, 'secondstore');
288+
->setValue('web/url/use_store', true, ScopeInterface::SCOPE_STORE, 'secondstore');
287289

288290
$this->model->load('admin');
289291
$this->model
@@ -318,7 +320,7 @@ public function testGetCurrentUrl()
318320
/**
319321
* @magentoDataFixture Magento/Store/_files/second_store.php
320322
* @magentoDataFixture Magento/Catalog/_files/category_product.php
321-
* @magentoDbIsolation disabled
323+
* @magentoDbIsolation enabled
322324
*/
323325
public function testGetCurrentUrlWithUseStoreInUrlFalse()
324326
{
@@ -366,14 +368,16 @@ public function testGetCurrentUrlWithUseStoreInUrlFalse()
366368
*/
367369
public function testCRUD()
368370
{
369-
$this->model->setData([
370-
'code' => 'test',
371-
'website_id' => 1,
372-
'group_id' => 1,
373-
'name' => 'test name',
374-
'sort_order' => 0,
375-
'is_active' => 1,
376-
]);
371+
$this->model->setData(
372+
[
373+
'code' => 'test',
374+
'website_id' => 1,
375+
'group_id' => 1,
376+
'name' => 'test name',
377+
'sort_order' => 0,
378+
'is_active' => 1,
379+
]
380+
);
377381
$crud = new \Magento\TestFramework\Entity(
378382
$this->model,
379383
['name' => 'new name'],
@@ -446,8 +450,8 @@ public function testIsUseStoreInUrl($storeInUrl, $disableStoreInUrl, $expectedRe
446450
}
447451

448452
/**
449-
* @see self::testIsUseStoreInUrl;
450453
* @return array
454+
* @see self::testIsUseStoreInUrl;
451455
*/
452456
public function isUseStoreInUrlDataProvider()
453457
{

0 commit comments

Comments
 (0)