Merge remote-tracking branch 'origin/MC-19585' into 2.3-develop-pr31

Author: serhii-balko

app/code/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrl.php

@@ -111,7 +111,7 @@ private function findCurrentRewrite(UrlRewrite $oldRewrite, StoreInterface $targ
         if (!$currentRewrite) {
             $currentRewrite = $this->urlFinder->findOneByData(
                 [
-                    UrlRewrite::REQUEST_PATH => $oldRewrite->getTargetPath(),
+                    UrlRewrite::REQUEST_PATH => $oldRewrite->getRequestPath(),
                     UrlRewrite::STORE_ID => $targetStore->getId(),
                 ]
             );

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

@@ -0,0 +1,29 @@
+<?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();
+
+/** @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

@@ -11,11 +11,17 @@
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Value;
 use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\StoreSwitcher;
 use Magento\Framework\ObjectManagerInterface as ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * Test store switching
+ */
 class RewriteUrlTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -33,6 +39,11 @@ class RewriteUrlTest extends \PHPUnit\Framework\TestCase
      */
     private $productRepository;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Class dependencies initialization
      *
@@ -43,9 +54,12 @@ protected function setUp()
         $this->objectManager = Bootstrap::getObjectManager();
         $this->storeSwitcher = $this->objectManager->get(StoreSwitcher::class);
         $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->storeManager = $this->objectManager->create(StoreManagerInterface::class);
     }
 
     /**
+     * Test switching stores with non-existent cms pages and then redirecting to the homepage
+     *
      * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrite.php
      * @magentoDataFixture Magento/Catalog/_files/category_product.php
      * @return void
@@ -54,15 +68,8 @@ protected function setUp()
      */
     public function testSwitchToNonExistingPage(): void
     {
-        $fromStoreCode = 'default';
-        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
-        $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
-        $fromStore = $storeRepository->get($fromStoreCode);
-
-        $toStoreCode = 'fixture_second_store';
-        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
-        $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
-        $toStore = $storeRepository->get($toStoreCode);
+        $fromStore = $this->getStoreByCode('default');
+        $toStore = $this->getStoreByCode('fixture_second_store');
 
         $this->setBaseUrl($toStore);
 
@@ -75,29 +82,40 @@ public function testSwitchToNonExistingPage(): void
     }
 
     /**
+     * Testing store switching with existing cms pages
+     *
      * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrite.php
      * @return void
      * @throws StoreSwitcher\CannotSwitchStoreException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testSwitchToExistingPage(): void
     {
-        $fromStoreCode = 'default';
-        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
-        $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
-        $fromStore = $storeRepository->get($fromStoreCode);
-
-        $toStoreCode = 'fixture_second_store';
-        /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
-        $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
-        $toStore = $storeRepository->get($toStoreCode);
+        $fromStore = $this->getStoreByCode('default');
+        $toStore = $this->getStoreByCode('fixture_second_store');
 
         $redirectUrl = "http://localhost/index.php/page-c/";
         $expectedUrl = "http://localhost/index.php/page-c-on-2nd-store";
 
         $this->assertEquals($expectedUrl, $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl));
     }
 
+    /**
+     * Testing store switching using cms pages with the same url_key but with different page_id
+     *
+     * @magentoDataFixture Magento/Cms/_files/two_cms_page_with_same_url_for_different_stores.php
+     * @magentoDbIsolation disabled
+     * @return void
+     */
+    public function testSwitchCmsPageToAnotherStore(): void
+    {
+        $fromStore = $this->getStoreByCode('default');
+        $toStore = $this->getStoreByCode('fixture_second_store');
+        $redirectUrl = "http://localhost/index.php/page100/";
+        $expectedUrl = "http://localhost/index.php/page100/";
+        $this->assertEquals($expectedUrl, $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl));
+    }
+
     /**
      * Set base url to store.
      *
@@ -120,4 +138,16 @@ private function setBaseUrl(StoreInterface $targetStore): void
         $reinitibleConfig = $this->objectManager->create(ReinitableConfigInterface::class);
         $reinitibleConfig->reinit();
     }
+
+    /**
+     * Get store object by storeCode
+     *
+     * @param string $storeCode
+     * @return StoreInterface
+     */
+    private function getStoreByCode(string $storeCode): StoreInterface
+    {
+        /** @var StoreRepositoryInterface */
+        return $this->storeManager->getStore($storeCode);
+    }
 }