ACP2E-748: Layered navigation filters don't work when "show out of stock" is enabled

Author: pradeep1819

dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php

@@ -9,13 +9,11 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Block\Product\ListProduct;
 use Magento\Catalog\Block\Product\ProductList\Toolbar;
 use Magento\Catalog\Model\Config;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
-use Magento\CatalogInventory\Model\Configuration;
 use Magento\Framework\App\Config\MutableScopeConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\View\LayoutInterface;
@@ -69,11 +67,6 @@ class SortingTest extends TestCase
      */
     private $scopeConfig;
 
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
-
     /**
      * @inheritdoc
      */
@@ -87,7 +80,6 @@ protected function setUp(): void
         $this->categoryCollectionFactory = $this->objectManager->get(CollectionFactory::class);
         $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
         $this->scopeConfig = $this->objectManager->get(MutableScopeConfigInterface::class);
-        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
         parent::setUp();
     }
 
@@ -475,91 +467,4 @@ private function assertProductListSortOrderWithConfig(string $sortBy, string $di
         $this->renderBlock($category, $direction);
         $this->assertBlockSorting($sortBy, $expected);
     }
-
-    /**
-     * Test product list ordered by product name with out-of-stock configurable product options.
-     *
-     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_show_out_of_stock.php
-     * @dataProvider productListWithShowOutOfStockSortOrderDataProvider
-     * @param string $sortBy
-     * @param string $direction
-     * @param array $expected
-     * @return void
-     */
-    public function testProductListOutOfStockSortOrderBySaleability(
-        string $sortBy,
-        string $direction,
-        array $expected
-    ): void {
-        $this->scopeConfig->setValue(
-            Config::XML_PATH_LIST_DEFAULT_SORT_BY,
-            $sortBy,
-            ScopeInterface::SCOPE_STORE,
-            Store::DEFAULT_STORE_ID
-        );
-        $this->scopeConfig->setValue(
-            Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
-            1,
-            ScopeInterface::SCOPE_STORE,
-            \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT
-        );
-
-        /** @var CategoryInterface $category */
-        $category = $this->categoryRepository->get(333);
-        if ($category->getId()) {
-            $category->setAvailableSortBy(['position', 'name', 'price']);
-            $category->addData(['available_sort_by' => 'position,name,price']);
-            $category->setDefaultSortBy($sortBy);
-            $this->categoryRepository->save($category);
-        }
-
-        foreach (['simple_41', 'simple_42', 'configurable_12345'] as $sku) {
-            $product = $this->productRepository->get($sku);
-            $product->setStockData(['is_in_stock' => 0]);
-            $this->productRepository->save($product);
-        }
-        $this->renderBlock($category, $direction);
-        $this->assertBlockSorting($sortBy, $expected);
-    }
-
-    /**
-     * Product list with out-of-stock sort order data provider
-     *
-     * @return array
-     */
-    public function productListWithShowOutOfStockSortOrderDataProvider(): array
-    {
-        return [
-            'default_order_position_asc' => [
-                'sort' => 'position',
-                'direction' => 'ASC',
-                'expectation' => ['simple2', 'simple1', 'configurable', 'configurable_12345'],
-            ],
-            'default_order_position_desc' => [
-                'sort' => 'position',
-                'direction' => 'DESC',
-                'expectation' => ['simple2', 'simple1', 'configurable', 'configurable_12345'],
-            ],
-            'default_order_price_asc' => [
-                'sort' => 'price',
-                'direction' => 'ASC',
-                'expectation' => ['simple1', 'simple2', 'configurable', 'configurable_12345'],
-            ],
-            'default_order_price_desc' => [
-                'sort' => 'price',
-                'direction' => 'DESC',
-                'expectation' => ['configurable', 'simple2', 'simple1', 'configurable_12345'],
-            ],
-            'default_order_name_asc' => [
-                'sort' => 'name',
-                'direction' => 'ASC',
-                'expectation' => ['configurable', 'simple1', 'simple2', 'configurable_12345'],
-            ],
-            'default_order_name_desc' => [
-                'sort' => 'name',
-                'direction' => 'DESC',
-                'expectation' => ['simple2', 'simple1', 'configurable', 'configurable_12345'],
-            ],
-        ];
-    }
 }

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_show_out_of_stock.php

@@ -85,13 +85,15 @@ public function testMapSelectAttributeWithDifferentStoreLabels(): void
                 'store_id' => $defaultStore->getId(),
                 'select_attribute' => (int)$attributeValue,
                 'select_attribute_value' => 'Table_default',
+                'is_out_of_stock' => 1
             ],
         ];
         $secondStoreMap = [
             $productId => [
                 'store_id' => $secondStore->getId(),
                 'select_attribute' => (int)$attributeValue,
                 'select_attribute_value' => 'Table_fixture_second_store',
+                'is_out_of_stock' => 1
             ],
         ];
         $data = [

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_show_out_of_stock_rollback.php

@@ -50,8 +50,6 @@ protected function setUp(): void
      */
     public function testGetFiltersWithOutOfStockProduct(int $showOutOfStock, array $expectation): void
     {
-        $this->markTestSkipped('Unskip after fixing ACP2E-748.');
-
         $this->updateConfigShowOutOfStockFlag($showOutOfStock);
         $this->getCategoryFiltersAndAssert(
             ['out-of-stock-product' => 'Option 1', 'in-stock-product' => 'Option 2'],