From 17a5dbfa388ac24d4969f157e0026291f0d40f7e Mon Sep 17 00:00:00 2001
From: Sergey Semenov <ssemenov@ebay.com>
Date: Wed, 21 Oct 2015 19:18:43 +0300
Subject: [PATCH] MAGETWO-42285: Customer Information In Grid Shows Wrong
Account "Created In" Field
---
.../Customer/Model/AccountManagement.php | 7 +++
.../Test/Unit/Model/AccountManagementTest.php | 59 ++++++++++++++++++-
2 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 500a104861d..06be21a82e3 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -513,6 +513,13 @@ class AccountManagement implements AccountManagementInterface
$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 {
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
index d5fc01b3790..62d7232bda0 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -265,7 +265,7 @@ class AccountManagementTest extends \PHPUnit_Framework_TestCase
->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 @@ class AccountManagementTest extends \PHPUnit_Framework_TestCase
->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 @@ class AccountManagementTest extends \PHPUnit_Framework_TestCase
$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)
*/
--
GitLab