MC-22739: Layered Navigation with different Scope for attribute

Author: mykhailomatiola

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

@@ -13,8 +13,6 @@
 require __DIR__ . '/../../Store/_files/second_website_with_two_stores.php';
 
 $objectManager =  Bootstrap::getObjectManager();
-/** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 /** @var WebsiteRepositoryInterface $websiteRepository */
 $websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
 $defaultWebsiteId = $websiteRepository->get('base')->getId();

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

@@ -7,4 +7,3 @@
 
 require __DIR__ . '/category_with_different_price_products_rollback.php';
 require __DIR__ . '/../../Store/_files/second_website_with_two_stores_rollback.php';
-

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

@@ -74,12 +74,16 @@ protected function prepareFilterItems(AbstractFilter $filter): array
     /**
      * @inheritdoc
      */
-    protected function updateProducts(array $products, string $attributeCode): void
+    protected function updateProducts(
+        array $products,
+        string $attributeCode,
+        int $storeId = Store::DEFAULT_STORE_ID
+    ): void
     {
         $attribute = $this->attributeRepository->get($attributeCode);
 
         foreach ($products as $productSku => $value) {
-            $product = $this->productRepository->get($productSku, false, Store::DEFAULT_STORE_ID, true);
+            $product = $this->productRepository->get($productSku, false, $storeId, true);
             $product->addData(
                 [$attribute->getAttributeCode() => $value]
             );

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

@@ -43,7 +43,7 @@ class FilterScopeTest extends AbstractFiltersTest
     protected function setUp()
     {
         parent::setUp();
-        $this->storeManager = $this->objectManager->create(StoreManagerInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
         $this->oldStoreId = (int)$this->storeManager->getStore()->getId();
         $this->currentStoreId = (int)$this->storeManager->getStore('fixture_second_store')->getId();
     }
@@ -67,15 +67,18 @@ public function testGetFilters(int $scope, array $products, array $expectation):
         );
         $this->updateProductsOnStore($products);
         $this->clearInstanceAndReindexSearch();
-        $this->storeManager->setCurrentStore($this->currentStoreId);
-        $this->navigationBlock->getLayer()->setCurrentCategory(
-            $this->loadCategory('Category 999', $this->currentStoreId)
-        );
-        $this->navigationBlock->setLayout($this->layout);
-        $filter = $this->getFilterByCode($this->navigationBlock->getFilters(), $this->getAttributeCode());
-        $this->assertNotNull($filter);
-        $this->assertEquals($expectation, $this->prepareFilterItems($filter));
-        $this->storeManager->setCurrentStore($this->oldStoreId);
+        try {
+            $this->storeManager->setCurrentStore($this->currentStoreId);
+            $this->navigationBlock->getLayer()->setCurrentCategory(
+                $this->loadCategory('Category 999', $this->currentStoreId)
+            );
+            $this->navigationBlock->setLayout($this->layout);
+            $filter = $this->getFilterByCode($this->navigationBlock->getFilters(), $this->getAttributeCode());
+            $this->assertNotNull($filter);
+            $this->assertEquals($expectation, $this->prepareFilterItems($filter));
+        } finally {
+            $this->storeManager->setCurrentStore($this->oldStoreId);
+        }
     }
 
     /**
@@ -144,11 +147,14 @@ protected function getAttributeCode(): string
      */
     private function updateProductsOnStore(array $productsData): void
     {
-        foreach ($productsData as $storeCode => $products) {
-            $storeId = (int)$this->storeManager->getStore($storeCode)->getId();
-            $this->storeManager->setCurrentStore($storeId);
-            $this->updateProducts($products, $this->getAttributeCode(), $storeId);
+        try {
+            foreach ($productsData as $storeCode => $products) {
+                $storeId = (int)$this->storeManager->getStore($storeCode)->getId();
+                $this->storeManager->setCurrentStore($storeId);
+                $this->updateProducts($products, $this->getAttributeCode(), $storeId);
+            }
+        } finally {
+            $this->storeManager->setCurrentStore($this->oldStoreId);
         }
-        $this->storeManager->setCurrentStore($this->oldStoreId);
     }
 }