From f62220b490438b6afa5283ae55d8902af090631e Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Tue, 5 Feb 2019 16:39:02 +0200
Subject: [PATCH] MAGETWO-82385: [CE 2.1.0 rc3] - Cancel an order [configurable
 product] #5313

---
 .../Test/AdminCheckingProductQtyAfterOrderCancelTest.xml    | 6 +++---
 .../Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml | 4 ++--
 .../Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml   | 2 +-
 .../Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml     | 2 +-
 .../Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml    | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml
index c0d861d4190b8..af463c9042357 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml
@@ -98,7 +98,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
 
         <!--Open order-->
-        <actionGroup ref="openOrderById" stepKey="openOrderById">
+        <actionGroup ref="OpenOrderById" stepKey="openOrderById">
             <argument name="orderId" value="{$grabOrderNumber}"/>
         </actionGroup>
 
@@ -106,7 +106,7 @@
         <actionGroup ref="StartCreateInvoiceFromOrderPage" stepKey="startCreateInvoice"/>
         <!--Create partial invoice-->
         <actionGroup ref="CreatePartialInvoice" stepKey="createPartialInvoice">
-            <argument name="rowNumber" value="1"/>
+            <argument name="productSku" value="$createConfigChildProduct.sku$"/>
             <argument name="qtyToInvoice" value="1"/>
         </actionGroup>
         <!--Submit Invoice-->
@@ -117,7 +117,7 @@
         <actionGroup ref="SubmitShipment" stepKey="submitShipment"/>
 
         <!--Cancel order-->
-        <actionGroup ref="cancelProcessingOrder" 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"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index e63e279612fb1..ed63da75df9e1 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -47,10 +47,10 @@
 
     <actionGroup name="CreatePartialInvoice">
         <arguments>
-            <argument name="rowNumber" type="string" defaultValue="1"/>
+            <argument name="productSku" type="string"/>
             <argument name="qtyToInvoice" type="string" defaultValue="1"/>
         </arguments>
-        <fillField selector="{{AdminInvoiceItemsSection.itemQtyToInvoice(rowNumber)}}" userInput="{{qtyToInvoice}}" stepKey="changeQtyToInvoice"/>
+        <fillField selector="{{AdminInvoiceItemsSection.itemQtyToInvoiceBySku(productSku)}}" userInput="{{qtyToInvoice}}" stepKey="changeQtyToInvoice"/>
         <waitForElementVisible selector="{{AdminInvoiceItemsSection.updateQtyEnabled}}" stepKey="waitForUpdateQtyEnabled"/>
         <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQty"/>
         <waitForLoadingMaskToDisappear stepKey="waitForQtyToUpdate"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index 6b409b9f6a3da..730d3d6a5a185 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -19,7 +19,7 @@
     </actionGroup>
 
     <!--Cancel order that is in processing status-->
-    <actionGroup name="cancelProcessingOrder" extends="cancelPendingOrder">
+    <actionGroup name="CancelProcessingOrder" extends="cancelPendingOrder">
         <remove keyForRemoval="seeOrderStatusCanceled"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" after="seeCancelSuccessMessage" userInput="{{CONST.orderStatusComplete}}" stepKey="seeOrderStatusComplete"/>
     </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
index d99551de24db0..e5646e0a64621 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderGridActionGroup.xml
@@ -23,7 +23,7 @@
             <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToGridOrdersPage"/>
             <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.enabledFilters}}" visible="true" stepKey="clickOnButtonToRemoveFiltersIfPresent"/>
         </actionGroup>
-        <actionGroup name="openOrderById" extends="filterOrderGridById">
+        <actionGroup name="OpenOrderById" extends="filterOrderGridById">
             <click selector="{{AdminDataGridTableSection.firstRow}}" after="clickOrderApplyFilters" stepKey="openOrderViewPage"/>
             <waitForPageLoad after="openOrderViewPage" stepKey="waitForOrderViewPageOpened"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
index 0ab46bfff5d25..93d1b32f58dc0 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml
@@ -14,5 +14,6 @@
         <element name="updateQty" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button']"/>
         <element name="updateQtyEnabled" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button'][class='action-default scalable update-button']"/>
         <element name="productColumn" type="text" selector="//*[contains(@class,'order-invoice-tables')]//td[@class = 'col-product']//div[contains(text(),'{{productName}}')]" parameterized="true"/>
+        <element name="itemQtyToInvoiceBySku" type="input" selector="//div[contains(@class,'product-sku-block') and contains(., '{{productSku}}')]/ancestor::tr//td[contains(@class,'col-qty-invoice')]//input" parameterized="true"/>
     </section>
 </sections>