Skip to content

Commit 2b9f8be

Browse files
committed
MAGETWO-60054: Revert major changes in PaymentAdapter
fix tests
1 parent 6f72690 commit 2b9f8be

File tree

2 files changed

+73
-18
lines changed

2 files changed

+73
-18
lines changed

app/code/Magento/Sales/Test/Unit/Model/Order/PaymentAdapterTest.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ protected function setUp()
5050
->disableOriginalConstructor()
5151
->getMockForAbstractClass();
5252

53-
$this->refundOperationMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Creditmemo\RefundOperation::class)
54-
->disableOriginalConstructor()
55-
->getMock();
56-
5753
$this->invoiceMock = $this->getMockBuilder(\Magento\Sales\Api\Data\InvoiceInterface::class)
5854
->disableOriginalConstructor()
5955
->getMockForAbstractClass();
@@ -63,24 +59,10 @@ protected function setUp()
6359
->getMock();
6460

6561
$this->subject = new \Magento\Sales\Model\Order\PaymentAdapter(
66-
$this->refundOperationMock,
6762
$this->payOperationMock
6863
);
6964
}
7065

71-
public function testRefund()
72-
{
73-
$isOnline = true;
74-
$this->refundOperationMock->expects($this->once())
75-
->method('execute')
76-
->with($this->creditmemoMock, $this->orderMock, $isOnline)
77-
->willReturn($this->orderMock);
78-
$this->assertEquals(
79-
$this->orderMock,
80-
$this->subject->refund($this->creditmemoMock, $this->orderMock, $isOnline)
81-
);
82-
}
83-
8466
public function testPay()
8567
{
8668
$isOnline = true;
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?php
2+
/**
3+
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Sales\Test\Unit\Model\Order;
7+
8+
/**
9+
* Unit test for refund adapter.
10+
*/
11+
class RefundAdapterTest extends \PHPUnit_Framework_TestCase
12+
{
13+
/**
14+
* @var \Magento\Sales\Model\Order\RefundAdapter
15+
*/
16+
private $subject;
17+
18+
/**
19+
* @var \Magento\Sales\Api\Data\OrderInterface|\PHPUnit_Framework_MockObject_MockObject
20+
*/
21+
private $orderMock;
22+
23+
/**
24+
* @var \Magento\Sales\Api\Data\CreditmemoInterface|\PHPUnit_Framework_MockObject_MockObject
25+
*/
26+
private $creditmemoMock;
27+
28+
/**
29+
* @var \Magento\Sales\Model\Order\Creditmemo\RefundOperation|\PHPUnit_Framework_MockObject_MockObject
30+
*/
31+
private $refundOperationMock;
32+
33+
/**
34+
* @var \Magento\Sales\Api\Data\InvoiceInterface|\PHPUnit_Framework_MockObject_MockObject
35+
*/
36+
private $invoiceMock;
37+
38+
protected function setUp()
39+
{
40+
$this->orderMock = $this->getMockBuilder(\Magento\Sales\Api\Data\OrderInterface::class)
41+
->disableOriginalConstructor()
42+
->getMockForAbstractClass();
43+
44+
$this->creditmemoMock = $this->getMockBuilder(\Magento\Sales\Api\Data\CreditmemoInterface::class)
45+
->disableOriginalConstructor()
46+
->getMockForAbstractClass();
47+
48+
$this->refundOperationMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Creditmemo\RefundOperation::class)
49+
->disableOriginalConstructor()
50+
->getMock();
51+
52+
$this->invoiceMock = $this->getMockBuilder(\Magento\Sales\Api\Data\InvoiceInterface::class)
53+
->disableOriginalConstructor()
54+
->getMockForAbstractClass();
55+
56+
$this->subject = new \Magento\Sales\Model\Order\RefundAdapter(
57+
$this->refundOperationMock
58+
);
59+
}
60+
61+
public function testRefund()
62+
{
63+
$isOnline = true;
64+
$this->refundOperationMock->expects($this->once())
65+
->method('execute')
66+
->with($this->creditmemoMock, $this->orderMock, $isOnline)
67+
->willReturn($this->orderMock);
68+
$this->assertEquals(
69+
$this->orderMock,
70+
$this->subject->refund($this->creditmemoMock, $this->orderMock, $isOnline)
71+
);
72+
}
73+
}

0 commit comments

Comments
 (0)