Merge remote-tracking branch 'l3/ACP2E-680' into PR_L3_22_04_2022

Author: veloraven

app/code/Magento/ConfigurableProduct/Plugin/SalesRule/Model/Rule/Condition/Product.php

@@ -10,9 +10,7 @@
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 
 /**
- * Class Product
- *
- * @package Magento\ConfigurableProduct\Plugin\SalesRule\Model\Rule\Condition
+ * Plugin for Magento\SalesRule\Model\Rule\Condition\Product to apply rules on configurable children
  */
 class Product
 {
@@ -57,6 +55,7 @@ private function getProductToValidate(
 
         /* Check for attributes which are not available for configurable products */
         if ($product->getTypeId() == Configurable::TYPE_CODE &&
+            $subject->getAttributeScope() !== 'parent' &&
             !$product->hasData($attrCode) &&
             count($model->getChildren())
         ) {

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/SalesRule/Model/Rule/Condition/ProductTest.php

@@ -28,6 +28,7 @@
 use Magento\SalesRule\Model\Rule\Condition\Product as SalesRuleProduct;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Catalog\Model\ProductCategoryList;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -114,6 +115,10 @@ private function createValidator(): SalesRuleProduct
                 ->getMock()
         );
 
+        $productCategoryList = $this->getMockBuilder(ProductCategoryList::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         return new SalesRuleProduct(
             $contextMock,
             $backendHelperMock,
@@ -122,60 +127,17 @@ private function createValidator(): SalesRuleProduct
             $productRepositoryMock,
             $productMock,
             $collectionMock,
-            $formatMock
+            $formatMock,
+            [],
+            $productCategoryList
         );
     }
 
     public function testChildIsUsedForValidation()
     {
-        $configurableProductMock = $this->createProductMock();
-        $configurableProductMock
-            ->expects($this->any())
-            ->method('getTypeId')
-            ->willReturn(Configurable::TYPE_CODE);
-        $configurableProductMock
-            ->expects($this->any())
-            ->method('hasData')
-            ->with('special_price')
-            ->willReturn(false);
-
-        /* @var AbstractItem|MockObject $item */
-        $item = $this->getMockBuilder(AbstractItem::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['setProduct', 'getProduct', 'getChildren'])
-            ->getMockForAbstractClass();
-        $item->expects($this->any())
-            ->method('getProduct')
-            ->willReturn($configurableProductMock);
-
-        $simpleProductMock = $this->createProductMock();
-        $simpleProductMock
-            ->expects($this->any())
-            ->method('getTypeId')
-            ->willReturn(Type::TYPE_SIMPLE);
-        $simpleProductMock
-            ->expects($this->any())
-            ->method('hasData')
-            ->with('special_price')
-            ->willReturn(true);
-
-        $childItem = $this->getMockBuilder(AbstractItem::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getProduct'])
-            ->getMockForAbstractClass();
-        $childItem->expects($this->any())
-            ->method('getProduct')
-            ->willReturn($simpleProductMock);
-
-        $item->expects($this->any())
-            ->method('getChildren')
-            ->willReturn([$childItem]);
-        $item->expects($this->once())
-            ->method('setProduct')
-            ->with($simpleProductMock);
-
+        $item = $this->configurableProductTestSetUp();
+        $item->expects($this->once())->method('setProduct');
         $this->validator->setAttribute('special_price');
-
         $this->validatorPlugin->beforeValidate($this->validator, $item);
     }
 
@@ -209,8 +171,28 @@ private function createProductMock(): MockObject
         return $productMock;
     }
 
-    public function testChildIsNotUsedForValidation()
+    public function configurableProductTestSetUp()
     {
+        $configurableProductMock = $this->createProductMock();
+        $configurableProductMock
+            ->expects($this->any())
+            ->method('getTypeId')
+            ->willReturn(Configurable::TYPE_CODE);
+        $configurableProductMock
+            ->expects($this->any())
+            ->method('hasData')
+            ->with('special_price')
+            ->willReturn(false);
+
+        /* @var AbstractItem|MockObject $item */
+        $item = $this->getMockBuilder(AbstractItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setProduct', 'getProduct', 'getChildren'])
+            ->getMockForAbstractClass();
+        $item->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($configurableProductMock);
+
         $simpleProductMock = $this->createProductMock();
         $simpleProductMock
             ->expects($this->any())
@@ -222,17 +204,27 @@ public function testChildIsNotUsedForValidation()
             ->with('special_price')
             ->willReturn(true);
 
-        /* @var AbstractItem|MockObject $item */
-        $item = $this->getMockBuilder(AbstractItem::class)
+        $childItem = $this->getMockBuilder(AbstractItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setProduct', 'getProduct'])
+            ->setMethods(['getProduct'])
             ->getMockForAbstractClass();
-        $item->expects($this->any())
+        $childItem->expects($this->any())
             ->method('getProduct')
             ->willReturn($simpleProductMock);
 
-        $this->validator->setAttribute('special_price');
+        $item->expects($this->any())
+            ->method('getChildren')
+            ->willReturn([$childItem]);
+
+        return $item;
+    }
 
+    public function testChildIsNotUsedForValidation()
+    {
+        $item = $this->configurableProductTestSetUp();
+        $item->expects($this->never())->method('setProduct');
+        $this->validator->setAttribute('special_price');
+        $this->validator->setAttributeScope('parent');
         $this->validatorPlugin->beforeValidate($this->validator, $item);
     }
 
@@ -266,7 +258,7 @@ public function testChildIsNotUsedForValidationWhenConfigurableProductIsMissingC
             ->willReturn([]);
 
         $this->validator->setAttribute('special_price');
-
+        $item->expects($this->never())->method('setProduct');
         $this->validatorPlugin->beforeValidate($this->validator, $item);
     }
 }