MAGETWO-90798: Customer is redirected to 404 from Catalog page if switches to the Store with another root Category

Author: StasKozar

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/two_categories_per_two_store_groups.php

@@ -10,8 +10,7 @@
 /** @var \Magento\Catalog\Model\Category $category */
 $category = $objectManager->create(\Magento\Catalog\Model\Category::class);
 $category->isObjectNew(true);
-$category->setId(333)
-    ->setCreatedAt('2014-06-23 09:50:07')
+$category->setCreatedAt('2014-06-23 09:50:07')
     ->setName('Category 1')
     ->setParentId(2)
     ->setPath('1/2/3')
@@ -23,23 +22,6 @@
     ->setAvailableSortBy(['position'])
     ->save();
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setId(333)
-    ->setAttributeSetId(4)
-    ->setStoreId(1)
-    ->setWebsiteIds([1])
-    ->setName('Simple Product Three')
-        ->setSku('simple333')
-    ->setPrice(10)
-    ->setWeight(18)
-    ->setStockData(['use_config_manage_stock' => 0])
-    ->setCategoryIds([333])
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->save();
-
 /** @var \Magento\Store\Model\Store $store */
 $store = $objectManager->create(\Magento\Store\Model\Store::class);
 
@@ -50,8 +32,7 @@
 
 $rootCategoryForTestStoreGroup = $objectManager->create(\Magento\Catalog\Model\Category::class);
 $rootCategoryForTestStoreGroup->isObjectNew(true);
-$rootCategoryForTestStoreGroup->setId(334)
-    ->setCreatedAt('2014-06-23 09:50:07')
+$rootCategoryForTestStoreGroup->setCreatedAt('2014-06-23 09:50:07')
     ->setName('Category 2')
     ->setParentId(1)
     ->setPath('1/2/334')
@@ -72,20 +53,20 @@
 /** @var \Magento\Catalog\Api\CategoryRepositoryInterface $categoryRepository */
 $categoryRepository = $objectManager->create(\Magento\Catalog\Api\CategoryRepositoryInterface::class);
 /** @var \Magento\Catalog\Api\Data\CategoryInterface $category */
-$category = $categoryRepository->get(334);
+$category = $categoryRepository->get(2);
 /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
 $storeRepository = $objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
 /** @var \Magento\Store\Api\Data\StoreInterface $store */
 $store = $storeRepository->get($storeCode);
 
 /** @var \Magento\Store\Model\Group $storeGroup */
-$storeGroup = $objectManager->create(\Magento\Store\Model\Group::class);
-$storeGroup->setWebsiteId('1');
-$storeGroup->setCode('test_store_group');
-$storeGroup->setName('Test Store Group');
-$storeGroup->setRootCategoryId($category->getId());
-$storeGroup->setDefaultStoreId($store->getId());
-$storeGroup->save();
+$storeGroup = $objectManager->create(\Magento\Store\Model\Group::class)
+    ->setWebsiteId('1')
+    ->setCode('test_store_group')
+    ->setName('Test Store Group')
+    ->setRootCategoryId($category->getId())
+    ->setDefaultStoreId($store->getId())
+    ->save();
 
 $store->setGroupId($storeGroup->getId())->save();
 

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/two_categories_per_two_store_groups_rollback.php

@@ -18,14 +18,6 @@
 $registry = $objectManager->get(Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
-// Delete product
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-try {
-    $product = $productRepository->get('simple333', false, null, true);
-    $product->delete();
-} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
-    //Product already removed
-}
 // Delete first category
 /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
 $searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);