From ef5cd8cbf69786329c2aa61565ec600e3d5d674f Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Tue, 5 Oct 2021 14:10:58 +0300
Subject: [PATCH 1/2] refactored
 MoveRecentlyViewedBundleFixedProductOnOrderPageTest

---
 ...eateOrderOnEditCustomerPageActionGroup.xml | 21 ++++++++
 ...rderedGridOnCreateOrderPageActionGroup.xml | 23 ++++++++
 ...ureForRecentlyViewedProductActionGroup.xml | 22 ++++++++
 ...onfigureProductSlidingModalActionGroup.xml | 20 +++++++
 ...onfigureProductSlidingModalActionGroup.xml | 21 ++++++++
 ...iewedBundleFixedProductOnOrderPageTest.xml | 53 +++++++++----------
 6 files changed, 132 insertions(+), 28 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClickCreateOrderOnEditCustomerPageActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertProductInItemsOrderedGridOnCreateOrderPageActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickConfigureForRecentlyViewedProductActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickOkOnConfigureProductSlidingModalActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectDropdownOptionOnConfigureProductSlidingModalActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClickCreateOrderOnEditCustomerPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClickCreateOrderOnEditCustomerPageActionGroup.xml
new file mode 100644
index 0000000000000..1fdf5e008e5f2
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClickCreateOrderOnEditCustomerPageActionGroup.xml
@@ -0,0 +1,21 @@
+<?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="AdminClickCreateOrderOnEditCustomerPageActionGroup">
+        <annotations>
+            <description>Clicks on 'Create Order' on the Edit Customer page.</description>
+        </annotations>
+        
+        <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
+        
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertProductInItemsOrderedGridOnCreateOrderPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertProductInItemsOrderedGridOnCreateOrderPageActionGroup.xml
new file mode 100644
index 0000000000000..f27e99c7ce3b1
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertProductInItemsOrderedGridOnCreateOrderPageActionGroup.xml
@@ -0,0 +1,23 @@
+<?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="AdminAssertProductInItemsOrderedGridOnCreateOrderPageActionGroup">
+        <annotations>
+            <description>Asserts product in Items Ordered Grid on Create Order page</description>
+        </annotations>
+        <arguments>
+            <argument name="index" type="string"/>
+            <argument name="attribute" type="string"/>
+            <argument name="value" type="string"/>
+        </arguments>
+        
+        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell(index, attribute)}}" userInput="{{value}}" stepKey="seeProductAttribute"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickConfigureForRecentlyViewedProductActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickConfigureForRecentlyViewedProductActionGroup.xml
new file mode 100644
index 0000000000000..5bf954e4c8460
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickConfigureForRecentlyViewedProductActionGroup.xml
@@ -0,0 +1,22 @@
+<?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="AdminClickConfigureForRecentlyViewedProductActionGroup">
+        <annotations>
+            <description>Clicks the "Configure" button for a Product in Recently Viewed Product section on Create Order Page</description>
+        </annotations>
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminCustomerActivitiesRecentlyViewedSection.addToOrderConfigure(productName)}}" stepKey="clickConfigureProduct"/>
+ 
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickOkOnConfigureProductSlidingModalActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickOkOnConfigureProductSlidingModalActionGroup.xml
new file mode 100644
index 0000000000000..486751dc09e3a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickOkOnConfigureProductSlidingModalActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="AdminClickOkOnConfigureProductSlidingModalActionGroup">
+        <annotations>
+            <description>Clicks the "Ok" button on the "Configure Product" sliding modal on the Create Order page</description>
+        </annotations>
+
+       <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOkButton"/>
+       <waitForPageLoad stepKey="waitForAddingConfiguredProduct"/>
+        
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectDropdownOptionOnConfigureProductSlidingModalActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectDropdownOptionOnConfigureProductSlidingModalActionGroup.xml
new file mode 100644
index 0000000000000..0a01d81aec725
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectDropdownOptionOnConfigureProductSlidingModalActionGroup.xml
@@ -0,0 +1,21 @@
+<?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="AdminSelectDropdownOptionOnConfigureProductSlidingModalActionGroup">
+        <annotations>
+            <description>Selects a required option in dropdown on the "Configure Product" Sliding Modal</description>
+        </annotations>
+        <arguments>
+            <argument name="optionName" type="string"/>
+        </arguments>
+
+        <selectOption selector="{{AdminOrderFormConfigureProductSection.selectOption}}" userInput="{{optionName}}" stepKey="selectOption"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
index 5b7888fe9e4bb..5fa26aff0f737 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
@@ -20,16 +20,12 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
-            <!-- Login as admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
-            <!-- Create customer -->
             <createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
 
