Merge remote-tracking branch 'remotes/github/MAGETWO-57337' into EPAM-PR-42

Author: VeronikaYarats

app/code/Magento/Cms/Test/Mftf/Test/StoreViewLanguageCorrectSwitchTest.xml

@@ -11,13 +11,12 @@
     <test name="StoreViewLanguageCorrectSwitchTest">
         <annotations>
             <features value="Cms"/>
-            <stories value="Store View (language) switch leads to 404"/>
-            <group value="Cms"/>
             <title value="Check that Store View(language) switches correct"/>
             <description value="Check that Store View(language) switches correct"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-96388"/>
             <useCaseId value="MAGETWO-57337"/>
+            <group value="Cms"/>
         </annotations>
         <before>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -37,7 +36,7 @@
 
         <!-- Create StoreView -->
         <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
-        <argument name="customStore" value="NewStoreViewData"/>
+            <argument name="customStore" value="NewStoreViewData"/>
         </actionGroup>
 
         <!-- Add StoreView To Cms Page-->
@@ -51,10 +50,18 @@
         <see userInput="$$createFirstCmsPage.title$$" stepKey="seePageTitle"/>
 
         <!-- Switch StoreView and check that Cms Page is open -->
-        <click selector="{{StorefrontHeaderSection.storeViewSwitcher}}" stepKey="clickStoreViewSwitcher"/>
-        <waitForElementVisible selector="{{StorefrontHeaderSection.storeViewDropdown}}" stepKey="waitForStoreViewDropDown"/>
-        <click selector="{{StorefrontHeaderSection.storeViewOption(NewStoreViewData.code)}}" stepKey="selectStoreView"/>
+        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchToCustomStoreView">
+            <argument name="storeView" value="NewStoreViewData"/>
+        </actionGroup>
         <amOnPage url="{{StorefrontHomePage.url}}/$$createSecondCmsPage.identifier$$" stepKey="gotToSecondCmsPage"/>
         <see userInput="$$createSecondCmsPage.title$$" stepKey="seePageTitle1"/>
+
+        <!--Open first Cms page on custom store view-->
+        <amOnPage url="{{StorefrontHomePage.url}}/$$createFirstCmsPage.identifier$$" stepKey="gotToFirstCmsPage1"/>
+        <see userInput="Whoops, our bad..." stepKey="seePageError"/>
+
+        <!--Switch to default store view and check Cms page-->
+        <actionGroup ref="StorefrontSwitchDefaultStoreViewActionGroup" stepKey="switchToDefualtStoreView"/>
+        <see userInput="$$createFirstCmsPage.title$$" stepKey="seePageTitle2"/>
     </test>
 </tests>

app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreViewActionGroup.xml

@@ -17,4 +17,9 @@
         <click selector="{{StorefrontHeaderSection.storeViewOption(storeView.code)}}" stepKey="clickSelectStoreView"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
+
+    <actionGroup name="StorefrontSwitchDefaultStoreViewActionGroup" extends="StorefrontSwitchStoreViewActionGroup">
+        <remove keyForRemoval="clickSelectStoreView"/>
+        <click selector="{{StorefrontHeaderSection.storeViewOption('default')}}" stepKey="clickSelectDefaultStoreView" after="waitForStoreViewDropdown"/>
+    </actionGroup>
 </actionGroups>

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

@@ -81,7 +81,12 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
             $existingRewrite = $this->urlFinder->findOneByData([
                 UrlRewrite::REQUEST_PATH => $urlPath
             ]);
-            if ($existingRewrite) {
+            $currentRewrite = $this->urlFinder->findOneByData([
+                UrlRewrite::REQUEST_PATH => $urlPath,
+                UrlRewrite::STORE_ID => $targetStore->getId(),
+            ]);
+
+            if ($existingRewrite && !$currentRewrite) {
                 /** @var \Magento\Framework\App\Response\Http $response */
                 $targetUrl = $targetStore->getBaseUrl();
             }