MAGETWO-93061: CMS page of second website with same URLkey as first website, show content of First website instead of second website content.

- Fix static test

Author: nikshostko

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

@@ -63,10 +63,12 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
         }
 
         $oldStoreId = $fromStore->getId();
-        $oldRewrite = $this->urlFinder->findOneByData([
-            UrlRewrite::REQUEST_PATH => $urlPath,
-            UrlRewrite::STORE_ID => $oldStoreId,
-        ]);
+        $oldRewrite = $this->urlFinder->findOneByData(
+            [
+                UrlRewrite::REQUEST_PATH => $urlPath,
+                UrlRewrite::STORE_ID => $oldStoreId,
+            ]
+        );
         if ($oldRewrite) {
             $targetUrl = $targetStore->getBaseUrl();
             // look for url rewrite match on the target store
@@ -75,13 +77,13 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
                 $targetUrl .= $currentRewrite->getRequestPath();
             }
         } else {
-            $existingRewrite = $this->urlFinder->findOneByData([
-                UrlRewrite::REQUEST_PATH => $urlPath
-            ]);
-            $currentRewrite = $this->urlFinder->findOneByData([
-                UrlRewrite::REQUEST_PATH => $urlPath,
-                UrlRewrite::STORE_ID => $targetStore->getId(),
-            ]);
+            $existingRewrite = $this->urlFinder->findOneByData([UrlRewrite::REQUEST_PATH => $urlPath]);
+            $currentRewrite = $this->urlFinder->findOneByData(
+                [
+                    UrlRewrite::REQUEST_PATH => $urlPath,
+                    UrlRewrite::STORE_ID => $targetStore->getId(),
+                ]
+            );
 
             if ($existingRewrite && !$currentRewrite) {
                 /** @var \Magento\Framework\App\Response\Http $response */
@@ -100,15 +102,19 @@ public function switch(StoreInterface $fromStore, StoreInterface $targetStore, s
      */
     private function findCurrentRewrite(UrlRewrite $oldRewrite, StoreInterface $targetStore)
     {
-        $currentRewrite = $this->urlFinder->findOneByData([
-            UrlRewrite::TARGET_PATH => $oldRewrite->getTargetPath(),
-            UrlRewrite::STORE_ID => $targetStore->getId(),
-        ]);
-        if (!$currentRewrite) {
-            $currentRewrite = $this->urlFinder->findOneByData([
-                UrlRewrite::REQUEST_PATH => $oldRewrite->getTargetPath(),
+        $currentRewrite = $this->urlFinder->findOneByData(
+            [
+                UrlRewrite::TARGET_PATH => $oldRewrite->getTargetPath(),
                 UrlRewrite::STORE_ID => $targetStore->getId(),
-            ]);
+            ]
+        );
+        if (!$currentRewrite) {
+            $currentRewrite = $this->urlFinder->findOneByData(
+                [
+                    UrlRewrite::REQUEST_PATH => $oldRewrite->getTargetPath(),
+                    UrlRewrite::STORE_ID => $targetStore->getId(),
+                ]
+            );
         }
         return $currentRewrite;
     }