Merge remote-tracking branch 'l3/ACP2E-635' into PR_L3_05_04_2022

Author: veloraven

app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php

@@ -12,6 +12,7 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Helper\Product\Edit\Action\Attribute as AttributeHelper;
 
 /**
  * Updates status for a batch of products.
@@ -41,27 +42,36 @@ class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product implement
      */
     private $productAction;
 
+    /**
+     * @var AttributeHelper
+     */
+    private $attributeHelper;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param Builder $productBuilder
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
      * @param \Magento\Catalog\Model\Product\Action $productAction
+     * @param AttributeHelper $attributeHelper
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         Product\Builder $productBuilder,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
         Filter $filter,
         CollectionFactory $collectionFactory,
-        \Magento\Catalog\Model\Product\Action $productAction = null
+        \Magento\Catalog\Model\Product\Action $productAction = null,
+        AttributeHelper $attributeHelper = null
     ) {
         $this->filter = $filter;
         $this->collectionFactory = $collectionFactory;
         $this->_productPriceIndexerProcessor = $productPriceIndexerProcessor;
         $this->productAction = $productAction ?: ObjectManager::getInstance()
             ->get(\Magento\Catalog\Model\Product\Action::class);
+        $this->attributeHelper = $attributeHelper ?: ObjectManager::getInstance()
+            ->get(AttributeHelper::class);
         parent::__construct($context, $productBuilder);
     }
 
@@ -93,6 +103,7 @@ public function execute()
     {
         $collection = $this->filter->getCollection($this->collectionFactory->create());
         $productIds = $collection->getAllIds();
+        $this->attributeHelper->setProductIds($productIds);
         $requestStoreId = $storeId = $this->getRequest()->getParam('store', null);
         $filterRequest = $this->getRequest()->getParam('filters', null);
         $status = (int) $this->getRequest()->getParam('status');

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/MassStatusTest.php

@@ -21,6 +21,7 @@
 use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Ui\Component\MassAction\Filter;
 use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Catalog\Helper\Product\Edit\Action\Attribute as AttributeHelper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -57,6 +58,11 @@ class MassStatusTest extends ProductTest
      */
     private $actionMock;
 
+    /**
+     * @var AttributeHelper|MockObject
+     */
+    private $attributeHelperMock;
+
     protected function setUp(): void
     {
         $this->priceProcessorMock = $this->getMockBuilder(Processor::class)
@@ -104,6 +110,10 @@ protected function setUp(): void
         $this->actionMock = $this->getMockBuilder(Action::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->attributeHelperMock = $this->getMockBuilder(AttributeHelper::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setProductIds'])
+            ->getMock();
 
         $collectionFactoryMock =
             $this->getMockBuilder(CollectionFactory::class)
@@ -126,7 +136,8 @@ protected function setUp(): void
             $this->priceProcessorMock,
             $this->filterMock,
             $collectionFactoryMock,
-            $this->actionMock
+            $this->actionMock,
+            $this->attributeHelperMock
         );
     }
 
@@ -137,13 +148,14 @@ public function testMassStatusAction()
         $filters = [
             'store_id' => 2,
         ];
+        $productIds = [3];
 
         $this->filterMock->expects($this->once())
             ->method('getCollection')
             ->willReturn($this->abstractDbMock);
         $this->abstractDbMock->expects($this->once())
             ->method('getAllIds')
-            ->willReturn([3]);
+            ->willReturn($productIds);
         $this->request->expects($this->exactly(3))
             ->method('getParam')
             ->willReturnMap(
@@ -153,9 +165,12 @@ public function testMassStatusAction()
                     ['filters', [], $filters]
                 ]
             );
+        $this->attributeHelperMock->expects($this->once())
+            ->method('setProductIds')
+            ->with($productIds);
         $this->actionMock->expects($this->once())
             ->method('updateAttributes')
-            ->with([3], ['status' => $status], 2);
+            ->with($productIds, ['status' => $status], 2);
         $this->priceProcessorMock->expects($this->once())
             ->method('reindexList');