Merge remote-tracking branch 'origin/ACP2E-4136' into PR_2025_09_08_muntianu

Author: katmoon

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -11,6 +11,7 @@
 use Magento\Catalog\Block\Product\Context;
 use Magento\Catalog\Block\Product\Widget\Html\Pager;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
@@ -371,6 +372,7 @@ public function getBaseCollection(): Collection
          */
         $collection = $this->_addProductAttributesAndPrices($collection)
             ->addStoreFilter()
+            ->addAttributeToFilter(Product::STATUS, ProductStatus::STATUS_ENABLED)
             ->addAttributeToSort('entity_id', 'desc')
             ->setPageSize($this->getPageSize())
             ->setCurPage($this->getRequest()->getParam($this->getData('page_var_name'), 1));

app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Block\Product\Widget\Html\Pager;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
@@ -41,57 +42,57 @@ class ProductsListTest extends TestCase
     /**
      * @var ProductsList
      */
-    protected $productsList;
+    private $productsList;
 
     /**
      * @var CollectionFactory|MockObject
      */
-    protected $collectionFactory;
+    private $collectionFactory;
 
     /**
      * @var Visibility|MockObject
      */
-    protected $visibility;
+    private $visibility;
 
     /**
      * @var Context|MockObject
      */
-    protected $httpContext;
+    private $httpContext;
 
     /**
      * @var Builder|MockObject
      */
-    protected $builder;
+    private $builder;
 
     /**
      * @var Rule|MockObject
      */
-    protected $rule;
+    private $rule;
 
     /**
      * @var Conditions|MockObject
      */
-    protected $widgetConditionsHelper;
+    private $widgetConditionsHelper;
 
     /**
      * @var StoreManagerInterface|MockObject
      */
-    protected $storeManager;
+    private $storeManager;
 
     /**
      * @var DesignInterface
      */
-    protected $design;
+    private $design;
 
     /**
      * @var RequestInterface
      */
-    protected $request;
+    private $request;
 
     /**
      * @var LayoutInterface
      */
