#22296: Integration test fix.

magento · Oct 7, 2019 · 6458cc8 · 6458cc8
1 parent 48f213d
commit 6458cc8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php
@@ -49,7 +49,7 @@ public function testGetUrlInStore()
      * @magentoConfigFixture fixturestore_store web/unsecure/base_url http://sample-second.com/
      * @magentoConfigFixture fixturestore_store web/unsecure/base_link_url http://sample-second.com/
      * @magentoDataFixture Magento/Catalog/_files/product_simple_multistore.php
-     * @magentoDbIsolation disabled
+     * @magentoDbIsolation enabled
      * @dataProvider getUrlsWithSecondStoreProvider
      * @magentoAppArea adminhtml
      */

diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -176,11 +176,13 @@ public function getBaseUrlDataProvider()
      */
     public function testGetBaseUrlInPub()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize([
-            Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => [
-                DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
-            ],
-        ]);
+        \Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize(
+            [
+                Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => [
+                    DirectoryList::PUB => [DirectoryList::URL_PATH => ''],
+                ],
+            ]
+        );
 
         $this->model = $this->_getStoreModel();
         $this->model->load('default');
@@ -283,7 +285,7 @@ public function testGetCurrentUrl()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
-        ->setValue('web/url/use_store', true, ScopeInterface::SCOPE_STORE, 'secondstore');
+            ->setValue('web/url/use_store', true, ScopeInterface::SCOPE_STORE, 'secondstore');
 
         $this->model->load('admin');
         $this->model
@@ -318,7 +320,7 @@ public function testGetCurrentUrl()
     /**
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/Catalog/_files/category_product.php
-     * @magentoDbIsolation disabled
+     * @magentoDbIsolation enabled
      */
     public function testGetCurrentUrlWithUseStoreInUrlFalse()
     {
@@ -366,14 +368,16 @@ public function testGetCurrentUrlWithUseStoreInUrlFalse()
      */
     public function testCRUD()
     {
-        $this->model->setData([
-            'code' => 'test',
-            'website_id' => 1,
-            'group_id' => 1,
-            'name' => 'test name',
-            'sort_order' => 0,
-            'is_active' => 1,
-        ]);
+        $this->model->setData(
+            [
+                'code' => 'test',
+                'website_id' => 1,
+                'group_id' => 1,
+                'name' => 'test name',
+                'sort_order' => 0,
+                'is_active' => 1,
+            ]
+        );
         $crud = new \Magento\TestFramework\Entity(
             $this->model,
             ['name' => 'new name'],
@@ -446,8 +450,8 @@ public function testIsUseStoreInUrl($storeInUrl, $disableStoreInUrl, $expectedRe
     }
 
     /**
-     * @see self::testIsUseStoreInUrl;
      * @return array
+     * @see self::testIsUseStoreInUrl;
      */
     public function isUseStoreInUrlDataProvider()
     {