Merge remote-tracking branch 'origin/MAGETWO-42285' into BUGS

Author: Sergey Semenov

app/code/Magento/Customer/Model/AccountManagement.php

@@ -513,6 +513,13 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
             $customer->setStoreId($storeId);
         }
 
+        // Update 'created_in' value with actual store name
+        if ($customer->getId() === null) {
+            $storeName = $this->storeManager->getStore($customer->getStoreId())
+                ->getName();
+            $customer->setCreatedIn($storeName);
+        }
+
         $customerAddresses = $customer->getAddresses() ?: [];
         $customer->setAddresses(null);
         try {

app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

@@ -265,7 +265,7 @@ public function testCreateAccountWithPasswordHashWithCustomerWithoutStoreId()
             ->method('getDefaultStore')
             ->willReturn($store);
         $customer = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')->getMock();
-        $customer->expects($this->once())
+        $customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
         $customer->expects($this->once())
@@ -341,7 +341,7 @@ public function testCreateAccountWithPasswordHashWithLocalizedException()
             ->method('getDefaultStore')
             ->willReturn($store);
         $customer = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')->getMock();
-        $customer->expects($this->once())
+        $customer->expects($this->atLeastOnce())
             ->method('getId')
             ->willReturn($customerId);
         $customer->expects($this->once())
@@ -478,6 +478,61 @@ public function testCreateAccountWithPasswordHashWithAddressException()
         $this->accountManagement->createAccountWithPasswordHash($customer, $hash);
     }
 
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testCreateAccountWithPasswordHashWithNewCustomerAndLocalizedException()
+    {
+        $storeId = 1;
+        $storeName = 'store_name';
+        $hash = '4nj54lkj5jfi03j49f8bgujfgsd';
+
+        $customerMock = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')
+            ->getMockForAbstractClass();
+
+        $customerMock->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn(null);
+        $customerMock->expects($this->atLeastOnce())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $customerMock->expects($this->once())
+            ->method('setCreatedIn')
+            ->with($storeName)
+            ->willReturnSelf();
+        $customerMock->expects($this->once())
+            ->method('getAddresses')
+            ->willReturn([]);
+        $customerMock->expects($this->once())
+            ->method('setAddresses')
+            ->with(null)
+            ->willReturnSelf();
+
+        $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $storeMock->expects($this->once())
+            ->method('getName')
+            ->willReturn($storeName);
+
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->with($storeId)
+            ->willReturn($storeMock);
+
+        $exception = new \Magento\Framework\Exception\LocalizedException(
+            new \Magento\Framework\Phrase('Exception message')
+        );
+        $this->customerRepository
+            ->expects($this->once())
+            ->method('save')
+            ->with($customerMock, $hash)
+            ->willThrowException($exception);
+
+        $this->accountManagement->createAccountWithPasswordHash($customerMock, $hash);
+    }
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */

dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php

@@ -587,7 +587,6 @@ public function testCreateNonexistingCustomer()
                 'email' => $email,
                 'firstname' => $firstName,
                 'lastname' => $lastName,
-                'created_in' => 'Admin',
                 'id' => null
             ]
         );
@@ -603,7 +602,6 @@ public function testCreateNonexistingCustomer()
         $this->assertEquals($email, $customerAfter->getEmail());
         $this->assertEquals($firstName, $customerAfter->getFirstname());
         $this->assertEquals($lastName, $customerAfter->getLastname());
-        $this->assertEquals('Admin', $customerAfter->getCreatedIn());
         $this->accountManagement->authenticate(
             $customerAfter->getEmail(),
             'aPassword'
@@ -807,15 +805,13 @@ public function testCreateNewCustomerFromClone()
         $customerEntity->setEmail($email)
             ->setFirstname($firstName)
             ->setLastname($lastname)
-            ->setCreatedIn('Admin')
             ->setId(null);
 
         $customer = $this->accountManagement->createAccount($customerEntity, 'aPassword');
         $this->assertNotEmpty($customer->getId());
         $this->assertEquals($email, $customer->getEmail());
         $this->assertEquals($firstName, $customer->getFirstname());
         $this->assertEquals($lastname, $customer->getLastname());
-        $this->assertEquals('Admin', $customer->getCreatedIn());
         $this->accountManagement->authenticate(
             $customer->getEmail(),
             'aPassword',