Skip to content

Commit 3df9f91

Browse files
author
Roman Ganin
committed
Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into MAGETWO-35665
2 parents 04715bb + f9966b1 commit 3df9f91

File tree

74 files changed

+3224
-118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+3224
-118
lines changed

‎app/code/Magento/Backend/Model/Auth.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ public function setAuthStorage($storage)
9393
* If auth storage was not defined outside - returns default object of auth storage
9494
*
9595
* @return \Magento\Backend\Model\Auth\StorageInterface
96+
* @codeCoverageIgnore
9697
*/
9798
public function getAuthStorage()
9899
{
@@ -126,6 +127,7 @@ protected function _initCredentialStorage()
126127
* Return credential storage object
127128
*
128129
* @return null|\Magento\Backend\Model\Auth\Credential\StorageInterface
130+
* @codeCoverageIgnore
129131
*/
130132
public function getCredentialStorage()
131133
{

‎app/code/Magento/Backend/Model/Auth/Session.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ public function processLogout()
253253
* @param string $path
254254
* @return bool
255255
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
256+
* @codeCoverageIgnore
256257
*/
257258
public function isValidForPath($path)
258259
{

‎app/code/Magento/Backend/Model/Search/Order.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,7 @@ public function load()
7676
'id' => 'order/1/' . $order->getId(),
7777
'type' => __('Order'),
7878
'name' => __('Order #%1', $order->getIncrementId()),
79-
'description' => $order->getBillingFirstname() . ' ' . $order->getBillingLastname(),
80-
'form_panel_title' => __(
81-
'Order #%1 (%2)',
82-
$order->getIncrementId(),
83-
$order->getBillingFirstname() . ' ' . $order->getBillingLastname()
84-
),
79+
'description' => $order->getFirstname() . ' ' . $order->getLastname(),
8580
'url' => $this->_adminhtmlData->getUrl('sales/order/view', ['order_id' => $order->getId()]),
8681
];
8782
}

‎app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php

Lines changed: 105 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ class SessionTest extends \PHPUnit_Framework_TestCase
3838
*/
3939
protected $storage;
4040

41+
/**
42+
* @var \Magento\Framework\Acl\Builder | \PHPUnit_Framework_MockObject_MockObject
43+
*/
44+
protected $aclBuilder;
45+
4146
/**
4247
* @var Session
4348
*/
@@ -61,14 +66,23 @@ protected function setUp()
6166
'',
6267
false
6368
);
64-
$this->storage = $this->getMock('Magento\Framework\Session\Storage', ['getUser'], [], '', false);
69+
$this->storage = $this->getMock(
70+
'Magento\Framework\Session\Storage',
71+
['getUser', 'getAcl', 'setAcl'],
72+
[],
73+
'',
74+
false
75+
);
6576
$this->sessionConfig = $this->getMock(
6677
'Magento\Framework\Session\Config',
6778
['getCookiePath', 'getCookieDomain', 'getCookieSecure', 'getCookieHttpOnly'],
6879
[],
6980
'',
7081
false
7182
);
83+
$this->aclBuilder = $this->getMockBuilder('Magento\Framework\Acl\Builder')
84+
->disableOriginalConstructor()
85+
->getMock();
7286
$objectManager = new ObjectManager($this);
7387
$this->session = $objectManager->getObject(
7488
'Magento\Backend\Model\Auth\Session',
@@ -77,7 +91,8 @@ protected function setUp()
7791
'sessionConfig' => $this->sessionConfig,
7892
'cookieManager' => $this->cookieManager,
7993
'cookieMetadataFactory' => $this->cookieMetadataFactory,
80-
'storage' => $this->storage
94+
'storage' => $this->storage,
95+
'aclBuilder' => $this->aclBuilder
8196
]
8297
);
8398
}
@@ -89,6 +104,40 @@ protected function tearDown()
89104
$this->session = null;
90105
}
91106

