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

Author: svitja

app/code/Magento/Catalog/Pricing/Price/CustomOptionPriceCalculator.php

@@ -37,8 +37,10 @@ public function getOptionPriceByPriceCode(
         if ($optionValue->getPriceType() === ProductOptionValue::TYPE_PERCENT) {
             $basePrice = $optionValue->getOption()->getProduct()->getPriceInfo()->getPrice($priceCode)->getValue();
             $price = $basePrice * ($optionValue->getData(ProductOptionValue::KEY_PRICE) / 100);
+
             return $price;
         }
+
         return $optionValue->getData(ProductOptionValue::KEY_PRICE);
     }
 }

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

@@ -1414,12 +1414,12 @@ public function testGetFinalPricePreset()
         $productTypePriceMock->expects($this->any())
             ->method('getFinalPrice')
             ->with($qty, $this->model)
-            ->will($this->returnValue($finalPrice));
+            ->willReturn($finalPrice);
 
         $this->productTypeInstanceMock->expects($this->any())
             ->method('priceFactory')
             ->with($this->model->getTypeId())
-            ->will($this->returnValue($productTypePriceMock));
+            ->willReturn($productTypePriceMock);
 
         $this->assertEquals($finalPrice, $this->model->getFinalPrice($qty));
     }

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Price.php

@@ -36,16 +36,16 @@ class Price extends \Magento\Catalog\Test\Block\AbstractPriceBlock
             'selector' => '.price-to .price',
         ],
         'price_excluding_tax' => [
-            'selector' => '.price-excluding-tax .price'
+            'selector' => '.price-excluding-tax .price',
         ],
         'price_including_tax' => [
-            'selector' => '.price-including-tax .price'
+            'selector' => '.price-including-tax .price',
         ],
         'old_price_from' => [
-            'selector' => '.price-from .old-price .price-wrapper'
+            'selector' => '.price-from .old-price .price-wrapper',
         ],
         'old_price_to' => [
-            'selector' => '.price-to .old-price .price-wrapper'
+            'selector' => '.price-to .old-price .price-wrapper',
         ],
     ];