-    protected $layout;
+    private $layout;
 
     /**
      * @var PriceCurrencyInterface|MockObject
@@ -105,24 +106,15 @@ class ProductsListTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->collectionFactory =
-            $this->getMockBuilder(CollectionFactory::class)
-                ->onlyMethods(['create'])
-                ->disableOriginalConstructor()
-                ->getMock();
-        $this->visibility = $this->getMockBuilder(Visibility::class)
-            ->onlyMethods(['getVisibleInCatalogIds'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->collectionFactory = $this->createMock(CollectionFactory::class);
+        $this->visibility = $this->createMock(Visibility::class);
         $this->httpContext = $this->createMock(Context::class);
         $this->builder = $this->createMock(Builder::class);
         $this->rule = $this->createMock(Rule::class);
         $this->serializer = $this->createMock(Json::class);
-        $this->widgetConditionsHelper = $this->getMockBuilder(Conditions::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
-        $this->design = $this->getMockForAbstractClass(DesignInterface::class);
+        $this->widgetConditionsHelper = $this->createMock(Conditions::class);
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
+        $this->design = $this->createMock(DesignInterface::class);
 
         $objectManagerHelper = new ObjectManagerHelper($this);
         $arguments = $objectManagerHelper->getConstructArguments(
@@ -141,7 +133,7 @@ protected function setUp(): void
         );
         $this->request = $arguments['context']->getRequest();
         $this->layout = $arguments['context']->getLayout();
-        $this->priceCurrency = $this->getMockForAbstractClass(PriceCurrencyInterface::class);
+        $this->priceCurrency = $this->createMock(PriceCurrencyInterface::class);
 
         $this->productsList = $objectManagerHelper->getObject(
             ProductsList::class,
@@ -297,21 +289,7 @@ public function testCreateCollection($pagerEnable, $productsCount, $productsPerP
     {
         $this->visibility->expects($this->once())->method('getVisibleInCatalogIds')
             ->willReturn([Visibility::VISIBILITY_IN_CATALOG, Visibility::VISIBILITY_BOTH]);
-        $collection = $this->getMockBuilder(Collection::class)
-            ->onlyMethods([
-                'setVisibility',
-                'addMinimalPrice',
-                'addFinalPrice',
-                'addTaxPercents',
-                'addAttributeToSelect',
-                'addUrlRewrite',
-                'addStoreFilter',
-                'addAttributeToSort',
-                'setPageSize',
-                'setCurPage',
-                'distinct'
-            ])->disableOriginalConstructor()
-            ->getMock();
+        $collection = $this->createMock(Collection::class);
         $collection->expects($this->once())->method('setVisibility')
             ->with([Visibility::VISIBILITY_IN_CATALOG, Visibility::VISIBILITY_BOTH])
             ->willReturnSelf();
@@ -321,6 +299,10 @@ public function testCreateCollection($pagerEnable, $productsCount, $productsPerP
         $collection->expects($this->once())->method('addAttributeToSelect')->willReturnSelf();
         $collection->expects($this->once())->method('addUrlRewrite')->willReturnSelf();
         $collection->expects($this->once())->method('addStoreFilter')->willReturnSelf();
+        $collection->expects($this->once())
+            ->method('addAttributeToFilter')
+            ->with(Product::STATUS, ProductStatus::STATUS_ENABLED)
+            ->willReturnSelf();
         $collection->expects($this->once())->method('addAttributeToSort')->with('entity_id', 'desc')->willReturnSelf();
         $collection->expects($this->once())->method('setPageSize')->with($expectedPageSize)->willReturnSelf();
         $collection->expects($this->once())->method('setCurPage')->willReturnSelf();

dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php renamed to dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php

@@ -8,6 +8,7 @@
 
 use Magento\Bundle\Test\Fixture\Option as BundleOptionFixture;
 use Magento\Bundle\Test\Fixture\Product as BundleProductFixture;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\Catalog\Test\Fixture\MultiselectAttribute as MultiselectAttributeFixture;
 use Magento\Catalog\Test\Fixture\Category as CategoryFixture;
 use Magento\Catalog\Test\Fixture\Product as ProductFixture;
@@ -20,31 +21,33 @@
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Fixture\DbIsolation;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Tests for @see \Magento\CatalogWidget\Block\Product\ProductsList
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ProductListTest extends TestCase
+#[
+    CoversClass(ProductsList::class),
+    DbIsolation(false),
+]
+class ProductsListTest extends TestCase
 {
     /**
      * @var ProductsList
      */
-    protected $block;
+    private $block;
 
     /**
      * @var CategoryCollection;
-
      */
     private $categoryCollection;
 
     /**
      * @var ObjectManagerInterface
      */
-    protected $objectManager;
+    private $objectManager;
 
     /**
      * @var DataFixtureStorage
@@ -56,7 +59,7 @@ protected function setUp(): void
         $this->objectManager = Bootstrap::getObjectManager();
         $this->block = $this->objectManager->create(ProductsList::class);
         $this->categoryCollection = $this->objectManager->create(CategoryCollection::class);
-        $this->fixtures = Bootstrap::getObjectManager()->get(DataFixtureStorageManager::class)->getStorage();
+        $this->fixtures = $this->objectManager->get(DataFixtureStorageManager::class)->getStorage();
     }
 
     /**
@@ -67,10 +70,10 @@ protected function setUp(): void
      * 3. Create product list widget condition based on the new multiselect attribute
      * 4. Set at least 2 options of multiselect attribute to match products for the product list widget
      * 5. Load collection for product list widget and make sure that number of loaded products is correct
-     *
-     * @magentoDbIsolation disabled
-     * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
      */