107+
/**
108+
* @dataProvider refreshAclDataProvider
109+
* @param $isUserPassedViaParams
110+
*/
111+
public function testRefreshAcl($isUserPassedViaParams)
112+
{
113+
$aclMock = $this->getMockBuilder('Magento\Framework\Acl')->disableOriginalConstructor()->getMock();
114+
$this->aclBuilder->expects($this->any())->method('getAcl')->willReturn($aclMock);
115+
$userMock = $this->getMockBuilder('Magento\User\Model\User')
116+
->setMethods(['getReloadAclFlag', 'setReloadAclFlag', 'unsetData', 'save'])
117+
->disableOriginalConstructor()
118+
->getMock();
119+
$userMock->expects($this->any())->method('getReloadAclFlag')->willReturn(true);
120+
$userMock->expects($this->once())->method('setReloadAclFlag')->with('0')->willReturnSelf();
121+
$userMock->expects($this->once())->method('save');
122+
$this->storage->expects($this->once())->method('setAcl')->with($aclMock);
123+
$this->storage->expects($this->any())->method('getAcl')->willReturn($aclMock);
124+
if ($isUserPassedViaParams) {
125+
$this->session->refreshAcl($userMock);
126+
} else {
127+
$this->storage->expects($this->once())->method('getUser')->willReturn($userMock);
128+
$this->session->refreshAcl();
129+
}
130+
$this->assertSame($aclMock, $this->session->getAcl());
131+
}
132+
133+
public function refreshAclDataProvider()
134+
{
135+
return [
136+
'User set via params' => [true],
137+
'User set to session object' => [false]
138+
];
139+
}
140+
92141
public function testIsLoggedInPositive()
93142
{
94143
$lifetime = 900;
@@ -176,4 +225,58 @@ public function testProlong()
176225

177226
$this->assertLessThanOrEqual(time(), $this->session->getUpdatedAt());
178227
}
228+
229+
/**
230+
* @dataProvider isAllowedDataProvider
231+
* @param bool $isUserDefined
232+
* @param bool $isAclDefined
233+
* @param bool $isAllowed
234+
* @param true $expectedResult
235+
*/
236+
public function testIsAllowed($isUserDefined, $isAclDefined, $isAllowed, $expectedResult)
237+
{
238+
$userAclRole = 'userAclRole';
239+
if ($isAclDefined) {
240+
$aclMock = $this->getMockBuilder('Magento\Framework\Acl')->disableOriginalConstructor()->getMock();
241+
$this->storage->expects($this->any())->method('getAcl')->willReturn($aclMock);
242+
}
243+
if ($isUserDefined) {
244+
$userMock = $this->getMockBuilder('Magento\User\Model\User')->disableOriginalConstructor()->getMock();
245+
$this->storage->expects($this->once())->method('getUser')->willReturn($userMock);
246+
}
247+
if ($isAclDefined && $isUserDefined) {
248+
$userMock->expects($this->any())->method('getAclRole')->willReturn($userAclRole);
249+
$aclMock->expects($this->once())->method('isAllowed')->with($userAclRole)->willReturn($isAllowed);
250+
}
251+
252+
$this->assertEquals($expectedResult, $this->session->isAllowed('resource'));
253+
}
254+
255+
public function isAllowedDataProvider()
256+
{
257+
return [
258+
"Negative: User not defined" => [false, true, true, false],
259+
"Negative: Acl not defined" => [true, false, true, false],
260+
"Negative: Permission denied" => [true, true, false, false],
261+
"Positive: Permission granted" => [true, true, false, false],
262+
];
263+
}
264+
265+
/**
266+
* @dataProvider firstPageAfterLoginDataProvider
267+
* @param bool $isFirstPageAfterLogin
268+
*/
269+
public function testFirstPageAfterLogin($isFirstPageAfterLogin)
270+
{
271+
$this->session->setIsFirstPageAfterLogin($isFirstPageAfterLogin);
272+
$this->assertEquals($isFirstPageAfterLogin, $this->session->isFirstPageAfterLogin());
273+
}
274+
275+
public function firstPageAfterLoginDataProvider()
276+
{
277+
return [
278+
'First page after login' => [true],
279+
'Not first page after login' => [false],
280+
];
281+
}
179282
}

‎app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<?php foreach ($items as $_item): ?>
1919

20-
<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
20+
<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
2121
<?php $_showlastRow = true ?>
2222
<?php else: ?>
2323
<?php $_showlastRow = false ?>

‎app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<?php foreach ($items as $_item): ?>
2020

21-
<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
21+
<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
2222
<?php $_showlastRow = true ?>
2323
<?php else: ?>
2424
<?php $_showlastRow = false ?>

‎app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<?php $parentItem = $block->getItem() ?>
1515
<?php $items = array_merge([$parentItem], $parentItem->getChildrenItems()); ?>
1616

17-
<?php if ($block->getItemOptions() || $_item->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $_item) && $_item->getGiftMessageId()): ?>
17+
<?php if ($block->getItemOptions() || $_item->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $_item) && $_item->getGiftMessageId()): ?>
1818
<?php $_showlastRow = true ?>
1919
<?php else: ?>
2020
<?php $_showlastRow = false ?>

‎app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<?php foreach ($items as $_item): ?>
1818

19-
<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
19+
<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
2020
<?php $_showlastRow = true ?>
2121
<?php else: ?>
2222
<?php $_showlastRow = false ?>

‎app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<?php foreach ($items as $_item): ?>
2121

22-
<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
22+
<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
2323
<?php $_showlastRow = true ?>
2424
<?php else: ?>
2525
<?php $_showlastRow = false ?>

‎app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<?php $_prevOptionId = '' ?>
1919
<?php foreach ($items as $_item): ?>
2020

21-
<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->getIsMessagesAvailable('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
21+
<?php if ($block->getItemOptions() || $parentItem->getDescription() || $this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $parentItem) && $parentItem->getGiftMessageId()): ?>
2222
<?php $_showlastRow = true ?>
2323
<?php else: ?>
2424
<?php $_showlastRow = false ?>

0 commit comments

Comments
 (0)