From 27c03dae9cf29ae0c84f7c91cea287098f58806b Mon Sep 17 00:00:00 2001
From: Ajith <ajithkumar.maragathavel@ziffity.com>
Date: Sun, 10 Jan 2021 01:54:17 +0530
Subject: [PATCH] MFTF test refactored

---
 ...efrontDeleteCustomerAddressActionGroup.xml | 22 ++++++++++++++++
 .../ActionGroup/StorefrontSeeActionGroup.xml  | 22 ++++++++++++++++
 .../StorefrontSelectOptionActionGroup.xml     | 22 ++++++++++++++++
 ...orefrontVerifyOrderGridListActionGroup.xml | 26 +++++++++++++++++++
 ...StorefrontCustomerAccountOrderListTest.xml | 23 +---------------
 .../StorefrontDeleteCustomerAddressTest.xml   | 16 +++++++-----
 ...efrontUpdateCustomerAddressBelgiumTest.xml | 21 +++++++++++----
 7 files changed, 118 insertions(+), 34 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontDeleteCustomerAddressActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSeeActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSelectOptionActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyOrderGridListActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontDeleteCustomerAddressActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontDeleteCustomerAddressActionGroup.xml
new file mode 100644
index 0000000000000..da34196263e6b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontDeleteCustomerAddressActionGroup.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="StorefrontDeleteCustomerAddressActionGroup">
+        <annotations>
+            <description>Delete customer address from the storefront.</description>
+        </annotations>
+
+        <click selector="{{StorefrontCustomerAddressesSection.deleteAdditionalAddress('1')}}" stepKey="deleteAdditionalAddress"/>
+        <waitForElementVisible selector="{{ModalConfirmationSection.modalContent}}" stepKey="waitFortheConfirmationModal"/>
+        <see selector="{{ModalConfirmationSection.modalContent}}" userInput="Are you sure you want to delete this address?" stepKey="seeAddressDeleteConfirmationMessage"/>
+        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSeeActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSeeActionGroup.xml
new file mode 100644
index 0000000000000..cbe010d12d5ea
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSeeActionGroup.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="StorefrontSeeActionGroup">
+        <annotations>
+            <description>Validates that the provided text is present and correct.</description>
+        </annotations>
+        <arguments>
+            <argument name="userInput" type="string"/>
+            <argument name="fieldSelector" type="string"/>
+        </arguments>
+
+        <see userInput="{{userInput}}" selector="{{fieldSelector}}" stepKey="verifyMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSelectOptionActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSelectOptionActionGroup.xml
new file mode 100644
index 0000000000000..ce54dba2dacaa
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontSelectOptionActionGroup.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="StorefrontSelectOptionActionGroup">
+        <annotations>
+            <description>Selects an option in a select tag or in radio button group.</description>
+        </annotations>
+        <arguments>
+            <argument name="userInput" type="string"/>
+            <argument name="fieldSelector" type="string"/>
+        </arguments>
+
+        <selectOption selector="{{fieldSelector}}" userInput="{{userInput}}" stepKey="selectOption"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyOrderGridListActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyOrderGridListActionGroup.xml
new file mode 100644
index 0000000000000..4f765af7c3e65
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyOrderGridListActionGroup.xml
@@ -0,0 +1,26 @@
+<?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="StorefrontVerifyOrderGridListActionGroup">
+        <annotations>
+            <description>Verify that the list of Orders is displayed in the grid</description>
+        </annotations>
+
+        <seeElement selector="{{StorefrontCustomerOrderSection.isMyOrdersSection}}" stepKey="waitOrderHistoryPage"/>
+        <scrollTo selector="{{StorefrontCustomerOrderSection.currentPage}}" stepKey="scrollToBottomToolbarSection"/>
+        <click selector="{{StorefrontCustomerOrderSection.pageNumber('2')}}" stepKey="clickOnPage2"/>
+        <scrollTo selector="{{StorefrontCustomerOrderSection.perPage}}" stepKey="scrollToLimiter"/>
+        <selectOption userInput="20" selector="{{StorefrontCustomerOrderSection.perPage}}" stepKey="selectLimitOnPage"/>
+        <waitForPageLoad stepKey="waitForLoadPage"/>
+        <seeElement selector="{{StorefrontCustomerOrderSection.isMyOrdersSection}}" stepKey="seeElementOrderHistoryPage"/>
+        <dontSee selector="{{StorefrontOrderInformationMainSection.emptyMessage}}" userInput="You have placed no orders." stepKey="dontSeeEmptyMessage"/>
+        <seeNumberOfElements selector="{{StorefrontCustomerOrderSection.rowsInColumn('id')}}" userInput="15" stepKey="seeRowsCount"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerAccountOrderListTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerAccountOrderListTest.xml
index ba113c739d706..5b453c435590b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerAccountOrderListTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerAccountOrderListTest.xml
@@ -118,27 +118,6 @@
         <actionGroup ref="StorefrontCustomerGoToSidebarMenu" stepKey="goToSidebarMenu">
             <argument name="menu" value="My Orders"/>
         </actionGroup>
