Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Customer with unique attribute can't be saved #7844 #9712

Merged
merged 2 commits into from
Jun 1, 2017
Merged

Customer with unique attribute can't be saved #7844 #9712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9d5669
#7844 - added entity id of customer to validate customer
storbahn May 20, 2017
9e25d8c
#7844 - fixed tests
storbahn May 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/code/Magento/Customer/Controller/Adminhtml/Index/Validate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ protected function _validateCustomer($response)
$data,
\Magento\Customer\Api\Data\CustomerInterface::class
);
$submittedData = $this->getRequest()->getParam('customer');
if (isset($submittedData['entity_id'])) {
$entity_id = $submittedData['entity_id'];
$customer->setId($entity_id);
}
$errors = $this->customerAccountManagement->validate($customer)->getMessages();
} catch (\Magento\Framework\Validator\Exception $exception) {
/* @var $error Error */
Expand Down
56 changes: 55 additions & 1 deletion app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ValidateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ protected function setUp()
false,
true,
true,
['getPost']
['getPost', 'getParam']
);
$this->response = $this->getMockForAbstractClass(
\Magento\Framework\App\ResponseInterface::class,
Expand Down Expand Up @@ -169,6 +169,17 @@ public function testExecute()
'_template_' => null,
'address_index' => null
]);
$customerEntityId = 2;
$this->request->expects($this->once())
->method('getParam')
->with('customer')
->willReturn([
'entity_id' => $customerEntityId
]);

$this->customer->expects($this->once())
->method('setId')
->with($customerEntityId);

$this->form->expects($this->once())->method('setInvisibleIgnored');
$this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]);
Expand Down Expand Up @@ -273,4 +284,47 @@ public function testExecuteWithException()

$this->controller->execute();
}

public function testExecuteWithNewCustomerAndNoEntityId()
{
$this->request->expects($this->once())
->method('getPost')
->willReturn([
'_template_' => null,
'address_index' => null
]);
$this->request->expects($this->once())
->method('getParam')
->with('customer')
->willReturn([]);

$this->customer->expects($this->never())
->method('setId');

$this->form->expects($this->once())->method('setInvisibleIgnored');
$this->form->expects($this->atLeastOnce())->method('extractData')->willReturn([]);

$error = $this->getMock(\Magento\Framework\Message\Error::class, [], [], '', false);
$this->form->expects($this->once())
->method('validateData')
->willReturn([$error]);

$validationResult = $this->getMockForAbstractClass(
\Magento\Customer\Api\Data\ValidationResultsInterface::class,
[],
'',
false,
true,
true
);
$validationResult->expects($this->once())
->method('getMessages')
->willReturn(['Error message']);

$this->customerAccountManagement->expects($this->once())
->method('validate')
->willReturn($validationResult);

$this->controller->execute();
}
}