Skip to content

Commit 460ac95

Browse files
committed
MAGETWO-52746: Pull request preparation
1 parent 6dc7216 commit 460ac95

File tree

2 files changed

+38
-12
lines changed

2 files changed

+38
-12
lines changed

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Processor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ class Processor extends AbstractProcessor
1616
/**
1717
* Indexer ID
1818
*/
19-
const INDEXER_ID = Fulltext::INDEXER_ID;
19+
const INDEXER_ID = Fulltext::INDEXER_ID;
2020
}

dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditMemoCreateRefundTest.php

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,12 @@ public function testInvoke()
3838
/** @var \Magento\Sales\Model\Order $order */
3939
$orderCollection = $this->objectManager->get('Magento\Sales\Model\ResourceModel\Order\Collection');
4040
$order = $orderCollection->getFirstItem();
41-
$items = [
41+
$items = [];
4242

43-
];
44-
/** @var \Magento\Sales\Model\Order\Item $orderItem */
45-
foreach ($order->getAllItems() as $orderItem) {
46-
$items[] = array_merge($orderItem->getData(), [
47-
'order_item_id' => $orderItem->getId(),
48-
'qty' => $orderItem->getQtyInvoiced(),
49-
'price' => $orderItem->getPrice(),
50-
'row_total' => $orderItem->getRowTotal(),
51-
'entity_id' => null,
52-
]);
43+
if (TESTS_WEB_API_ADAPTER == self::ADAPTER_REST) {
44+
$items = $this->getItemsForRest($order);
45+
} else {
46+
$items = $this->getItemsForSoap($order);
5347
}
5448

5549
$serviceInfo = [
@@ -123,4 +117,36 @@ public function testInvoke()
123117
$order = $this->objectManager->get(OrderRepositoryInterface::class)->get($order->getId());
124118
$this->assertEquals(Order::STATE_CLOSED, $order->getState());
125119
}
120+
121+
private function getItemsForRest($order)
122+
{
123+
$items = [];
124+
/** @var \Magento\Sales\Model\Order\Item $orderItem */
125+
foreach ($order->getAllItems() as $orderItem) {
126+
$items[] = [
127+
'order_item_id' => $orderItem->getId(),
128+
'qty' => $orderItem->getQtyInvoiced(),
129+
'price' => $orderItem->getPrice(),
130+
'row_total' => $orderItem->getRowTotal(),
131+
'entity_id' => null,
132+
];
133+
}
134+
return $items;
135+
}
136+
137+
private function getItemsForSoap($order)
138+
{
139+
$items = [];
140+
/** @var \Magento\Sales\Model\Order\Item $orderItem */
141+
foreach ($order->getAllItems() as $orderItem) {
142+
$items[] = array_merge($orderItem->getData(), [
143+
'order_item_id' => $orderItem->getId(),
144+
'qty' => $orderItem->getQtyInvoiced(),
145+
'price' => $orderItem->getPrice(),
146+
'row_total' => $orderItem->getRowTotal(),
147+
'entity_id' => null,
148+
]);
149+
}
150+
return $items;
151+
}
126152
}

0 commit comments

Comments
 (0)