Skip to content

Commit 83b48ec

Browse files
committed
Merge remote-tracking branch 'origin/MAGETWO-54658' into MAGETWO-54658
2 parents dab08ab + 2bc6d34 commit 83b48ec

File tree

3 files changed

+32
-1
lines changed

3 files changed

+32
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected function setUp()
3333
}
3434

3535
/**
36-
* @magentoApiDataFixture Magento/Sales/_files/order.php
36+
* @magentoApiDataFixture Magento/Sales/_files/order_new.php
3737
*/
3838
public function testInvoiceCreate()
3939
{
@@ -54,6 +54,7 @@ public function testInvoiceCreate()
5454
];
5555

5656
$requestData = [
57+
'orderId' => $existingOrder->getId(),
5758
'items' => [],
5859
'comment' => [
5960
'comment' => 'Test Comment',
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
require __DIR__ . '/order.php';
7+
8+
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
9+
10+
/** @var \Magento\Sales\Model\Order $order */
11+
$order = $objectManager->create('Magento\Sales\Model\Order')
12+
->loadByIncrementId('100000001');
13+
14+
$order->setState(
15+
\Magento\Sales\Model\Order::STATE_NEW
16+
);
17+
18+
$order->setStatus(
19+
$order->getConfig()->getStateDefaultStatus(
20+
\Magento\Sales\Model\Order::STATE_NEW
21+
)
22+
);
23+
24+
$order->save();
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
require 'order_rollback.php';

0 commit comments

Comments
 (0)