MC-19585: CMS page redirects to homepage after changing store view

Author: nikita-shcherbatykh

dev/tests/integration/testsuite/Magento/Cms/_files/two_cms_page_with_same_url_for_different_stores.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+// phpcs:ignore Magento2.Security.IncludeFile
+require __DIR__ . '/../../../Magento/Store/_files/second_store.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $page \Magento\Cms\Model\Page */
+$page = $objectManager->create(\Magento\Cms\Model\Page::class);
+$page->setTitle('First test page')
+    ->setIdentifier('page1')
+    ->setStores([1])
+    ->setIsActive(1)
+    ->setPageLayout('1column')
+    ->save();
+
+$storeManager = $objectManager->create(\Magento\Store\Model\StoreManagerInterface::class);
+$store = $storeManager->getStore('fixture_second_store');
+/** @var $page \Magento\Cms\Model\Page */
+$page = $objectManager->create(\Magento\Cms\Model\Page::class);
+$page->setTitle('Second test page')
+    ->setIdentifier('page1')
+    ->setStores([$store->getId()])
+    ->setIsActive(1)
+    ->setPageLayout('1column')
+    ->save();

dev/tests/integration/testsuite/Magento/Cms/_files/two_cms_page_with_same_url_for_different_stores_rollback.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var PageRepositoryInterface $pageRepository */
+$pageRepository = $objectManager->get(PageRepositoryInterface::class);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter(PageInterface::IDENTIFIER, 'page1')
+    ->create();
+$result = $pageRepository->getList($searchCriteria);
+
+foreach ($result->getItems() as $item) {
+    $pageRepository->delete($item);
+}
+
+// phpcs:ignore Magento2.Security.IncludeFile
+require __DIR__ . '/../../../Magento/Store/_files/second_store_rollback.php';

dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php

@@ -8,7 +8,6 @@
 namespace Magento\UrlRewrite\Model\StoreSwitcher;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Cms\Model\Page;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Value;
 use Magento\Store\Api\Data\StoreInterface;
@@ -104,15 +103,12 @@ public function testSwitchToExistingPage(): void
     /**
      * Testing store switching using cms pages with the same url_key but with different page_id
      *
-     * @magentoDataFixture Magento/Cms/_files/pages.php
-     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Cms/_files/two_cms_page_with_same_url_for_different_stores.php
      * @magentoDbIsolation disabled
      * @return void
      */
     public function testSwitchCmsPageToAnotherStore(): void
     {
-        $storeId = (int)$this->storeManager->getStore('fixture_second_store')->getId();
-        $this->createCmsPage($storeId);
         $fromStore = $this->getStoreByCode('default');
         $toStore = $this->getStoreByCode('fixture_second_store');
         $redirectUrl = "http://localhost/index.php/page100/";
@@ -151,26 +147,7 @@ private function setBaseUrl(StoreInterface $targetStore): void
      */
     private function getStoreByCode(string $storeCode): StoreInterface
     {
-        /** @var StoreRepositoryInterface $storeRepository */
-        $storeRepository = $this->objectManager->create(StoreRepositoryInterface::class);
-        return $storeRepository->get($storeCode);
-    }
-
-    /**
-     * Create cms page for store with store id from parameters
-     *
-     * @param int $storeId
-     * @return void
-     */
-    private function createCmsPage(int $storeId): void
-    {
-        /** @var $page \Magento\Cms\Model\Page */
-        $page = $this->objectManager->create(Page::class);
-        $page->setTitle('Test cms page')
-            ->setIdentifier('page100')
-            ->setStores([$storeId])
-            ->setIsActive(1)
-            ->setPageLayout('1column')
-            ->save();
+        /** @var StoreRepositoryInterface */
+        return $this->storeManager->getStore($storeCode);
     }
 }