Merge remote-tracking branch 'south/BUGS' into magento2

Author: Oleksii Korshenko

app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php

@@ -192,8 +192,7 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
             $customerModel->setRpToken(null);
             $customerModel->setRpTokenCreatedAt(null);
         }
-
-        $this->customerResourceModel->save($customerModel);
+        $customerModel->save();
         $this->customerRegistry->push($customerModel);
         $customerId = $customerModel->getId();
 

app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php

@@ -268,6 +268,7 @@ public function testSave()
                 'setRpTokenCreatedAt',
                 'getDataModel',
                 'setPasswordHash',
+                'save',
             ],
             [],
             '',
@@ -402,9 +403,8 @@ public function testSave()
         $customerModel->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
-        $this->customerResourceModel->expects($this->once())
-            ->method('save')
-            ->with($customerModel);
+        $customerModel->expects($this->once())
+            ->method('save');
         $this->customerRegistry->expects($this->once())
             ->method('push')
             ->with($customerModel);
@@ -486,6 +486,7 @@ public function testSaveWithPasswordHash()
                 'setRpTokenCreatedAt',
                 'getDataModel',
                 'setPasswordHash',
+                'save',
             ],
             [],
             '',
@@ -579,9 +580,8 @@ public function testSaveWithPasswordHash()
         $customerModel->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
-        $this->customerResourceModel->expects($this->once())
-            ->method('save')
-            ->with($customerModel);
+        $customerModel->expects($this->once())
+            ->method('save');
         $this->customerRegistry->expects($this->once())
             ->method('push')
             ->with($customerModel);

app/code/Magento/CustomerImportExport/Model/Import/Address.php

@@ -543,6 +543,7 @@ protected function _prepareDataForUpdate(array $rowData)
         }
 
         // let's try to find region ID
+        $entityRow['region_id'] = null;
         if (!empty($rowData[self::COLUMN_REGION])) {
             $countryNormalized = strtolower($rowData[self::COLUMN_COUNTRY_ID]);
             $regionNormalized = strtolower($rowData[self::COLUMN_REGION]);

dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/_files/address_import_update.csv

@@ -2,3 +2,4 @@
 "admin","[email protected]",1,,,"US",,"Katy","Parker","T.",19107,,,,"1079 Rocky Road",,"215-629-9720",,,,,,,1
 "admin","[email protected]",3,"Phoenix",,"US",,"Brad","Brown","H.",85034,,"Arizona",4,"4225 Martha Street",,"928-707-1577",,,,,,1,
 "admin","[email protected]",,"Tallahassee",,"US",,"William ","Compton","M.",32301,,"Florida",18,"1973 Drainer Avenue",,"850-590-7403",,,,,,,
+"admin","[email protected]",,"Tallahassee",,"UA",,"An ","Compton","M.",32301,,,18,"1973 Drainer Avenue",,"850-590-7403",,,,,,,