-
-        <seeElement selector="{{StorefrontCustomerOrderSection.isMyOrdersSection}}" stepKey="waitOrderHistoryPage"/>
-
-        <scrollTo selector="{{StorefrontCustomerOrderSection.currentPage}}" stepKey="scrollToBottomToolbarSection"/>
-
-        <click selector="{{StorefrontCustomerOrderSection.pageNumber('2')}}" stepKey="clickOnPage2"/>
-
-        <scrollTo selector="{{StorefrontCustomerOrderSection.perPage}}" stepKey="scrollToLimiter"/>
-
-        <selectOption userInput="20" selector="{{StorefrontCustomerOrderSection.perPage}}" stepKey="selectLimitOnPage"/>
-
-        <waitForPageLoad stepKey="waitForLoadPage"/>
-
-        <seeElement selector="{{StorefrontCustomerOrderSection.isMyOrdersSection}}"
-                    stepKey="seeElementOrderHistoryPage"/>
-
-        <dontSee selector="{{StorefrontOrderInformationMainSection.emptyMessage}}"
-                 userInput="You have placed no orders." stepKey="dontSeeEmptyMessage"/>
-
-        <seeNumberOfElements selector="{{StorefrontCustomerOrderSection.rowsInColumn('id')}}" userInput="15"
-                             stepKey="seeRowsCount"/>
-
+        <actionGroup ref="StorefrontVerifyOrderGridListActionGroup" stepKey="verifyOrderGridList"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml
index 51efd4e23f5d3..8d51bbc3ffe84 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontDeleteCustomerAddressTest.xml
@@ -31,12 +31,14 @@
         <actionGroup ref="EnterCustomerAddressInfoActionGroup" stepKey="enterAddressInfo">
             <argument name="Address" value="US_Address_NY"/>
         </actionGroup>
-        <see userInput="You saved the address." stepKey="verifyAddressCreated"/>
-        <click selector="{{StorefrontCustomerAddressesSection.deleteAdditionalAddress('1')}}" stepKey="deleteAdditionalAddress"/>
-        <waitForElementVisible selector="{{ModalConfirmationSection.modalContent}}" stepKey="waitFortheConfirmationModal"/>
-        <see selector="{{ModalConfirmationSection.modalContent}}" userInput="Are you sure you want to delete this address?" stepKey="seeAddressDeleteConfirmationMessage"/>
-        <click selector="{{ModalConfirmationSection.OkButton}}" stepKey="confirmDelete"/>
-        <waitForPageLoad stepKey="waitForDeleteToFinish"/>
-        <see userInput="You deleted the address." stepKey="verifyDeleteAddress"/>
+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="verifyAddressCreatedSuccessMessage">
+            <argument name="message" value="You saved the address."/>
+            <argument name="messageType" value="success"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontDeleteCustomerAddressActionGroup" stepKey="deleteCustomerAddress"/>
+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="verifyAddressDeletedSuccessMessage">
+            <argument name="message" value="You deleted the address."/>
+            <argument name="messageType" value="success"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml
index b800b7870b5c5..7943eca241672 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerAddressBelgiumTest.xml
@@ -42,7 +42,10 @@
             <argument name="Address" value="updateCustomerBelgiumAddress"/>
         </actionGroup>
         <!--Verify customer address save success message-->
-        <see selector="{{AdminCustomerMessagesSection.successMessage}}" userInput="You saved the address." stepKey="seeAssertCustomerAddressSuccessSaveMessage"/>
+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="assertCustomerAddressSuccessSaveMessage">
+            <argument name="message" value="You saved the address."/>
+            <argument name="messageType" value="success"/>
+        </actionGroup>
 
         <!--Verify customer default billing address-->
         <actionGroup ref="VerifyCustomerBillingAddressWithStateActionGroup" stepKey="verifyBillingAddress">
@@ -56,10 +59,18 @@
 
         <!-- Verify country Belgium can be saved without state as state not required -->
         <actionGroup ref="StoreFrontClickEditDefaultShippingAddressActionGroup" stepKey="clickOnDefaultShippingAddress"/>
-        <selectOption selector="{{StorefrontCustomerAddressFormSection.country}}" userInput="Belgium" stepKey="selectCountry"/>
-        <selectOption selector="{{StorefrontCustomerAddressFormSection.state}}" userInput="Please select a region, state or province." stepKey="selectState"/>
+        <actionGroup ref="StorefrontSelectOptionActionGroup" stepKey="selectCountry">
+            <argument name="userInput" value="Belgium"/>
+            <argument name="fieldSelector" value="{{StorefrontCustomerAddressFormSection.country}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSelectOptionActionGroup" stepKey="selectState">
+            <argument name="userInput" value="Please select a region, state or province."/>
+            <argument name="fieldSelector" value="{{StorefrontCustomerAddressFormSection.state}}"/>
+        </actionGroup>
         <actionGroup ref="AdminSaveCustomerAddressActionGroup" stepKey="saveAddress"/>
-        <see selector="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}" userInput="Belgium" stepKey="seeAssertCustomerDefaultShippingAddressCountry"/>
-
+        <actionGroup ref="StorefrontSeeActionGroup" stepKey="seeAssertCustomerDefaultShippingAddressCountry">
+            <argument name="userInput" value="Belgium"/>
+            <argument name="fieldSelector" value="{{StorefrontCustomerAddressesSection.defaultShippingAddress}}"/>
+        </actionGroup>
     </test>
 </tests>