-            <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 
-            <!-- Create simple products -->
             <createData entity="SimpleProduct2" stepKey="createFirstProduct">
                 <field key="price">755.00</field>
             </createData>
@@ -37,7 +33,6 @@
                 <field key="price">756.00</field>
             </createData>
 
-            <!-- Create Bundle product -->
             <createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
@@ -54,62 +49,64 @@
                 <requiredEntity createDataKey="createBundleOption"/>
                 <requiredEntity createDataKey="createSecondProduct"/>
             </createData>
-            <!-- Change configuration -->
+
             <magentoCLI command="config:set reports/options/enabled 1" stepKey="enableReportModule"/>
 
             <comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
         </before>
         <after>
-            <!-- Admin logout -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
 
-            <!-- Customer logout -->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
 
-            <!-- Delete customer -->
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
 
-            <!-- Delete created product data -->
             <deleteData createDataKey="createBundleProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createFirstProduct" stepKey="deleteFirstProduct"/>
             <deleteData createDataKey="createSecondProduct" stepKey="deleteSecondProduct"/>
 
-            <!-- Delete category -->
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
-            <!-- Change configuration -->
             <magentoCLI command="config:set reports/options/enabled 0" stepKey="disableReportModule"/>
         </after>
 
-        <!-- Login as customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
             <argument name="Customer" value="$$createCustomer$$"/>
         </actionGroup>
 
-        <!-- Go to created product page -->
-        <amOnPage url="{{StorefrontProductPage.url($$createBundleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="goToProductPage">
+            <argument name="productUrlKey" value="$$createBundleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProductPageLoad"/>
 
-        <!-- Search and open customer -->
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
         <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
 
-        <!-- Click create order -->
-        <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
+        <actionGroup ref="AdminClickCreateOrderOnEditCustomerPageActionGroup" stepKey="clickCreateOrder"/>
+
+        <actionGroup ref="AdminClickConfigureForRecentlyViewedProductActionGroup" stepKey="configureProduct">
+            <argument name="productName" value="$$createBundleProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminSelectDropdownOptionOnConfigureProductSlidingModalActionGroup" stepKey="selectProductOption">
+            <argument name="optionName" value="$$createFirstProduct.name$$"/>
+        </actionGroup>    
 
-        <!-- Add configure to bundle product -->
-        <click selector="{{AdminCustomerActivitiesRecentlyViewedSection.addToOrderConfigure($$createBundleProduct.name$$)}}" stepKey="configureProduct"/>
-        <click selector="{{AdminCustomerActivitiesConfigureSection.dropdownProductSelection($$createFirstProduct.name$$)}}" stepKey="selectProductOption"/>
-        <click selector="{{AdminCustomerActivitiesConfigureSection.okButton}}" stepKey="clickOkBtn"/>
-        <waitForPageLoad stepKey="waitForAddingConfigure"/>
+        <actionGroup ref="AdminClickOkOnConfigureProductSlidingModalActionGroup" stepKey="clickOkBtn"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForAddingConfigure"/>
 
-        <!-- Click 'Update Changes' -->
         <actionGroup ref="AdminClickUpdateChangesOnCreateOrderPageActionGroup" stepKey="clickUpdateChangesBtn"/>
 
-        <!-- Assert products in items ordered grid -->
-        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Product')}}" userInput="$$createBundleProduct.name$$" stepKey="seeProductName"/>
-        <see selector="{{AdminCustomerCreateNewOrderSection.gridCell('1', 'Price')}}" userInput="$755.00" stepKey="seeProductPrice"/>
+        <actionGroup ref="AdminAssertProductInItemsOrderedGridOnCreateOrderPageActionGroup" stepKey="seeProductName">
+            <argument name="index" value="1"/>
+            <argument name="attribute" value="Product"/>
+            <argument name="value" value="$$createBundleProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertProductInItemsOrderedGridOnCreateOrderPageActionGroup" stepKey="seeProductPrice">
+            <argument name="index" value="1"/>
+            <argument name="attribute" value="Price"/>
+            <argument name="value" value="$755.00"/>
+        </actionGroup>
     </test>
 </tests>

From 757638f3190107558481132e3445dd6f8a87537e Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Fri, 12 Nov 2021 17:08:09 +0200
Subject: [PATCH 2/2] fixed semantic

---
 .../MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
index bc175ef744071..a8caf2d4a5adc 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
@@ -79,14 +79,8 @@
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProductPageLoad"/>
 
-<<<<<<< HEAD
-        <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
-            <argument name="email" value="$$createCustomer.email$$"/>
-=======
-        <!-- Search and open customer -->
         <actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
             <argument name="customerId" value="$createCustomer.id$"/>
->>>>>>> 2.4-develop
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="filterCreatedCustomer"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickEditButton"/>