Skip to content

Commit c190f43

Browse files
maxwhite-uamaxwhite-ua
committed
MAGETWO-59904: [PR][Github] Update AccountLock.php #6952 
1 parent 7d58f01 commit c190f43

File tree

1 file changed

+71
-25
lines changed

1 file changed

+71
-25
lines changed

‎app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/AccountLockTest.php

Lines changed: 71 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,27 +46,9 @@ public function setup()
4646
*/
4747
public function testPrepareDataSource($lockExpirationDate, $expectedResult)
4848
{
49-
$dataSource = [
50-
'data' => [
51-
'items' => [
52-
[
53-
'lock_expires' => $lockExpirationDate
54-
],
55-
]
56-
]
57-
];
58-
$expectedDataSource = [
59-
'data' => [
60-
'items' => [
61-
[
62-
'lock_expires' => $expectedResult,
63-
],
64-
]
65-
]
66-
];
67-
$dataSource = $this->component->prepareDataSource($dataSource);
49+
$dataSource = $this->component->prepareDataSource($lockExpirationDate);
6850

69-
$this->assertEquals($expectedDataSource, $dataSource);
51+
$this->assertEquals($expectedResult, $dataSource);
7052
}
7153

7254
/**
@@ -76,13 +58,77 @@ public function testPrepareDataSourceDataProvider()
7658
{
7759
return [
7860
[
79-
'lockExpirationDate' => date("F j, Y", strtotime('-1 days')),
80-
'expectedResult' => new \Magento\Framework\Phrase('Unlocked')
61+
'lockExpirationDate' => [
62+
'data' => [
63+
'items' => [['lock_expires' => null]],
64+
]
65+
],
66+
'expectedResult' => [
67+
'data' => [
68+
'items' => [
69+
[
70+
'lock_expires' => new \Magento\Framework\Phrase('Unlocked')
71+
],
72+
]
73+
]
74+
]
8175
],
8276
[
83-
'lockExpirationDate' => date("F j, Y", strtotime('+1 days')),
84-
'expectedResult' => new \Magento\Framework\Phrase('Locked')
85-
]
77+
'lockExpirationDate' => [
78+
'data' => [
79+
'items' => [[]]//Non exist lock_expires data
80+
]
81+
],
82+
'expectedResult' => [
83+
'data' => [
84+
'items' => [
85+
[
86+
'lock_expires' => new \Magento\Framework\Phrase('Unlocked')
87+
],
88+
]
89+
]
90+
]
91+
],
92+
[
93+
'lockExpirationDate' => [
94+
'data' => [
95+
'items' => [
96+
[
97+
'lock_expires' => date("F j, Y", strtotime('-1 days'))
98+
],
99+
]
100+
]
101+
],
102+
'expectedResult' => [
103+
'data' => [
104+
'items' => [
105+
[
106+
'lock_expires' => new \Magento\Framework\Phrase('Unlocked')
107+
],
108+
]
109+
]
110+
]
111+
],
112+
[
113+
'lockExpirationDate' => [
114+
'data' => [
115+
'items' => [
116+
[
117+
'lock_expires' => date("F j, Y", strtotime('+1 days'))
118+
],
119+
]
120+
]
121+
],
122+
'expectedResult' => [
123+
'data' => [
124+
'items' => [
125+
[
126+
'lock_expires' => new \Magento\Framework\Phrase('Locked')
127+
],
128+
]
129+
]
130+
]
131+
],
86132
];
87133
}
88134
}

0 commit comments

Comments
 (0)