MC-22738: Layered Navigation with different product attributes on Category page

Author: mykhailomatiola

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

@@ -5,32 +5,40 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Api\Data\CategoryInterfaceFactory;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
+$storeManager = $objectManager->get(StoreManagerInterface::class);
 $categoryFactory = $objectManager->get(CategoryInterfaceFactory::class);
 $productFactory = $objectManager->get(ProductInterfaceFactory::class);
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$categoryRepository = $objectManager->get(CategoryRepositoryInterface::class);
+$currentStoreId = $storeManager->getStore()->getId();
 
-$category = $categoryFactory->create();
-$category->isObjectNew(true);
-$category->setName('Category 999')
-    ->setParentId(2)->setPath('1/2')
-    ->setLevel(2)
-    ->setAvailableSortBy('name')
-    ->setDefaultSortBy('name')
-    ->setIsActive(true)
-    ->setPosition(1)
-    ->setStoreId(Store::DEFAULT_STORE_ID)
-    ->setAvailableSortBy(['position'])
-    ->save();
+try {
+    $storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
+    $category = $categoryFactory->create();
+    $category->isObjectNew(true);
+    $category->setName('Category 999')
+        ->setParentId(2)
+        ->setLevel(2)
+        ->setAvailableSortBy('name')
+        ->setDefaultSortBy('name')
+        ->setIsActive(true)
+        ->setPosition(1);
+    $category = $categoryRepository->save($category);
+} finally {
+    $storeManager->setCurrentStore($currentStoreId);
+}
 
 $product = $productFactory->create();
 $product->setTypeId(Type::TYPE_SIMPLE)

dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/AbstractFiltersTest.php

@@ -130,11 +130,10 @@ protected function prepareFilterItems(AbstractFilter $filter): array
         $items = [];
         /** @var Item $item */
         foreach ($filter->getItems() as $item) {
-            $itemArray = [
+            $items[] = [
                 'label' => $item->getData('label'),
                 'count' => $item->getData('count'),
             ];
-            $items[] = $itemArray;
         }
 
         return $items;