Merge remote-tracking branch 'origin/MC-29658' into 2.4-develop-pr1

Author: zakdma

setup/src/Magento/Setup/Fixtures/CategoriesFixture.php

@@ -9,6 +9,7 @@
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManager;
 
 /**
@@ -82,7 +83,7 @@ public function __construct(
     protected $priority = 20;
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute()
     {
@@ -97,7 +98,7 @@ public function execute()
             $category = $this->categoryFactory->create();
             $category->load($parentCategoryId);
             // Need for generation url rewrites per all category store view
-            $category->setStoreId(\Magento\Store\Model\Store::DEFAULT_STORE_ID);
+            $category->setStoreId(Store::DEFAULT_STORE_ID);
             $categoryIndex = 1;
             $this->generateCategories(
                 $category,
@@ -130,6 +131,7 @@ private function generateCategories(
                 $category->setId(null)
                     ->setUrlKey(null)
                     ->setUrlPath(null)
+                    ->setStoreId(Store::DEFAULT_STORE_ID)
                     ->setName($this->getCategoryName($parentCategory, $nestingLevel, $i))
                     ->setParentId($parentCategory->getId())
                     ->setLevel($parentCategory->getLevel() + 1)
@@ -237,15 +239,15 @@ private function getCategoryPrefix()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getActionTitle()
     {
         return 'Generating categories';
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function introduceParamLabels()
     {

setup/src/Magento/Setup/Test/Unit/Fixtures/CategoriesFixtureTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Setup\Fixtures\CategoriesFixture;
 use Magento\Setup\Fixtures\FixtureModel;
+use Magento\Store\Model\Store;
 
 class CategoriesFixtureTest extends \PHPUnit\Framework\TestCase
 {
@@ -40,7 +41,10 @@ class CategoriesFixtureTest extends \PHPUnit\Framework\TestCase
      */
     private $categoryFactoryMock;
 
-    public function setUp()
+    /**
+     * @inhertidoc
+     */
+    protected function setUp()
     {
         $this->fixtureModelMock = $this->createMock(FixtureModel::class);
         $this->collectionFactoryMock = $this->createPartialMock(CollectionFactory::class, ['create']);
@@ -146,6 +150,10 @@ public function testExecute()
         $categoryMock->expects($this->once())
             ->method('setIsActive')
             ->willReturnSelf();
+        $categoryMock->expects($this->exactly(2))
+            ->method('setStoreId')
+            ->with(Store::DEFAULT_STORE_ID)
+            ->willReturnSelf();
 
         $this->categoryFactoryMock->expects($this->once())->method('create')->willReturn($categoryMock);