merge magento/2.1-develop into magento-borg/DEVOPS-2174-2.1

Author: Magento CICD

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

@@ -186,6 +186,13 @@ public function save(\Magento\Customer\Api\Data\CustomerInterface $customer, $pa
             $customerModel->setRpTokenCreatedAt(null);
         }
 
+        // Set group id to current stored id if no group id passed.
+        if (!($prevCustomerData === null) && $prevCustomerData->getGroupId() && $customer->getGroupId() === null) {
+            $customerModel->setGroupId(
+                $prevCustomerData->getGroupId()
+            );
+        }
+
         $this->setDefaultBilling($customerArr, $prevCustomerDataArr, $customerModel);
 
         $this->setDefaultShipping($customerArr, $prevCustomerDataArr, $customerModel);

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

@@ -160,7 +160,7 @@ protected function setUp()
             false
         );
         $this->customer = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
-            ->setMethods(['__toArray'])
+            ->setMethods(['__toArray', 'setGroupId'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $this->model = new \Magento\Customer\Model\ResourceModel\CustomerRepository(
@@ -187,6 +187,7 @@ public function testSave()
     {
         $customerId = 1;
         $storeId = 2;
+        $groupId = 1;
 
         $region = $this->getMockForAbstractClass(\Magento\Customer\Api\Data\RegionInterface::class, [], '', false);
         $address = $this->getMockForAbstractClass(
@@ -222,6 +223,7 @@ public function testSave()
             [
                 'getId',
                 'setId',
+                'setGroupId',
                 'setStoreId',
                 'getStoreId',
                 'getAttributeSetId',
@@ -254,7 +256,8 @@ public function testSave()
                 'getEmail',
                 'getWebsiteId',
                 'getAddresses',
-                'setAddresses'
+                'setAddresses',
+                'getGroupId'
             ]
         );
         $customerSecureData = $this->getMock(
@@ -289,6 +292,17 @@ public function testSave()
             ->method('setCustomerId')
             ->with($customerId)
             ->willReturnSelf();
+
+        $this->customer->expects($this->exactly(2))
+            ->method('getGroupId')
+            ->willReturn($groupId);
+        $customerAttributesMetaData->expects($this->once())
+            ->method('getGroupId')
+            ->willReturn(null);
+        $customerModel->expects($this->once())
+            ->method('setGroupId')
+            ->with($groupId);
+
         $address->expects($this->once())
             ->method('getRegion')
             ->willReturn($region);