From 0d32349f8452d84770337eda6fba4d0cce70c6ee Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Mon, 30 Nov 2020 16:49:58 +0200
Subject: [PATCH] refactored

---
 ...minCheckProductQtyAfterOrderCancelling.xml |  4 +-
 .../ProductsQtyReturnAfterOrderCancelTest.xml | 49 ++++++-------------
 .../Quote/Test/Mftf/Data/CartItemData.xml     |  5 ++
 ...nvoiceWIthUpdatedProductQtyActionGroup.xml |  5 +-
 4 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckProductQtyAfterOrderCancelling.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckProductQtyAfterOrderCancelling.xml
index 8be37cccbb67a..71eddf6667368 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckProductQtyAfterOrderCancelling.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckProductQtyAfterOrderCancelling.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminCheckProductQtyAfterOrderCancelling">
+    <test name="AdminCheckProductQtyAfterOrderCancellingTest">
 
         <annotations>
             <features value="ConfigurableProduct"/>
@@ -41,7 +41,7 @@
             </updateData> 
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
-            
+
         </before>
 
         <after>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
index 6bcf33e923080..5270c82a7e977 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="">
+    <test name="ProductsQtyReturnAfterOrderCancelTest" deprecated="Use AdminCheckProductQtyAfterOrderCancellingTest instead">
 
         <annotations>
             <features value="ConfigurableProduct"/>
@@ -23,44 +23,28 @@
 
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>
-            <createData entity="BaseConfigurableProduct" stepKey="createConfigProduct">
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
                 <requiredEntity createDataKey="createCategory"/>
-                <field key="quantity">1000</field>
             </createData>
-
-            
-
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
 
         <after>
-            <!-- <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/> -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToCatalogProductPage1"/>
 
-        <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clickClearFiltersInitial"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
             <argument name="product" value="$$createConfigProduct$$"/>
         </actionGroup>
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="changeProductQuantity"/>
-        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveChanges"/> 
-
-        <createData entity="GuestCart" stepKey="createGuestCart"/>
-            <createData entity="SimpleFourCartItems" stepKey="addCartItem">
-                <requiredEntity createDataKey="createGuestCart"/>
-                <requiredEntity createDataKey="createConfigProduct"/>
-            </createData>
-            <createData entity="GuestAddressInformation" stepKey="addGuestOrderAddress">
-                <requiredEntity createDataKey="createGuestCart"/>
-            </createData>
-            <updateData createDataKey="createGuestCart" entity="GuestOrderPaymentMethod" stepKey="sendGuestPaymentInformation">
-                <requiredEntity createDataKey="createGuestCart"/>
-        </updateData> 
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveChanges"/>
 
-        <!-- <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="navigateToProductPage"/>
+        <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="navigateToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPage"/>
         <fillField selector="{{StorefrontProductInfoMainSection.qty}}" userInput="4" stepKey="fillQuantity"/>
 
@@ -79,10 +63,10 @@
             <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
         </actionGroup>
 
-        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/> -->
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
 
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
-            <argument name="orderId" value="$createGuestCart.return$"/>
+            <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
 
         <actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
@@ -91,16 +75,11 @@
         <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQuantity"/>
         <waitForPageLoad stepKey="waitPageToBeLoaded"/>
         <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
-        <!-- <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
-        <waitForPageLoad stepKey="waitOrderDetailToLoad"/> -->
-        <!-- <fillField selector="{{AdminShipmentItemsSection.itemQtyToShip('1')}}" userInput="1" stepKey="changeItemQtyToShip"/> -->
-        <actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="clickSubmitShipment">   
-             <argument name="Qty" value="1"/>
-             <argument name="Number" value="111"/>
-        </actionGroup>     
-       
-        <!-- <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
-        <waitForPageLoad stepKey="waitShipmentSectionToLoad"/> -->
+        <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
+        <waitForPageLoad stepKey="waitOrderDetailToLoad"/>
+        <fillField selector="{{AdminShipmentItemsSection.itemQtyToShip('1')}}" userInput="1" stepKey="changeItemQtyToShip"/>
+        <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
+        <waitForPageLoad stepKey="waitShipmentSectionToLoad"/>
         <actionGroup ref="CancelPendingOrderActionGroup" stepKey="cancelPendingOption">
             <argument name="orderStatus" value="Complete"/>
         </actionGroup>
diff --git a/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
index a513b6747f612..d24154bcf9da2 100644
--- a/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Data/CartItemData.xml
@@ -23,4 +23,9 @@
         <var key="quote_id" entityKey="return" entityType="GuestCart"/>
         <var key="sku" entityKey="sku" entityType="product"/>
     </entity>
+    <entity name="FourCartItems" type="CartItem">
+        <data key="qty">4</data>
+        <var key="quote_id" entityKey="return" entityType="GuestCart"/>
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceWIthUpdatedProductQtyActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceWIthUpdatedProductQtyActionGroup.xml
index 092a225c232ea..334061803bb4d 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceWIthUpdatedProductQtyActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceWIthUpdatedProductQtyActionGroup.xml
@@ -10,7 +10,10 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminInvoiceWIthUpdatedProductQtyActionGroup" extends="AdminCreateInvoiceActionGroup">
          <annotations>
-            <description>The "Create Invoice" page: Update product qty to invoice (there is one product in the Order).</description>
+            <description>Start order Invoicing.
+                         Update product qty to invoice (there is one product in the Order).
+                         Submit the invoice.
+            </description>
         </annotations>
         <arguments>
             <argument name="qty" type="string"/>