Merge remote-tracking branch 'mpi/MC-22632' into Chaika-PR-2019-11-19

Author: veloraven

app/code/Magento/CatalogRule/Pricing/Price/CatalogRulePrice.php

@@ -85,7 +85,8 @@ public function getValue()
     {
         if (null === $this->value) {
             if ($this->product->hasData(self::PRICE_CODE)) {
-                $this->value = (float)$this->product->getData(self::PRICE_CODE) ?: false;
+                $value = $this->product->getData(self::PRICE_CODE);
+                $this->value = $value ? (float)$value : false;
             } else {
                 $this->value = $this->ruleResource->getRulePrice(
                     $this->dateTime->scopeDate($this->storeManager->getStore()->getId()),

app/code/Magento/CatalogRule/Test/Unit/Pricing/Price/CatalogRulePriceTest.php

@@ -176,4 +176,17 @@ public function testGetAmountNoBaseAmount()
         $result = $this->object->getValue();
         $this->assertFalse($result);
     }
+
+    public function testGetValueWithNullAmount()
+    {
+        $catalogRulePrice = null;
+        $convertedPrice = 0.0;
+
+        $this->saleableItemMock->expects($this->once())->method('hasData')
+                ->with('catalog_rule_price')->willReturn(true);
+        $this->saleableItemMock->expects($this->once())->method('getData')
+                    ->with('catalog_rule_price')->willReturn($catalogRulePrice);
+
+        $this->assertEquals($convertedPrice, $this->object->getValue());
+    }
 }