MC-18561: After changing store view the cms page is not redirecting correctly

Author: nikita-shcherbatykh

app/code/Magento/CmsUrlRewrite/etc/adminhtml/di.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Store\Model\ResourceModel\Store">
-        <plugin name="cms_url_rewrite_after_store_save" type="Magento\CmsUrlRewrite\Plugin\Cms\Model\Store\View"/>
+        <plugin name="update_cms_url_rewrites_after_store_save" type="Magento\CmsUrlRewrite\Plugin\Cms\Model\Store\View"/>
     </type>
 </config>

dev/tests/integration/testsuite/Magento/CmsUrlRewrite/Plugin/Cms/Model/Store/ViewTest.php

@@ -10,12 +10,16 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreFactory;
+use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
  * Test for plugin which is listening store resource model and on save replace cms page url rewrites
+ *
+ * @magentoAppArea adminhtml
  */
 class ViewTest extends \PHPUnit\Framework\TestCase
 {
@@ -29,22 +33,39 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var StoreFactory
+     */
+    private $storeFactory;
+
+    /**
+     * @var string
+     */
+    private $storeCode;
+
+    /**
+     * @var WebsiteRepositoryInterface
+     */
+    private $websiteRepository;
+
     /**
      * @inheritdoc
      */
     protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->urlFinder = $this->objectManager->create(UrlFinderInterface::class);
+        $this->storeFactory = $this->objectManager->create(StoreFactory::class);
+        $this->websiteRepository = $this->objectManager->get(WebsiteRepositoryInterface::class);
+        $this->storeCode = 'test_' . mt_rand();
     }
 
     /**
      * Test of replacing cms page url rewrites on create and delete store
      *
      * @magentoDataFixture Magento/Cms/_files/pages.php
-     * @magentoAppArea adminhtml
      */
-    public function testAfterSave()
+    public function testUrlRewritesChangesAfterStoreSave()
     {
         $data = [
             UrlRewrite::REQUEST_PATH => 'page100',
@@ -67,13 +88,13 @@ public function testAfterSave()
     private function createStore(): void
     {
         /** @var $store Store */
-        $store = $this->objectManager->create(Store::class);
-        if (!$store->load('test', 'code')->getId()) {
+        $store = $this->storeFactory->create();
+        if (!$store->load($this->storeCode, 'code')->getId()) {
             $store->setData(
                 [
-                    'code' => 'test',
-                    'website_id' => '1',
-                    'group_id' => '1',
+                    'code' => $this->storeCode,
+                    'website_id' => $this->websiteRepository->getDefault()->getId(),
+                    'group_id' => $this->websiteRepository->getDefault()->getDefaultGroupId(),
                     'name' => 'Test Store',
                     'sort_order' => '0',
                     'is_active' => '1',
@@ -83,7 +104,7 @@ private function createStore(): void
         } else {
             if ($store->getId()) {
                 /** @var \Magento\TestFramework\Helper\Bootstrap $registry */
-                $registry = Bootstrap::getObjectManager()->get(
+                $registry = $this->objectManager->get(
                     Registry::class
                 );
                 $registry->unregister('isSecureArea');
@@ -94,9 +115,9 @@ private function createStore(): void
                 $store = $this->objectManager->create(Store::class);
                 $store->setData(
                     [
-                        'code' => 'test',
-                        'website_id' => '1',
-                        'group_id' => '1',
+                        'code' => $this->storeCode,
+                        'website_id' => $this->websiteRepository->getDefault()->getId(),
+                        'group_id' => $this->websiteRepository->getDefault()->getDefaultGroupId(),
                         'name' => 'Test Store',
                         'sort_order' => '0',
                         'is_active' => '1',
@@ -120,13 +141,7 @@ private function deleteStore(): void
         $registry->register('isSecureArea', true);
         /** @var Store $store */
         $store = $this->objectManager->get(Store::class);
-        $store->load('test', 'code');
-        if ($store->getId()) {
-            $store->delete();
-        }
-        /** @var Store $store */
-        $store = $this->objectManager->get(Store::class);
-        $store->load('test', 'code');
+        $store->load($this->storeCode, 'code');
         if ($store->getId()) {
             $store->delete();
         }