MC-20682: Storefront: Add/remove product from other storeviews and websites

Author: ysapiga

dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php

@@ -13,7 +13,6 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Eav\Model\Entity\Type;
-use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\App\Http;
 use Magento\Framework\Registry;
@@ -66,9 +65,6 @@ class ViewTest extends AbstractController
     /** @var SortOrderBuilder */
     private $sortOrderBuilder;
 
-    /** @var SearchCriteriaBuilder */
-    private $searchCriteriaBuilder;
-
     /** @var GetAttributeSetByName */
     private $getAttributeSetByName;
 
@@ -87,7 +83,6 @@ protected function setUp()
         $this->registry = $this->_objectManager->get(Registry::class);
         $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
         $this->sortOrderBuilder = $this->_objectManager->create(SortOrderBuilder::class);
-        $this->searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
         $this->getAttributeSetByName = $this->_objectManager->get(GetAttributeSetByName::class);
     }
 

dev/tests/integration/testsuite/Magento/Catalog/_files/product_multistore_different_short_description.php

@@ -25,8 +25,8 @@
 
 $product = $productFactory->create();
 $product->setTypeId(Type::TYPE_SIMPLE)
-    ->setAttributeSetId(4)
-    ->setWebsiteIds([1])
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([$storeManager->getWebsite(true)->getId()])
     ->setName('Simple Product One')
     ->setSku('simple-different-short-description')
     ->setPrice(10)

dev/tests/integration/testsuite/Magento/Catalog/_files/product_two_websites.php

@@ -27,7 +27,7 @@
 
 $product = $productFactory->create();
 $product->setTypeId(Type::TYPE_SIMPLE)
-    ->setAttributeSetId(4)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setWebsiteIds([$defaultWebsiteId, $websiteId])
     ->setName('Simple Product on two websites')
     ->setSku('simple-on-two-websites')