ENGCOM-8492: [MFTF] Refactoring of AdminCreateOrderAddProductCheckbox…

…Test #31016 - Merge Pull Request #31016 from AnnaAPak/magento2:ref-AdminCreateOrderAddProductCheckboxTest - Merged commits: 1. 84e6e1e 2. 3838099 3. 60460f6 4. b61c19e 5. 2575b7b
magento · Dec 16, 2020 · 28af659 · 28af659
2 parents ad29452 + 2575b7b
commit 28af659
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/...agento/Sales/Test/Mftf/ActionGroup/AddSimpleProductToOrderAndCheckCheckboxActionGroup.xml b/...agento/Sales/Test/Mftf/ActionGroup/AddSimpleProductToOrderAndCheckCheckboxActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminAddSimpleProductToOrderAndCheckCheckboxActionGroup" extends="AddSimpleProductToOrderActionGroup">
+        <annotations>
+            <description>Adds the provided Simple Product to an Order. Checks if checkbox is checked. Fills in the provided Product Qty. Clicks on 'Add Selected Product(s) to Order'.</description>
+        </annotations>
+
+        <seeCheckboxIsChecked selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="verifyProductChecked" after="selectProduct"/> 
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAddProductCheckboxTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderAddProductCheckboxTest.xml
@@ -34,17 +34,20 @@
             <argument name="customer" value="$$createSimpleCustomer$$"/>
         </actionGroup>
 
-        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
-        <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSkuFilterBundle"/>
-        <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchBundle"/>
-        <scrollTo selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" x="0" y="-100" stepKey="scrollToCheckColumn"/>
-        <checkOption selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="selectProduct"/>
-        <seeCheckboxIsChecked selector="{{AdminOrderFormItemsSection.rowCheck('1')}}" stepKey="verifyProductChecked"/>
-
+        <actionGroup ref="AdminAddSimpleProductToOrderAndCheckCheckboxActionGroup" stepKey="clickAddProducts">
+            <argument name="product" value="$createSimpleProduct$"/>
+        </actionGroup>
+
+         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillSkuFilterBundle"/>        
+         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickSearchBundle"/>     
+         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToCheckColumn"/>
+         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectProduct"/>
+         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="verifyProductChecked"/>
+
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
             <deleteData createDataKey="createSimpleCustomer" stepKey="deleteSimpleCustomer"/>
         </after>
     </test>
-</tests>
+</tests>