MAGETWO-64047: WebAPI: It's impossible to empty numeric fields after they're set

 - fix tests

Author: Cari Spruiell

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php

@@ -128,7 +128,7 @@ public function afterSave($object)
         $attribute = $this->getAttribute();
         $attributeCode = $attribute->getAttributeCode();
         $value = $object->getData($attributeCode);
-        if ((float)$value > 0) {
+        if ($value === null  || (float)$value > 0) {
             if ($attribute->isScopeWebsite() && $object->getStoreId() != \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
                 if ($this->isUseDefault($object)) {
                     $value = null;

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php

@@ -59,7 +59,7 @@ public function testSaveAction($inputData, $defaultAttributes, $attributesSaved
             if ($exists !== $category->getExistsStoreValueFlag($attribute)) {
                 if ($exists) {
                     $errors[] = "custom value for '{$attribute}' attribute is not found";
-                } else {
+                } elseif (!$exists && $category->getCustomAttribute($attribute) !== null) {
                     $errors[] = "custom value for '{$attribute}' attribute is found, but default one must be used";
                 }
             }

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php

@@ -155,7 +155,7 @@ private function assertEqualsOtherThanSkippedAttributes($expected, $actual, $ski
 
             $this->assertEquals(
                 $value,
-                $actual[$key],
+                isset($actual[$key]) ? $actual[$key] : null,
                 'Assert value at key - ' . $key . ' failed'
             );
         }

dev/tests/integration/testsuite/Magento/Eav/Model/ResourceModel/UpdateHandlerTest.php

@@ -205,12 +205,12 @@ public function getCustomStoreDataProvider()
         return [
             ['description', '', 'not_empty_value', 'not_empty_value'],                  //0
             ['description', '', '', null],                                              //1
-            ['description', '', null, 'Description with <b>html tag</b>'],              //2
+            ['description', '', null, null],                                            //2
             ['description', '', false, 'Description with <b>html tag</b>'],             //3
 
             ['description', 'not_empty_value', 'not_empty_value2', 'not_empty_value2'], //4
             ['description', 'not_empty_value', '', null],                               //5
-            ['description', 'not_empty_value', null, 'Description with <b>html tag</b>'], //6
+            ['description', 'not_empty_value', null, null], //6
             ['description', 'not_empty_value', false, 'Description with <b>html tag</b>'], //7
 
             ['description', null, 'not_empty_value', 'not_empty_value'],                 //8
@@ -219,7 +219,7 @@ public function getCustomStoreDataProvider()
 
             ['description', false, 'not_empty_value', 'not_empty_value'],                //11
             ['description', false, '', null],                                            //12
-            ['description', false, null, 'Description with <b>html tag</b>'],            //13
+            ['description', false, null, null],                                          //13
         ];
     }
 
@@ -231,12 +231,12 @@ public function getCustomAttributeDataProvider()
         return [
             ['dropdown_attribute', 0, '', 1, 1],        //0
             ['dropdown_attribute', 0, '', '', null],    //1
-            ['dropdown_attribute', 0, '', null, 0],     //2
+            ['dropdown_attribute', 0, '', null, null],     //2
             ['dropdown_attribute', 0, '', false, 0],    //3
 
             ['dropdown_attribute', 0, 1, 2, 2],         //4
             ['dropdown_attribute', 0, 1, '', null],     //5
-            ['dropdown_attribute', 0, 1, null, 0],      //6
+            ['dropdown_attribute', 0, 1, null, null],      //6
             ['dropdown_attribute', 0, 1, false, 0],     //7
 
             ['dropdown_attribute', 0, null, 1, 1],      //8
@@ -245,11 +245,11 @@ public function getCustomAttributeDataProvider()
 
             ['dropdown_attribute', 0, false, 1, 1],     //11
             ['dropdown_attribute', 0, false, '', null], //12
-            ['dropdown_attribute', 0, false, null, 0],  //13
+            ['dropdown_attribute', 0, false, null, null],  //13
 
             ['dropdown_attribute', 0, '-', 1, 1],       //14
             ['dropdown_attribute', 0, '-', '', null],   //15
-            ['dropdown_attribute', 0, '-', null, 0],    //16
+            ['dropdown_attribute', 0, '-', null, null],    //16
             ['dropdown_attribute', 0, '-', false, 0],   //17
         ];
     }