Skip to content

Commit 8bdcec2

Browse files
MAGETWO-96262: Order with simple product after partial cancellation and credit memo has status 'Processing'
1 parent 54139e3 commit 8bdcec2

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderCancelMassActionPartialFailMessage.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,10 @@
1515
*/
1616
class AssertOrderCancelMassActionPartialFailMessage extends AbstractConstraint
1717
{
18-
/**
19-
* Message displayed after cancel order from archive
20-
*/
21-
const SUCCESS_MESSAGE = 'We canceled 1 order(s).';
22-
2318
/**
2419
* Text value to be checked
2520
*/
26-
const FAIL_CANCEL_MESSAGE = '1 order(s) cannot be canceled.';
21+
const FAIL_CANCEL_MESSAGE = 'You cannot cancel the order(s).';
2722

2823
/**
2924
* Assert cancel fail message is displayed on order index page
@@ -37,10 +32,6 @@ public function processAssert(OrderIndex $orderIndex)
3732
self::FAIL_CANCEL_MESSAGE,
3833
$orderIndex->getMessagesBlock()->getErrorMessage()
3934
);
40-
\PHPUnit\Framework\Assert::assertEquals(
41-
self::SUCCESS_MESSAGE,
42-
$orderIndex->getMessagesBlock()->getSuccessMessage()
43-
);
4435
}
4536

4637
/**
@@ -50,6 +41,6 @@ public function processAssert(OrderIndex $orderIndex)
5041
*/
5142
public function toString()
5243
{
53-
return 'Cancel and success fail message is displayed on order index page.';
44+
return 'Cancel fail message is displayed on order index page.';
5445
}
5546
}

dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/MassOrdersUpdateTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
1919
</variation>
2020
<variation name="MassOrdersUpdateTestVariation2">
21-
<data name="description" xsi:type="string">try to cancel orders in status Complete, Canceled</data>
21+
<data name="description" xsi:type="string">try to cancel orders in status Complete, Closed</data>
2222
<data name="steps" xsi:type="string">invoice, shipment|invoice, credit memo</data>
2323
<data name="action" xsi:type="string">Cancel</data>
2424
<data name="ordersCount" xsi:type="string">2</data>
@@ -31,7 +31,7 @@
3131
<data name="steps" xsi:type="string">invoice|invoice, credit memo</data>
3232
<data name="action" xsi:type="string">Cancel</data>
3333
<data name="ordersCount" xsi:type="string">2</data>
34-
<data name="resultStatuses" xsi:type="string">Processing,Canceled</data>
34+
<data name="resultStatuses" xsi:type="string">Processing,Closed</data>
3535
<constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionPartialFailMessage" />
3636
<constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
3737
</variation>

0 commit comments

Comments
 (0)