MAGETWO-60034: Cannot ship remaining items in an order for several of one product if credit memo is made for some

- fix functional tests

Author: cpartica

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

@@ -10,15 +10,20 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertOrderCancelMassActionFailMessage
+ * Class AssertOrderCancelAndSuccessMassActionFailMessage
  * Assert cancel fail message is displayed on order index page
  */
-class AssertOrderCancelMassActionFailMessage extends AbstractConstraint
+class AssertOrderCancelMassActionPartialFailMessage extends AbstractConstraint
 {
+    /**
+     * Message displayed after cancel order from archive
+     */
+    const SUCCESS_MESSAGE = 'We canceled 1 order(s).';
+
     /**
      * Text value to be checked
      */
-    const FAIL_CANCEL_MESSAGE = 'You cannot cancel the order(s).';
+    const FAIL_CANCEL_MESSAGE = '1 order(s) cannot be canceled.';
 
     /**
      * Assert cancel fail message is displayed on order index page
@@ -32,6 +37,10 @@ public function processAssert(OrderIndex $orderIndex)
             self::FAIL_CANCEL_MESSAGE,
             $orderIndex->getMessagesBlock()->getErrorMessage()
         );
+        \PHPUnit\Framework\Assert::assertEquals(
+            self::SUCCESS_MESSAGE,
+            $orderIndex->getMessagesBlock()->getSuccessMessage()
+        );
     }
 
     /**
@@ -41,6 +50,6 @@ public function processAssert(OrderIndex $orderIndex)
      */
     public function toString()
     {
-        return 'Cancel fail message is displayed on order index page.';
+        return 'Cancel and success fail message is displayed on order index page.';
     }
 }

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

@@ -18,21 +18,21 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation2">
-            <data name="description" xsi:type="string">try to cancel orders in status Complete, Closed</data>
+            <data name="description" xsi:type="string">try to cancel orders in status Complete, Canceled</data>
             <data name="steps" xsi:type="string">invoice, shipment|invoice, credit memo</data>
             <data name="action" xsi:type="string">Cancel</data>
             <data name="ordersCount" xsi:type="string">2</data>
-            <data name="resultStatuses" xsi:type="string">Complete,Processing</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionFailMessage" />
+            <data name="resultStatuses" xsi:type="string">Complete,Canceled</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionPartialFailMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation3">
             <data name="description" xsi:type="string">try to cancel orders in status Pending, Closed</data>
             <data name="steps" xsi:type="string">invoice|invoice, credit memo</data>
             <data name="action" xsi:type="string">Cancel</data>
             <data name="ordersCount" xsi:type="string">2</data>
-            <data name="resultStatuses" xsi:type="string">Processing,Closed</data>
-            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionFailMessage" />
+            <data name="resultStatuses" xsi:type="string">Processing,Canceled</data>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderCancelMassActionPartialFailMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation4">
@@ -55,7 +55,7 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrdersInOrdersGrid" />
         </variation>
         <variation name="MassOrdersUpdateTestVariation6">
-            <data name="description" xsi:type="string">Release order in statuse On Hold</data>
+            <data name="description" xsi:type="string">Release order in status On Hold</data>
             <data name="steps" xsi:type="string">on hold</data>
             <data name="action" xsi:type="string">Unhold</data>
             <data name="ordersCount" xsi:type="string">1</data>