Skip to content

Commit 3526587

Browse files
DooffyDooffy
committed
Merge remote-tracking branch 'origin/MAGETWO-34166' into MAGETWO-35150-PR
2 parents 64ba417 + c6529c4 commit 3526587

File tree

2 files changed

+155
-7
lines changed

2 files changed

+155
-7
lines changed

‎app/code/Magento/Sales/Controller/Guest/View.php

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,54 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Sales\Controller\Guest;
87

98
use Magento\Framework\App\Action;
9+
use Magento\Sales\Helper\Guest as GuestHelper;
10+
use Magento\Framework\View\Result\PageFactory;
11+
use Magento\Framework\Controller\ResultInterface;
1012

11-
class View extends \Magento\Sales\Controller\AbstractController\View
13+
class View extends Action\Action
1214
{
1315
/**
14-
* {@inheritdoc}
16+
* @var \Magento\Sales\Helper\Guest
17+
*/
18+
protected $guestHelper;
19+
20+
/**
21+
* @var \Magento\Framework\View\Result\PageFactory
22+
*/
23+
protected $resultPageFactory;
24+
25+
/**
26+
* @param \Magento\Framework\App\Action\Context $context
27+
* @param \Magento\Sales\Helper\Guest $guestHelper
28+
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
29+
*/
30+
public function __construct(
31+
Action\Context $context,
32+
GuestHelper $guestHelper,
33+
PageFactory $resultPageFactory
34+
) {
35+
$this->guestHelper = $guestHelper;
36+
$this->resultPageFactory = $resultPageFactory;
37+
parent::__construct($context);
38+
}
39+
40+
/**
41+
* @return \Magento\Framework\Controller\ResultInterface
1542
*/
1643
public function execute()
1744
{
18-
$result = $this->orderLoader->load($this->_request);
19-
if ($result instanceof \Magento\Framework\Controller\ResultInterface) {
45+
$result = $this->guestHelper->loadValidOrder($this->getRequest());
46+
if ($result instanceof ResultInterface) {
2047
return $result;
2148
}
22-
49+
/** @var \Magento\Framework\View\Result\Page $resultPage */
2350
$resultPage = $this->resultPageFactory->create();
24-
$this->_objectManager->get('Magento\Sales\Helper\Guest')->getBreadcrumbs($resultPage);
51+
$this->guestHelper->getBreadcrumbs($resultPage);
2552
return $resultPage;
2653
}
2754
}

‎app/code/Magento/Sales/Test/Unit/Controller/Guest/ViewTest.php

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Sales\Controller\Guest;
7+
8+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
9+
10+
class ViewTest extends \PHPUnit_Framework_TestCase
11+
{
12+
/**
13+
* @var \Magento\Sales\Controller\Guest\View
14+
*/
15+
protected $viewController;
16+
17+
/**
18+
* @var \Magento\TestFramework\Helper\ObjectManager
19+
*/
20+
protected $objectManagerHelper;
21+
22+
/**
23+
* @var \Magento\Framework\App\Action\Context
24+
*/
25+
protected $context;
26+
27+
/**
28+
* @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
29+
*/
30+
protected $requestMock;
31+
32+
/**
33+
* @var \Magento\Sales\Helper\Guest|\PHPUnit_Framework_MockObject_MockObject
34+
*/
35+
protected $guestHelperMock;
36+
37+
/**
38+
* @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
39+
*/
40+
protected $resultRedirectMock;
41+
42+
/**
43+
* @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject
44+
*/
45+
protected $resultPageFactoryMock;
46+
47+
/**
48+
* @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
49+
*/
50+
protected $resultPageMock;
51+
52+
/**
53+
* @return void
54+
*/
55+
protected function setUp()
56+
{
57+
$this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
58+
->getMock();
59+
$this->guestHelperMock = $this->getMockBuilder('Magento\Sales\Helper\Guest')
60+
->disableOriginalConstructor()
61+
->getMock();
62+
$this->resultRedirectMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Redirect')
63+
->disableOriginalConstructor()
64+
->getMock();
65+
$this->resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
66+
->disableOriginalConstructor()
67+
->setMethods(['create'])
68+
->getMock();
69+
$this->resultPageMock = $this->getMockBuilder('Magento\Framework\View\Result\Page')
70+
->disableOriginalConstructor()
71+
->getMock();
72+
73+
$this->objectManagerHelper = new ObjectManagerHelper($this);
74+
$this->context = $this->objectManagerHelper->getObject(
75+
'Magento\Framework\App\Action\Context',
76+
[
77+
'request' => $this->requestMock
78+
]
79+
);
80+
$this->viewController = $this->objectManagerHelper->getObject(
81+
'Magento\Sales\Controller\Guest\View',
82+
[
83+
'context' => $this->context,
84+
'guestHelper' => $this->guestHelperMock,
85+
'resultPageFactory' => $this->resultPageFactoryMock
86+
]
87+
);
88+
}
89+
90+
/**
91+
* @return void
92+
*/
93+
public function testExecuteOrderLoaded()
94+
{
95+
$this->guestHelperMock->expects($this->once())
96+
->method('loadValidOrder')
97+
->with($this->requestMock)
98+
->willReturn(true);
99+
$this->resultPageFactoryMock->expects($this->once())
100+
->method('create')
101+
->willReturn($this->resultPageMock);
102+
$this->guestHelperMock->expects($this->once())
103+
->method('getBreadcrumbs')
104+
->with($this->resultPageMock);
105+
106+
$this->assertSame($this->resultPageMock, $this->viewController->execute());
107+
}
108+
109+
/**
110+
* @return void
111+
*/
112+
public function testExecuteOrderNotFound()
113+
{
114+
$this->guestHelperMock->expects($this->once())
115+
->method('loadValidOrder')
116+
->with($this->requestMock)
117+
->willReturn($this->resultRedirectMock);
118+
119+
$this->assertSame($this->resultRedirectMock, $this->viewController->execute());
120+
}
121+
}

0 commit comments

Comments
 (0)