MAGETWO-82385: [CE 2.1.0 rc3] - Cancel an order [configurable product] #5313

Author: viktorpetryk

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml

@@ -98,27 +98,26 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
 
         <!--Open order-->
-        <actionGroup ref="filterOrderGridById" stepKey="filterOrderGridById">
+        <actionGroup ref="openOrderById" stepKey="openOrderById">
             <argument name="orderId" value="{$grabOrderNumber}"/>
         </actionGroup>
-        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="openOrderViewPage"/>
-        <waitForPageLoad stepKey="waitForOrderViewPageOpen"/>
 
-        <!--Create Invoice-->
+        <!--Start create invoice-->
         <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
-        <fillField selector="{{AdminInvoiceItemsSection.itemQtyToInvoice('1')}}" userInput="1" stepKey="changeQtyToInvoice"/>
-        <waitForElementVisible selector="{{AdminInvoiceItemsSection.updateQtyEnabled}}" stepKey="waitForUpdateQtyEnabled"/>
-        <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQty"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForQtyToUpdate"/>
-        <waitForElementVisible selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="waitForSubmitInvoiceButton"/>
+        <!--Create partial invoice-->
+        <actionGroup ref="CreatePartialInvoice" stepKey="createPartialInvoice">
+            <argument name="rowNumber" value="1"/>
+            <argument name="qtyToInvoice" value="1"/>
+        </actionGroup>
+        <!--Submit Invoice-->
         <actionGroup ref="SubmitInvoice" stepKey="submitInvoice"/>
         <!--Create Shipment-->
         <actionGroup ref="StartCreateShipmentFromOrderPage" stepKey="startCreateShipment"/>
         <fillField selector="{{AdminShipmentItemsSection.itemQtyToShip('1')}}" userInput="1" stepKey="changeItemQtyToShip"/>
         <actionGroup ref="SubmitShipment" stepKey="submitShipment"/>
 
         <!--Cancel order-->
-        <actionGroup ref="cancelCompleteOrder" stepKey="cancelOrder"/>
+        <actionGroup ref="cancelProcessingOrder" stepKey="cancelOrder"/>
         <!--Check quantities in "Items Ordered" table-->
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Invoiced 1" stepKey="seeInvoicedQuantity"/>
         <see selector="{{AdminOrderItemsOrderedSection.itemQty('1')}}" userInput="Shipped 1" stepKey="seeShippedQuantity"/>

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml

@@ -45,6 +45,18 @@
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoicePageTitle"/>
     </actionGroup>
 
+    <actionGroup name="CreatePartialInvoice">
+        <arguments>
+            <argument name="rowNumber" type="string" defaultValue="1"/>
+            <argument name="qtyToInvoice" type="string" defaultValue="1"/>
+        </arguments>
+        <fillField selector="{{AdminInvoiceItemsSection.itemQtyToInvoice(rowNumber)}}" userInput="{{qtyToInvoice}}" stepKey="changeQtyToInvoice"/>
+        <waitForElementVisible selector="{{AdminInvoiceItemsSection.updateQtyEnabled}}" stepKey="waitForUpdateQtyEnabled"/>
+        <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQty"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForQtyToUpdate"/>
+        <waitForElementVisible selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="waitForSubmitInvoiceButton"/>
+    </actionGroup>
+
     <actionGroup name="SubmitInvoice">
         <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
         <waitForElementVisible selector="{{AdminMessagesSection.successMessage}}" stepKey="waitForMessageAppears"/>

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml

@@ -18,10 +18,10 @@
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
     </actionGroup>
 
-    <!--Cancel order that is in complete status-->
-    <actionGroup name="cancelCompleteOrder" extends="cancelPendingOrder">
+    <!--Cancel order that is in processing status-->
+    <actionGroup name="cancelProcessingOrder" extends="cancelPendingOrder">
         <remove keyForRemoval="seeOrderStatusCanceled"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" after="seeCancelSuccessMessage" userInput="Complete" stepKey="seeOrderStatusComplete"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" after="seeCancelSuccessMessage" userInput="{{CONST.orderStatusComplete}}" stepKey="seeOrderStatusComplete"/>
     </actionGroup>
 
     <!--Navigate to create order page (New Order -> Create New Customer)-->

app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml

@@ -23,4 +23,8 @@
             <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToGridOrdersPage"/>
             <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.enabledFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
         </actionGroup>
+        <actionGroup name="openOrderById" extends="filterOrderGridById">
+            <click selector="{{AdminDataGridTableSection.firstRow}}" after="clickOrderApplyFilters" stepKey="openOrderViewPage"/>
+            <waitForPageLoad after="openOrderViewPage" stepKey="waitForOrderViewPageOpened"/>
+        </actionGroup>
 </actionGroups>