ACP2E-1579: Catalog rule discount disappears after a product is saved from Admin

Author: dhorytskyi

app/code/Magento/CatalogRuleConfigurable/Test/Unit/Plugin/CatalogRule/Model/Rule/ValidationTest.php

@@ -7,10 +7,11 @@
 
 namespace Magento\CatalogRuleConfigurable\Test\Unit\Plugin\CatalogRule\Model\Rule;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
 use Magento\CatalogRule\Model\Rule;
 use Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\Rule\Validation;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
-use Magento\Framework\DataObject;
 use Magento\Rule\Model\Condition\Combine;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -30,13 +31,18 @@ class ValidationTest extends TestCase
      */
     private $configurableMock;
 
+    /**
+     * @var ProductRepositoryInterface|MockObject
+     */
+    private $productRepositoryMock;
+
     /** @var Rule|MockObject */
     private $ruleMock;
 
     /** @var Combine|MockObject */
     private $ruleConditionsMock;
 
-    /** @var DataObject|MockObject */
+    /** @var Product|MockObject */
     private $productMock;
 
     /**
@@ -48,16 +54,15 @@ protected function setUp(): void
             Configurable::class,
             ['getParentIdsByChild']
         );
+        $this->productRepositoryMock = $this->createMock(ProductRepositoryInterface::class);
 
         $this->ruleMock = $this->createMock(Rule::class);
         $this->ruleConditionsMock = $this->createMock(Combine::class);
-        $this->productMock = $this->getMockBuilder(DataObject::class)
-            ->addMethods(['getId'])
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->productMock = $this->createMock(Product::class);
 
         $this->validation = new Validation(
-            $this->configurableMock
+            $this->configurableMock,
+            $this->productRepositoryMock
         );
     }
 
@@ -75,13 +80,49 @@ public function testAfterValidateWithValidConfigurableProduct(
         $runValidateAmount,
         $result
     ) {
-        $this->productMock->expects($this->once())->method('getId')->willReturn('product_id');
-        $this->configurableMock->expects($this->once())->method('getParentIdsByChild')->with('product_id')
+        $storeId = 1;
+        $this->productMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(10);
+        $this->configurableMock->expects($this->once())
+            ->method('getParentIdsByChild')
+            ->with(10)
             ->willReturn($parentsIds);
-        $this->ruleMock->expects($this->exactly($runValidateAmount))->method('getConditions')
+        $this->productMock->expects($this->exactly($runValidateAmount))
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $parentsProducts = array_map(
+            function ($parentsId) {
+                $parent = $this->createMock(Product::class);
+                $parent->method('getId')->willReturn($parentsId);
+                return $parent;
+            },
+            $parentsIds
+        );
+        $this->productRepositoryMock->expects($this->exactly($runValidateAmount))
+            ->method('getById')
+            ->withConsecutive(
+                ...array_map(
+                    function ($parentsId) use ($storeId) {
+                        return [$parentsId, false, $storeId];
+                    },
+                    $parentsIds
+                )
+            )->willReturnOnConsecutiveCalls(...$parentsProducts);
+        $this->ruleMock->expects($this->exactly($runValidateAmount))
+            ->method('getConditions')
             ->willReturn($this->ruleConditionsMock);
-        $this->ruleConditionsMock->expects($this->exactly($runValidateAmount))->method('validateByEntityId')
-            ->willReturnMap($validationResult);
+        $this->ruleConditionsMock->expects($this->exactly($runValidateAmount))
+            ->method('validate')
+            ->withConsecutive(
+                ...array_map(
+                    function ($parentsProduct) {
+                        return [$parentsProduct];
+                    },
+                    $parentsProducts
+                )
+            )
+            ->willReturnOnConsecutiveCalls(...$validationResult);
 
         $this->assertEquals(
             $result,
@@ -97,31 +138,19 @@ public function dataProviderForValidateWithValidConfigurableProduct()
         return [
             [
                 [1, 2, 3],
-                [
-                    [1, false],
-                    [2, true],
-                    [3, true],
-                ],
+                [false, true, true],
                 2,
                 true,
             ],
             [
                 [1, 2, 3],
-                [
-                    [1, true],
-                    [2, false],
-                    [3, true],
-                ],
+                [true, false, true],
                 1,
                 true,
             ],
             [
                 [1, 2, 3],
-                [
-                    [1, false],
-                    [2, false],
-                    [3, false],
-                ],
+                [false, false, false],
                 3,
                 false,
             ],