Skip to content
Snippets Groups Projects
Commit 7c978ad4 authored by Sviatoslav Mankivskyi's avatar Sviatoslav Mankivskyi
Browse files

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

parents 61df5bc3 c9af43df
Branches
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AccountLockTest.php
+ 71
− 25
View file @ 7c978ad4
......@@ -46,27 +46,9 @@ class AccountLockTest extends \PHPUnit_Framework_TestCase
*/
public function testPrepareDataSource($lockExpirationDate, $expectedResult)
{
$dataSource = [
'data' => [
'items' => [
[
'lock_expires' => $lockExpirationDate
],
]
]
];
$expectedDataSource = [
'data' => [
'items' => [
[
'lock_expires' => $expectedResult,
],
]
]
];
$dataSource = $this->component->prepareDataSource($dataSource);
$dataSource = $this->component->prepareDataSource($lockExpirationDate);
$this->assertEquals($expectedDataSource, $dataSource);
$this->assertEquals($expectedResult, $dataSource);
}
/**
......@@ -76,13 +58,77 @@ class AccountLockTest extends \PHPUnit_Framework_TestCase
{
return [
[
'lockExpirationDate' => date("F j, Y", strtotime('-1 days')),
'expectedResult' => new \Magento\Framework\Phrase('Unlocked')
'lockExpirationDate' => [
'data' => [
'items' => [['lock_expires' => null]],
]
],
'expectedResult' => [
'data' => [
'items' => [
[
'lock_expires' => new \Magento\Framework\Phrase('Unlocked')
],
]
]
]
],
[
'lockExpirationDate' => date("F j, Y", strtotime('+1 days')),
'expectedResult' => new \Magento\Framework\Phrase('Locked')
]
'lockExpirationDate' => [
'data' => [
'items' => [[]]//Non exist lock_expires data
]
],
'expectedResult' => [
'data' => [
'items' => [
[
'lock_expires' => new \Magento\Framework\Phrase('Unlocked')
],
]
]
]
],
[
'lockExpirationDate' => [
'data' => [
'items' => [
[
'lock_expires' => date("F j, Y", strtotime('-1 days'))
],
]
]
],
'expectedResult' => [
'data' => [
'items' => [
[
'lock_expires' => new \Magento\Framework\Phrase('Unlocked')
],
]
]
]
],
[
'lockExpirationDate' => [
'data' => [
'items' => [
[
'lock_expires' => date("F j, Y", strtotime('+1 days'))
],
]
]
],
'expectedResult' => [
'data' => [
'items' => [
[
'lock_expires' => new \Magento\Framework\Phrase('Locked')
],
]
]
]
],
];
}
}
app/code/Magento/Customer/Ui/Component/Listing/Column/AccountLock.php
+ 7
− 3
View file @ 7c978ad4
......@@ -41,9 +41,13 @@ class AccountLock extends Column
{
if (isset($dataSource['data']['items'])) {
foreach ($dataSource['data']['items'] as & $item) {
$lockExpires = new \DateTime($item['lock_expires']);
if ($lockExpires > new \DateTime()) {
$item['lock_expires'] = __('Locked');
if (array_key_exists('lock_expires', $item)) {
$lockExpires = new \DateTime($item['lock_expires']);
if ($lockExpires > new \DateTime()) {
$item['lock_expires'] = __('Locked');
} else {
$item['lock_expires'] = __('Unlocked');
}
} else {
$item['lock_expires'] = __('Unlocked');
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment