MAGETWO-89905: Categories of the Main menu in the different Store View not updated when varnish enabled

- Add session sharing between stores;
- Modify integration test;

Author: adifucan

app/code/Magento/Store/Controller/Store/Redirect.php

@@ -90,17 +90,22 @@ public function execute()
             $this->_redirect->redirect($this->_response, $currentStore->getBaseUrl());
         } else {
             $encodedUrl = $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED);
-            $sidName = $this->sidResolver->getSessionIdQueryParam($this->session);
+
+            $query = [
+                '___from_store' => $fromStore->getCode(),
+                StoreResolverInterface::PARAM_NAME => $targetStoreCode,
+                \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl,
+            ];
+
+            if ($this->sidResolver->getUseSessionInUrl()) {
+                // allow customers to stay logged in during store switching
+                $sidName = $this->sidResolver->getSessionIdQueryParam($this->session);
+                $query[$sidName] = $this->session->getSessionId();
+            }
 
             $arguments = [
                 '_nosid' => true,
-                '_query' =>
-                    [
-                        '___from_store' => $fromStore->getCode(),
-                        StoreResolverInterface::PARAM_NAME => $targetStoreCode,
-                        \Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl,
-                        $sidName => $this->session->getSessionId()
-                    ]
+                '_query' => $query
             ];
             $this->_redirect->redirect($this->_response, 'stores/store/switch', $arguments);
         }

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\UrlRewrite\Model\StoreSwitcher;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\App\Config\ReinitableConfigInterface;
 use Magento\Framework\App\Config\Value;
 use Magento\Store\Api\Data\StoreInterface;
@@ -25,6 +26,11 @@ class RewriteUrlTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManager;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * Class dependencies initialization
      *
@@ -34,10 +40,12 @@ protected function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->storeSwitcher = $this->objectManager->get(StoreSwitcher::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
     }
 
     /**
      * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrite.php
+     * @magentoDataFixture Magento/Catalog/_files/category_product.php
      * @return void
      * @throws StoreSwitcher\CannotSwitchStoreException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
@@ -56,7 +64,9 @@ public function testSwitchToNonExistingPage()
 
         $this->setBaseUrl($toStore);
 
-        $redirectUrl = "http://domain.com/some-random-url/absent-in-url-rewrite.html";
+        $product = $this->productRepository->get('simple333');
+
+        $redirectUrl = "http://domain.com/{$product->getUrlKey()}.html";
         $expectedUrl = $toStore->getBaseUrl();
 
         $this->assertEquals($expectedUrl, $this->storeSwitcher->switch($fromStore, $toStore, $redirectUrl));