Merge branch 'ACP2E-1737' of https://github.com/magento-l3/magento2ce into PR-L3-03132023

Author: chittima

app/code/Magento/CatalogImportExport/Model/Import/Product/CategoryProcessor.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\CatalogImportExport\Model\Import\Product;
 
+use Magento\Store\Model\Store;
+
 /**
  * @api
  * @since 100.0.2
@@ -119,6 +121,7 @@ protected function createCategory($name, $parentId)
         $category->setIsActive(true);
         $category->setIncludeInMenu(true);
         $category->setAttributeSetId($category->getDefaultAttributeSetId());
+        $category->setStoreId(Store::DEFAULT_STORE_ID);
         $category->save();
         $this->categoriesCache[$category->getId()] = $category;
         return $category->getId();

app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/CategoryProcessorTest.php

@@ -13,16 +13,17 @@
 use Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\Store;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class CategoryProcessorTest extends TestCase
 {
-    const PARENT_CATEGORY_ID = 1;
+    public const PARENT_CATEGORY_ID = 1;
 
-    const CHILD_CATEGORY_ID = 2;
+    public const CHILD_CATEGORY_ID = 2;
 
-    const CHILD_CATEGORY_NAME = 'Child';
+    public const CHILD_CATEGORY_NAME = 'Child';
 
     /**
      * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
@@ -48,7 +49,7 @@ class CategoryProcessorTest extends TestCase
     private $childCategory;
 
     /**
-     * \Magento\Catalog\Model\Category
+     * @var \Magento\Catalog\Model\Category
      */
     private $parentCategory;
 
@@ -200,4 +201,19 @@ protected function setPropertyValue(&$object, $property, $value)
         $reflectionProperty->setValue($object, $value);
         return $object;
     }
+
+    /**
+     * @throws \ReflectionException
+     */
+    public function testCategoriesCreatedForGlobalScope()
+    {
+        $this->childCategory->expects($this->once())
+            ->method('setStoreId')
+            ->with(Store::DEFAULT_STORE_ID);
+
+        $reflection = new \ReflectionClass($this->categoryProcessor);
+        $createCategoryReflection = $reflection->getMethod('createCategory');
+        $createCategoryReflection->setAccessible(true);
+        $createCategoryReflection->invokeArgs($this->categoryProcessor, ['testCategory', 2]);
+    }
 }