Skip to content

Commit c0ddaff

Browse files
serhii-balkoserhii-balko
committed
Merge remote-tracking branch 'origin/MC-31544' into 2.4-develop-pr21
2 parents 70e46f4 + 3553368 commit c0ddaff

File tree

6 files changed

+123
-79
lines changed

6 files changed

+123
-79
lines changed

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php

Lines changed: 45 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@
55
*/
66
namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
77

8+
use Magento\Framework\App\Config;
9+
use Magento\Framework\App\Config\ScopeConfigInterface;
10+
use Magento\Framework\Event\Manager;
11+
use Magento\Payment\Helper\Data;
12+
use Magento\Payment\Model\Info;
13+
use Magento\Sales\Model\Order;
14+
use Magento\Sales\Model\Order\Address;
15+
use Magento\Sales\Model\Order\Address\Renderer;
16+
use Magento\Sales\Model\Order\Email\Container\Template;
17+
use Magento\Sales\Model\Order\Email\Sender;
18+
use Magento\Sales\Model\Order\Email\SenderBuilderFactory;
19+
use Magento\Store\Model\Store;
20+
use PHPUnit\Framework\MockObject\Matcher\InvokedCount;
21+
use PHPUnit\Framework\MockObject\MockObject;
22+
use Psr\Log\LoggerInterface;
23+
824
/**
925
* Class AbstractSenderTest
1026
*
@@ -13,87 +29,87 @@
1329
abstract class AbstractSenderTest extends \PHPUnit\Framework\TestCase
1430
{
1531
/**
16-
* @var \Magento\Sales\Model\Order\Email\Sender|\PHPUnit_Framework_MockObject_MockObject
32+
* @var Sender|MockObject
1733
*/
1834
protected $senderMock;
1935

2036
/**
21-
* @var \PHPUnit_Framework_MockObject_MockObject
37+
* @var MockObject
2238
*/
2339
protected $senderBuilderFactoryMock;
2440

2541
/**
26-
* @var \PHPUnit_Framework_MockObject_MockObject
42+
* @var MockObject
2743
*/
2844
protected $templateContainerMock;
2945

3046
/**
31-
* @var \PHPUnit_Framework_MockObject_MockObject
47+
* @var MockObject
3248
*/
3349
protected $identityContainerMock;
3450

3551
/**
36-
* @var \PHPUnit_Framework_MockObject_MockObject
52+
* @var MockObject
3753
*/
3854
protected $storeMock;
3955

4056
/**
41-
* @var \PHPUnit_Framework_MockObject_MockObject
57+
* @var MockObject
4258
*/
4359
protected $orderMock;
4460

4561
/**
46-
* @var \PHPUnit_Framework_MockObject_MockObject
62+
* @var MockObject
4763
*/
4864
protected $paymentHelper;
4965

5066
/**
51-
* @var \Magento\Sales\Model\Order\Address\Renderer|\PHPUnit_Framework_MockObject_MockObject
67+
* @var Renderer|MockObject
5268
*/
5369
protected $addressRenderer;
5470

5571
/**
5672
* Global configuration storage mock.
5773
*
58-
* @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
74+
* @var ScopeConfigInterface|MockObject
5975
*/
6076
protected $globalConfig;
6177

6278
/**
63-
* @var \Magento\Sales\Model\Order\Address|\PHPUnit_Framework_MockObject_MockObject
79+
* @var Address|MockObject
6480
*/
6581
protected $addressMock;
6682

6783
/**
68-
* @var \Magento\Framework\Event\Manager | \PHPUnit_Framework_MockObject_MockObject
84+
* @var Manager|MockObject
6985
*/
7086
protected $eventManagerMock;
7187

7288
/**
73-
* @var \PHPUnit_Framework_MockObject_MockObject
89+
* @var MockObject
7490
*/
7591
protected $loggerMock;
7692

