ENGCOM-3559: make sure that the removal of the custom_price is properly persisted into database #19402

Author: sidolov

app/code/Magento/Quote/Model/Quote/Item/Updater.php

@@ -60,6 +60,7 @@ public function __construct(
 
     /**
      * Update quote item qty.
+     *
      * Custom price is updated in case 'custom_price' value exists
      *
      * @param Item $item
@@ -145,8 +146,8 @@ protected function unsetCustomPrice(Item $item)
             $item->addOption($infoBuyRequest);
         }
 
-        $item->unsetData('custom_price');
-        $item->unsetData('original_custom_price');
+        $item->setData('custom_price', null);
+        $item->setData('original_custom_price', null);
     }
 
     /**

app/code/Magento/Quote/Test/Unit/Model/Quote/Item/UpdaterTest.php

@@ -67,7 +67,7 @@ protected function setUp()
                 'addOption',
                 'setCustomPrice',
                 'setOriginalCustomPrice',
-                'unsetData',
+            'setData',
                 'hasData',
                 'setIsQtyDecimal'
             ]);
@@ -353,7 +353,11 @@ public function testUpdateUnsetCustomPrice()
             ->will($this->returnValue($buyRequestMock));
 
         $this->itemMock->expects($this->exactly(2))
-            ->method('unsetData');
+            ->method('setData')
+            ->withConsecutive(
+                ['custom_price', null],
+                ['original_custom_price', null]
+            );
 
         $this->itemMock->expects($this->once())
             ->method('hasData')