+    #[
+        DataFixture('Magento/Catalog/_files/products_with_multiselect_attribute.php'),
+    ]
     public function testCreateCollection()
     {
         // Reindex EAV attributes to enable products filtration by created multiselect attribute
@@ -111,10 +114,10 @@ public function testCreateCollection()
 
     /**
      * Test product list widget can process condition with dropdown type of attribute
-     *
-     * @magentoDbIsolation disabled
-     * @magentoDataFixture Magento/Catalog/_files/products_with_dropdown_attribute.php
      */
+    #[
+        DataFixture('Magento/Catalog/_files/products_with_dropdown_attribute.php'),
+    ]
     public function testCreateCollectionWithDropdownAttribute()
     {
         /** @var $attribute Attribute */
@@ -166,15 +169,15 @@ private function performAssertions(int $count)
     /**
      * Check that collection returns correct result if use not contains operator for string attribute
      *
-     * @magentoDbIsolation disabled
-     * @magentoDataFixture Magento/Catalog/_files/product_simple_xss.php
-     * @magentoDataFixture Magento/Catalog/_files/product_virtual.php
-     * @dataProvider createCollectionForSkuDataProvider
      * @param string $encodedConditions
      * @param string $sku
-     * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
+    #[
+        DataFixture('Magento/Catalog/_files/product_simple_xss.php'),
+        DataFixture('Magento/Catalog/_files/product_virtual.php'),
+        DataFixture(ProductFixture::class, ['status' => ProductStatus::STATUS_DISABLED]),
+        DataProvider('createCollectionForSkuDataProvider'),
+    ]
     public function testCreateCollectionForSku($encodedConditions, $sku)
     {
         $this->block->setData('conditions_encoded', $encodedConditions);
@@ -207,12 +210,10 @@ public static function createCollectionForSkuDataProvider()
 
     /**
      * Check that collection returns correct result if use date attribute.
-     *
-     * @magentoDbIsolation disabled
-     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_date_attribute.php
-     * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
+    #[
+        DataFixture('Magento/Catalog/_files/product_simple_with_date_attribute.php'),
+    ]
     public function testProductListWithDateAttribute()
     {
         $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,'
@@ -238,10 +239,10 @@ public function testProductListWithDateAttribute()
      * 2. Create 2 new products and assign them to the sub categories
      * 3. Create product list widget condition to display products from the anchor root category
      * 4. Load collection for product list widget and make sure that number of loaded products is correct
-     *
-     * @magentoDbIsolation disabled
-     * @magentoDataFixture Magento/Catalog/_files/product_in_nested_anchor_categories.php
      */
+    #[
+        DataFixture('Magento/Catalog/_files/product_in_nested_anchor_categories.php'),
+    ]
     public function testCreateAnchorCollection()
     {
         // Reindex EAV attributes to enable products filtration by created multiselect attribute
@@ -276,7 +277,6 @@ public function testCreateAnchorCollection()
     }
 
     #[
-        DbIsolation(false),
         DataFixture(ProductFixture::class, ['price' => 10], 'p1'),
         DataFixture(ProductFixture::class, ['price' => 20], 'p2'),
         DataFixture(BundleOptionFixture::class, ['product_links' => ['$p1$', '$p2$']], 'opt1'),
@@ -301,14 +301,15 @@ public function testBundleProductList()
     /**
      * Test that price rule condition works correctly
      *
-     * @magentoDbIsolation disabled
-     * @magentoDataFixture Magento/Catalog/_files/category_with_different_price_products.php
-     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @param string $operator
      * @param int $value
      * @param array $matches
-     * @dataProvider priceFilterDataProvider
      */
+    #[
+        DataFixture('Magento/Catalog/_files/category_with_different_price_products.php'),
+        DataFixture('Magento/ConfigurableProduct/_files/product_configurable.php'),
+        DataProvider('priceFilterDataProvider'),
+    ]
     public function testPriceFilter(string $operator, int $value, array $matches)
     {
         $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,
@@ -375,7 +376,6 @@ public static function priceFilterDataProvider(): array
     }
 
     #[
-        DbIsolation(false),
         DataProvider('collectionResultWithMultiselectAttributeDataProvider'),
         DataFixture(
             MultiselectAttributeFixture::class,