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

@@ -15,7 +15,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
-$categoryFactory = Bootstrap::getObjectManager()->get(CategoryInterfaceFactory::class);
+$categoryFactory = $objectManager->get(CategoryInterfaceFactory::class);
 $productFactory = $objectManager->get(ProductInterfaceFactory::class);
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
 

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

@@ -23,11 +23,13 @@
 try {
     $productRepository->deleteById('simple1000');
 } catch (NoSuchEntityException $e) {
+    //Already deleted.
 }
 
 try {
     $productRepository->deleteById('simple1001');
 } catch (NoSuchEntityException $e) {
+    //Already deleted.
 }
 
 try {
@@ -38,6 +40,7 @@
         ->getFirstItem();
     $categoryRepository->delete($category);
 } catch (NoSuchEntityException $e) {
+    //Already deleted.
 }
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);

dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractCategoryTest.php

@@ -56,7 +56,7 @@ protected function setUp()
         $this->objectManager = Bootstrap::getObjectManager();
         $this->categoryCollectionFactory = $this->objectManager->create(CollectionFactory::class);
         $this->categoryResource = $this->objectManager->get(CategoryResource::class);
-        $this->layout = $this->objectManager->create(LayoutInterface::class);
+        $this->layout = $this->objectManager->get(LayoutInterface::class);
         $this->navigationBlock = $this->objectManager->create(Category::class);
         parent::setUp();
     }

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

@@ -50,7 +50,7 @@ public function getFiltersWithCustomAttributeDataProvider(): array
             'not_used_in_navigation' => [
                 'products_data' => [],
                 'filterable' => 0,
-                'expectation' => []
+                'expectation' => [],
             ],
             'used_in_navigation_with_results' => [
                 'products_data' => [
@@ -61,7 +61,7 @@ public function getFiltersWithCustomAttributeDataProvider(): array
                 'expectation' => [
                     ['label' => 'Option 1', 'count' => 1],
                     ['label' => 'Option 2', 'count' => 1],
-                ]
+                ],
             ],
             'used_in_navigation_without_results' => [
                 'products_data' => [
@@ -73,7 +73,7 @@ public function getFiltersWithCustomAttributeDataProvider(): array
                     ['label' => 'Option 1', 'count' => 1],
                     ['label' => 'Option 2', 'count' => 1],
                     ['label' => 'Option 3', 'count' => 0],
-                ]
+                ],
             ],
         ];
     }

dev/tests/integration/testsuite/Magento/Swatches/_files/product_visual_swatch_attribute.php

@@ -60,7 +60,7 @@
             ],
         ]
     );
-    $attribute->save();
+    $attributeRepository->save($attribute);
     $installer->addAttributeToGroup(
         ProductAttributeInterface::ENTITY_TYPE_CODE,
         'Default',