Skip to content

Commit 9112b4c

Browse files
author
Olga Nakonechna
committed
MAGETWO-61268: [Backport] - Creditmemo return to stock only one unit of configurable product - for 2.0.11
1 parent b385d40 commit 9112b4c

File tree

1 file changed

+10
-39
lines changed

1 file changed

+10
-39
lines changed

app/code/Magento/SalesInventory/Test/Unit/Observer/RefundOrderInventoryObserverTest.php

Lines changed: 10 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
use Magento\SalesInventory\Model\Order\ReturnProcessor;
1111
use Magento\SalesInventory\Observer\RefundOrderInventoryObserver;
1212

13+
/**
14+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15+
*/
1316
class RefundOrderInventoryObserverTest extends \PHPUnit_Framework_TestCase
1417
{
1518
/**
@@ -70,23 +73,23 @@ class RefundOrderInventoryObserverTest extends \PHPUnit_Framework_TestCase
7073
protected function setUp()
7174
{
7275
$this->stockIndexerProcessor = $this->getMock(
73-
'Magento\CatalogInventory\Model\Indexer\Stock\Processor',
76+
\Magento\CatalogInventory\Model\Indexer\Stock\Processor::class,
7477
['reindexList'],
7578
[],
7679
'',
7780
false
7881
);
7982

8083
$this->stockManagement = $this->getMock(
81-
'Magento\CatalogInventory\Model\StockManagement',
84+
\Magento\CatalogInventory\Model\StockManagement::class,
8285
[],
8386
[],
8487
'',
8588
false
8689
);
8790

8891
$this->stockConfiguration = $this->getMockForAbstractClass(
89-
'Magento\CatalogInventory\Api\StockConfigurationInterface',
92+
\Magento\CatalogInventory\Api\StockConfigurationInterface::class,
9093
[
9194
'isAutoReturnEnabled',
9295
'isDisplayProductStockStatus'
@@ -95,16 +98,16 @@ protected function setUp()
9598
false
9699
);
97100

98-
$this->priceIndexer = $this->getMockBuilder('Magento\Catalog\Model\Indexer\Product\Price\Processor')
101+
$this->priceIndexer = $this->getMockBuilder(\Magento\Catalog\Model\Indexer\Product\Price\Processor::class)
99102
->disableOriginalConstructor()
100103
->getMock();
101104

102-
$this->event = $this->getMockBuilder('Magento\Framework\Event')
105+
$this->event = $this->getMockBuilder(\Magento\Framework\Event::class)
103106
->disableOriginalConstructor()
104107
->setMethods(['getProduct', 'getCollection', 'getCreditmemo', 'getQuote', 'getWebsite'])
105108
->getMock();
106109

107-
$this->eventObserver = $this->getMockBuilder('Magento\Framework\Event\Observer')
110+
$this->eventObserver = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
108111
->disableOriginalConstructor()
109112
->setMethods(['getEvent'])
110113
->getMock();
@@ -113,10 +116,6 @@ protected function setUp()
113116
->method('getEvent')
114117
->will($this->returnValue($this->event));
115118

116-
<<<<<<< HEAD
117-
$this->observer = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))->getObject(
118-
'Magento\CatalogInventory\Observer\RefundOrderInventoryObserver',
119-
=======
120119
$this->orderRepositoryMock = $this->getMockBuilder(OrderRepository::class)
121120
->disableOriginalConstructor()
122121
->getMock();
@@ -133,7 +132,6 @@ protected function setUp()
133132

134133
$this->observer = $this->objectManagerHelper->getObject(
135134
\Magento\SalesInventory\Observer\RefundOrderInventoryObserver::class,
136-
>>>>>>> e0d9191... MAGETWO-59074: Creditmemo return to stock only one unit of configurable product
137135
[
138136
'stockConfiguration' => $this->stockConfiguration,
139137
'stockManagement' => $this->stockManagement,
@@ -160,28 +158,13 @@ public function testRefundOrderInventory()
160158
$items = [];
161159
$isAutoReturnEnabled = true;
162160

163-
<<<<<<< HEAD
164-
$store = $this->getMock(
165-
'Magento\Store\Model\Store',
166-
['getWebsiteId'],
167-
[],
168-
'',
169-
false
170-
);
171-
$store->expects($this->once())->method('getWebsiteId')->will($this->returnValue($websiteId));
172-
=======
173161
$creditMemo = $this->getMock(\Magento\Sales\Model\Order\Creditmemo::class, [], [], '', false);
174-
>>>>>>> e0d9191... MAGETWO-59074: Creditmemo return to stock only one unit of configurable product
175162

176163
foreach ($ids as $id) {
177164
$item = $this->getCreditMemoItem($id);
178165
$items[] = $item;
179166
}
180-
<<<<<<< HEAD
181-
$creditMemo = $this->getMock('Magento\Sales\Model\Order\Creditmemo', [], [], '', false);
182-
=======
183167

184-
>>>>>>> e0d9191... MAGETWO-59074: Creditmemo return to stock only one unit of configurable product
185168
$creditMemo->expects($this->once())
186169
->method('getItems')
187170
->will($this->returnValue($items));
@@ -209,26 +192,14 @@ private function getCreditMemoItem($productId)
209192
{
210193
$backToStock = true;
211194
$item = $this->getMock(
212-
<<<<<<< HEAD
213-
'Magento\Sales\Model\Order\Creditmemo\Item',
214-
['getProductId', 'getOrderItem', 'getBackToStock', 'getQty', '__wakeup'],
215-
=======
216195
\Magento\Sales\Model\Order\Creditmemo\Item::class,
217196
['getOrderItemId', 'getBackToStock', 'getQty', '__wakeup'],
218-
>>>>>>> e0d9191... MAGETWO-59074: Creditmemo return to stock only one unit of configurable product
219197
[],
220198
'',
221199
false
222200
);
223-
<<<<<<< HEAD
224-
$orderItem = $this->getMock('Magento\Sales\Model\Order\Item', ['getParentItemId', '__wakeup'], [], '', false);
225-
$orderItem->expects($this->any())->method('getParentItemId')->willReturn($parentItemId);
226-
$item->expects($this->any())->method('getOrderItem')->willReturn($orderItem);
227-
$item->expects($this->any())->method('getProductId')->will($this->returnValue($productId));
228-
=======
229-
>>>>>>> e0d9191... MAGETWO-59074: Creditmemo return to stock only one unit of configurable product
230201
$item->expects($this->any())->method('getBackToStock')->willReturn($backToStock);
231202
$item->expects($this->any())->method('getOrderItemId')->willReturn($productId);
232203
return $item;
233204
}
234-
}
205+
}

0 commit comments

Comments
 (0)