MAGETWO-71393: Incorrect catalog rule price for bundle product with custom option

Author: RuslanKostiv1

app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php

@@ -201,6 +201,7 @@ public function testGetValueTypeFixedWithSelectionPriceType($useRegularPrice)
                     [
                         ['qty', null, 1],
                         ['final_price', null, 100],
+                        ['price', null, 100],
                     ]
                 )
             );

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

@@ -19,6 +19,32 @@ class ValueTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
+    /**
+     * @var \Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator
+     */
+    private $customOptionPriceCalculatorMock;
+
+    protected function setUp()
+    {
+        $mockedResource = $this->getMockedResource();
+        $mockedCollectionFactory = $this->getMockedValueCollectionFactory();
+
+        $this->customOptionPriceCalculatorMock = $this->createMock(
+            \Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator::class
+        );
+
+        $helper = new ObjectManager($this);
+        $this->model = $helper->getObject(
+            \Magento\Catalog\Model\Product\Option\Value::class,
+            [
+                'resource' => $mockedResource,
+                'valueCollectionFactory' => $mockedCollectionFactory,
+                'customOptionPriceCalculator' => $this->customOptionPriceCalculatorMock,
+            ]
+        );
+        $this->model->setOption($this->getMockedOption());
+    }
+
     public function testSaveProduct()
     {
         $this->model->setValues([100])
@@ -35,11 +61,16 @@ public function testSaveProduct()
 
     public function testGetPrice()
     {
-        $this->model->setPrice(1000);
+        $price = 1000;
+        $this->model->setPrice($price);
         $this->model->setPriceType(Value::TYPE_PERCENT);
-        $this->assertEquals(1000, $this->model->getPrice(false));
+        $this->assertEquals($price, $this->model->getPrice(false));
 
-        $this->assertEquals(100, $this->model->getPrice(true));
+        $percentPice = 100;
+        $this->customOptionPriceCalculatorMock->expects($this->atLeastOnce())
+            ->method('getOptionPriceByPriceCode')
+            ->willReturn($percentPice);
+        $this->assertEquals($percentPice, $this->model->getPrice(true));
     }
 
     public function testGetValuesCollection()
@@ -78,23 +109,6 @@ public function testDeleteValue()
         $this->assertInstanceOf(\Magento\Catalog\Model\Product\Option\Value::class, $this->model->deleteValue(1));
     }
 
-    protected function setUp()
-    {
-        $mockedResource = $this->getMockedResource();
-        $mockedCollectionFactory = $this->getMockedValueCollectionFactory();
-        $mockedContext = $this->getMockedContext();
-        $helper = new ObjectManager($this);
-        $this->model = $helper->getObject(
-            \Magento\Catalog\Model\Product\Option\Value::class,
-            [
-                'resource' => $mockedResource,
-                'valueCollectionFactory' => $mockedCollectionFactory,
-                'context' => $mockedContext
-            ]
-        );
-        $this->model->setOption($this->getMockedOption());
-    }
-
     /**
      * @return \Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory
      */
@@ -243,61 +257,4 @@ private function getMockedResource()
 
         return $mock;
     }
-
-    /**
-     * @return \Magento\Framework\Model\Context
-     */
-    private function getMockedContext()
-    {
-        $mockedRemoveAction = $this->getMockedRemoveAction();
-        $mockEventManager = $this->getMockedEventManager();
-
-        $mockBuilder = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
-            ->setMethods(['getActionValidator', 'getEventDispatcher'])
-            ->disableOriginalConstructor();
-        $mock = $mockBuilder->getMock();
-
-        $mock->expects($this->any())
-            ->method('getActionValidator')
-            ->will($this->returnValue($mockedRemoveAction));
-
-        $mock->expects($this->any())
-            ->method('getEventDispatcher')
-            ->will($this->returnValue($mockEventManager));
-
-        return $mock;
-    }
-
-    /**
-     * @return RemoveAction
-     */
-    private function getMockedRemoveAction()
-    {
-        $mockBuilder = $this->getMockBuilder(\Magento\Framework\Model\Context::class)
-            ->setMethods(['isAllowed'])
-            ->disableOriginalConstructor();
-        $mock = $mockBuilder->getMock();
-
-        $mock->expects($this->any())
-            ->method('isAllowed')
-            ->will($this->returnValue(true));
-
-        return $mock;
-    }
-
-    /**
-     * @return \Magento\Framework\Event\ManagerInterface
-     */
-    private function getMockedEventManager()
-    {
-        $mockBuilder = $this->getMockBuilder(\Magento\Framework\Event\ManagerInterface::class)
-            ->setMethods(['dispatch'])
-            ->disableOriginalConstructor();
-        $mock = $mockBuilder->getMockForAbstractClass();
-
-        $mock->expects($this->any())
-            ->method('dispatch');
-
-        return $mock;
-    }
 }

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -1393,7 +1393,20 @@ public function testGetFinalPricePreset()
         $qty = 1;
         $this->model->setQty($qty);
         $this->model->setFinalPrice($finalPrice);
-        $this->productTypeInstanceMock->expects($this->never())->method('priceFactory');
+        $productTypePriceMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product\Type\Price::class,
+            ['getFinalPrice']
+        );
+        $productTypePriceMock->expects($this->any())
+            ->method('getFinalPrice')
+            ->with($qty, $this->model)
+            ->will($this->returnValue($finalPrice));
+
+        $this->productTypeInstanceMock->expects($this->any())
+            ->method('priceFactory')
+            ->with($this->model->getTypeId())
+            ->will($this->returnValue($productTypePriceMock));
+
         $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty));
     }