7793
public function stepMockSetup()
7894
{
7995
$this->senderMock = $this->createPartialMock(
80-
\Magento\Sales\Model\Order\Email\Sender::class,
96+
Sender::class,
8197
['send', 'sendCopyTo']
8298
);
8399

84100
$this->senderBuilderFactoryMock = $this->createPartialMock(
85-
\Magento\Sales\Model\Order\Email\SenderBuilderFactory::class,
101+
SenderBuilderFactory::class,
86102
['create']
87103
);
88104
$this->templateContainerMock = $this->createPartialMock(
89-
\Magento\Sales\Model\Order\Email\Container\Template::class,
105+
Template::class,
90106
['setTemplateVars']
91107
);
92108

93-
$this->storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getStoreId', '__wakeup']);
109+
$this->storeMock = $this->createPartialMock(Store::class, ['getStoreId', '__wakeup']);
94110

95111
$this->orderMock = $this->createPartialMock(
96-
\Magento\Sales\Model\Order::class,
112+
Order::class,
97113
[
98114
'getId', 'getStore', 'getBillingAddress', 'getPayment',
99115
'__wakeup', 'getCustomerIsGuest', 'getCustomerName',
@@ -105,23 +121,23 @@ public function stepMockSetup()
105121
$this->orderMock->expects($this->any())
106122
->method('getStore')
107123
->will($this->returnValue($this->storeMock));
108-
$paymentInfoMock = $this->createMock(\Magento\Payment\Model\Info::class);
124+
$paymentInfoMock = $this->createMock(Info::class);
109125
$this->orderMock->expects($this->any())
110126
->method('getPayment')
111127
->will($this->returnValue($paymentInfoMock));
112128

113-
$this->addressRenderer = $this->createMock(\Magento\Sales\Model\Order\Address\Renderer::class);
114-
$this->addressMock = $this->createMock(\Magento\Sales\Model\Order\Address::class);
115-
$this->eventManagerMock = $this->createMock(\Magento\Framework\Event\Manager::class);
129+
$this->addressRenderer = $this->createMock(Renderer::class);
130+
$this->addressMock = $this->createMock(Address::class);
131+
$this->eventManagerMock = $this->createMock(Manager::class);
116132

117-
$this->paymentHelper = $this->createPartialMock(\Magento\Payment\Helper\Data::class, ['getInfoBlockHtml']);
133+
$this->paymentHelper = $this->createPartialMock(Data::class, ['getInfoBlockHtml']);
118134
$this->paymentHelper->expects($this->any())
119135
->method('getInfoBlockHtml')
120136
->will($this->returnValue('payment'));
121137

122-
$this->globalConfig = $this->createPartialMock(\Magento\Framework\App\Config::class, ['getValue']);
138+
$this->globalConfig = $this->createPartialMock(Config::class, ['getValue']);
123139

124-
$this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
140+
$this->loggerMock = $this->createMock(LoggerInterface::class);
125141
}
126142

127143
/**
@@ -168,14 +184,14 @@ public function stepIdentityContainerInit($identityMockClassName)
168184
}
169185

170186
/**
171-
* @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendExpects
172-
* @param \PHPUnit_Framework_MockObject_Matcher_InvokedCount $sendCopyToExpects
187+
* @param InvokedCount $sendExpects
188+
* @param InvokedCount $sendCopyToExpects
173189
*/
174190
protected function stepSend(
175-
\PHPUnit\Framework\MockObject\Matcher\InvokedCount $sendExpects,
176-
\PHPUnit\Framework\MockObject\Matcher\InvokedCount $sendCopyToExpects
191+
InvokedCount $sendExpects,
192+
InvokedCount $sendCopyToExpects
177193
) {
178-
$senderMock = $this->createPartialMock(\Magento\Sales\Model\Order\Email\Sender::class, ['send', 'sendCopyTo']);
194+
$senderMock = $this->createPartialMock(Sender::class, ['send', 'sendCopyTo']);
179195
$senderMock->expects($sendExpects)
180196
->method('send');
181197
$senderMock->expects($sendCopyToExpects)

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoSenderTest.php

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@
55
*/
66
namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
77

8+
use Magento\Sales\Api\Data\OrderInterface;
9+
use Magento\Sales\Model\Order\Address;
10+
use Magento\Sales\Model\Order\Creditmemo;
11+
use Magento\Sales\Model\ResourceModel\Order\Creditmemo as CreditmemoResource;
12+
use Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity;
813
use Magento\Sales\Model\Order\Email\Sender\CreditmemoSender;
14+
use Magento\Sales\Model\ResourceModel\EntityAbstract;
15+
use PHPUnit\Framework\MockObject\MockObject;
916

1017
/**
1118
* Test for Magento\Sales\Model\Order\Email\Sender\CreditmemoSender class.
@@ -17,17 +24,17 @@ class CreditmemoSenderTest extends AbstractSenderTest
1724
private const ORDER_ID = 1;
1825

1926
/**
20-
* @var \Magento\Sales\Model\Order\Email\Sender\CreditmemoSender
27+
* @var CreditmemoSender
2128
*/
2229
protected $sender;
2330

2431
/**
25-
* @var \Magento\Sales\Model\Order\Creditmemo|\PHPUnit_Framework_MockObject_MockObject
32+
* @var Creditmemo|MockObject
2633
*/
2734
protected $creditmemoMock;
2835

2936
/**
30-
* @var \Magento\Sales\Model\ResourceModel\EntityAbstract|\PHPUnit_Framework_MockObject_MockObject
37+
* @var EntityAbstract|MockObject
3138
*/
3239
protected $creditmemoResourceMock;
3340

@@ -36,12 +43,12 @@ protected function setUp()
3643
$this->stepMockSetup();
3744

3845
$this->creditmemoResourceMock = $this->createPartialMock(
39-
\Magento\Sales\Model\ResourceModel\Order\Creditmemo::class,
46+
CreditmemoResource::class,
4047
['saveAttribute']
4148
);
4249

4350
$this->creditmemoMock = $this->createPartialMock(
44-
\Magento\Sales\Model\Order\Creditmemo::class,
51+
Creditmemo::class,
4552
[
4653
'getStore',
4754
'getId',
@@ -65,7 +72,7 @@ protected function setUp()
6572
->willReturn(self::ORDER_ID);
6673

6774
$this->identityContainerMock = $this->createPartialMock(
68-
\Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity::class,
75+
CreditmemoIdentity::class,
6976
['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId', 'getCopyMethod']
7077
);
7178
$this->identityContainerMock->expects($this->any())
@@ -113,7 +120,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
113120
->willReturn($configValue);
114121

115122
if (!$configValue || $forceSyncMode) {
116-
$addressMock = $this->createMock(\Magento\Sales\Model\Order\Address::class);
123+
$addressMock = $this->createMock(Address::class);
117124

118125
$this->addressRenderer->expects($this->exactly(2))
119126
->method('format')
@@ -251,7 +258,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
251258
$frontendStatusLabel = 'Complete';
252259
$isNotVirtual = false;
253260

254-
$this->orderMock->setData(\Magento\Sales\Api\Data\OrderInterface::IS_VIRTUAL, $isVirtualOrder);
261+
$this->orderMock->setData(OrderInterface::IS_VIRTUAL, $isVirtualOrder);
255262

256263
$this->orderMock->expects($this->any())
257264
->method('getCustomerName')
@@ -278,7 +285,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
278285
->with('sales_email/general/async_sending')
279286
->willReturn(false);
280287

281-
$addressMock = $this->createMock(\Magento\Sales\Model\Order\Address::class);
288+
$addressMock = $this->createMock(Address::class);
282289

283290
$this->addressRenderer->expects($this->exactly($formatCallCount))
284291
->method('format')

‎app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceSenderTest.php

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@
55
*/
66
namespace Magento\Sales\Test\Unit\Model\Order\Email\Sender;
77

8+
use Magento\Sales\Api\Data\OrderInterface;
9+
use Magento\Sales\Model\Order\Address;
10+
use Magento\Sales\Model\Order\Email\Container\InvoiceIdentity;
811
use Magento\Sales\Model\Order\Email\Sender\InvoiceSender;
12+
use Magento\Sales\Model\Order\Invoice;
13+
use Magento\Sales\Model\ResourceModel\Order\Invoice as InvoiceResource;
14+
use Magento\Sales\Model\ResourceModel\EntityAbstract;
15+
use PHPUnit\Framework\MockObject\MockObject;
916

1017
/**
1118
* Test for Magento\Sales\Model\Order\Email\Sender\InvoiceSender class.
@@ -17,17 +24,17 @@ class InvoiceSenderTest extends AbstractSenderTest
1724
private const ORDER_ID = 1;
1825

1926
/**
20-
* @var \Magento\Sales\Model\Order\Email\Sender\InvoiceSender
27+
* @var InvoiceSender
2128
*/
2229
protected $sender;
2330

2431
/**
25-
* @var \Magento\Sales\Model\Order\Invoice|\PHPUnit_Framework_MockObject_MockObject
32+
* @var Invoice|MockObject
2633
*/
2734
protected $invoiceMock;
2835

2936
/**
30-
* @var \Magento\Sales\Model\ResourceModel\EntityAbstract|\PHPUnit_Framework_MockObject_MockObject
37+
* @var EntityAbstract|MockObject
3138
*/
3239
protected $invoiceResourceMock;
3340

@@ -36,12 +43,12 @@ protected function setUp()
3643
$this->stepMockSetup();
3744

3845
$this->invoiceResourceMock = $this->createPartialMock(
39-
\Magento\Sales\Model\ResourceModel\Order\Invoice::class,
46+
InvoiceResource::class,
4047
['saveAttribute']
4148
);
4249

4350
$this->invoiceMock = $this->createPartialMock(
44-
\Magento\Sales\Model\Order\Invoice::class,
51+
Invoice::class,
4552
[
4653
'getStore',
4754
'getId',
@@ -66,7 +73,7 @@ protected function setUp()
6673
->willReturn(self::ORDER_ID);
6774

6875
$this->identityContainerMock = $this->createPartialMock(
69-
\Magento\Sales\Model\Order\Email\Container\InvoiceIdentity::class,
76+
InvoiceIdentity::class,
7077
['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId', 'getCopyMethod']
7178
);
7279
$this->identityContainerMock->expects($this->any())
@@ -114,7 +121,7 @@ public function testSend($configValue, $forceSyncMode, $customerNoteNotify, $ema
114121
->willReturn($configValue);
115122

116123
if (!$configValue || $forceSyncMode) {
117-
$addressMock = $this->createMock(\Magento\Sales\Model\Order\Address::class);
124+
$addressMock = $this->createMock(Address::class);
118125

119126
$this->addressRenderer->expects($this->any())
120127
->method('format')
@@ -252,7 +259,7 @@ public function sendDataProvider()
252259
public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expectedShippingAddress)
253260
{
254261
$billingAddress = 'address_test';
255-
$this->orderMock->setData(\Magento\Sales\Api\Data\OrderInterface::IS_VIRTUAL, $isVirtualOrder);
262+
$this->orderMock->setData(OrderInterface::IS_VIRTUAL, $isVirtualOrder);
256263
$customerName = 'Test Customer';
257264
$frontendStatusLabel = 'Complete';
258265
$isNotVirtual = false;
@@ -266,7 +273,7 @@ public function testSendVirtualOrder($isVirtualOrder, $formatCallCount, $expecte
266273
->with('sales_email/general/async_sending')
267274
->willReturn(false);
268275

269-
$addressMock = $this->createMock(\Magento\Sales\Model\Order\Address::class);
276+
$addressMock = $this->createMock(Address::class);
270277

271278
$this->addressRenderer->expects($this->exactly($formatCallCount))
272279
->method('format')

0 commit comments

Comments
 (0)