MC-35065: Catalog pricerules are not working with custom options as expected in Magento 2.3.0 product details page

Author: OlgaVasyltsun

app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php

@@ -12,12 +12,12 @@
 use Magento\Catalog\Model\Product\Option\Value;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory;
-use Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator;
-
 use Magento\Framework\Pricing\Price\PriceInterface;
 use Magento\Framework\Pricing\PriceInfoInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\TestCase;
+use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Test for \Magento\Catalog\Model\Product\Option\Value class.
@@ -30,17 +30,18 @@ class ValueTest extends TestCase
     private $model;
 
     /**
-     * @var CustomOptionPriceCalculator
+     * @var CalculateCustomOptionCatalogRule|MockObject
      */
-    private $customOptionPriceCalculatorMock;
+    private $CalculateCustomOptionCatalogRule;
 
     protected function setUp(): void
     {
         $mockedResource = $this->getMockedResource();
         $mockedCollectionFactory = $this->getMockedValueCollectionFactory();
 
-        $this->customOptionPriceCalculatorMock = $this->createMock(
-            CustomOptionPriceCalculator::class
+
+        $this->CalculateCustomOptionCatalogRule = $this->createMock(
+            CalculateCustomOptionCatalogRule::class
         );
 
         $helper = new ObjectManager($this);
@@ -49,7 +50,7 @@ protected function setUp(): void
             [
                 'resource' => $mockedResource,
                 'valueCollectionFactory' => $mockedCollectionFactory,
-                'customOptionPriceCalculator' => $this->customOptionPriceCalculatorMock,
+                'CalculateCustomOptionCatalogRule' => $this->CalculateCustomOptionCatalogRule
             ]
         );
         $this->model->setOption($this->getMockedOption());
@@ -77,8 +78,8 @@ public function testGetPrice()
         $this->assertEquals($price, $this->model->getPrice(false));
 
         $percentPrice = 100.0;
-        $this->customOptionPriceCalculatorMock->expects($this->atLeastOnce())
-            ->method('getOptionPriceByPriceCode')
+        $this->CalculateCustomOptionCatalogRule->expects($this->atLeastOnce())
+            ->method('execute')
             ->willReturn($percentPrice);
         $this->assertEquals($percentPrice, $this->model->getPrice(true));
     }