From 865bf66c8955f18d86052bc8d9d0e6e517b4f25a Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Wed, 8 Sep 2021 11:54:51 +0300
Subject: [PATCH 1/2] added StorefrontCheckRefundHGrandTotalActionGroup

---
 .../Test/AdminCreateCreditMemoBankTransferPaymentTest.xml   | 6 ++++--
 .../AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml | 4 +++-
 .../Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml    | 5 ++++-
 .../Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml    | 4 +++-
 .../Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml     | 4 +++-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
index 9d1daf0d2ded1..24f35fb8d8f57 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
@@ -134,7 +134,9 @@
         <click selector="{{StorefrontCustomerResentOrdersSection.viewOrder({$grabOrderId})}}" stepKey="clickOnOrder"/>
         <waitForPageLoad stepKey="waitForViewOrder"/>
         <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
-        <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
-        <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToGrandTotal"/>
+        <actionGroup ref="StorefrontCheckRefundHGrandTotalActionGroup" stepKey="seeGrandTotal">
+            <argument name="grandTotal" value="555.00"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml
index 7709b847b996b..25722350fd716 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml
@@ -94,6 +94,8 @@
         </actionGroup>
 
         <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
-        <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
+        <actionGroup ref="StorefrontCheckRefundHGrandTotalActionGroup" stepKey="seeGrandTotal">
+            <argument name="grandTotal" value="555.00"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
index 5d2f76b80e3f8..9946c08284611 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
@@ -129,7 +129,10 @@
         <waitForPageLoad stepKey="waitForViewOrder"/>
         <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
-        <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="110.00" stepKey="seeGrandTotal"/>
+        
+        <actionGroup ref="StorefrontCheckRefundHGrandTotalActionGroup" stepKey="seeGrandTotal">
+            <argument name="grandTotal" value="110.00"/>
+        </actionGroup>
 
         <!-- Assert product Qty decreased after CreditMemo -->
         <actionGroup ref="AdminAssertProductQtyInGridActionGroup" stepKey="assertQtyDecreased">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
index 5ff2f19d797b2..30a13f7f1a21d 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
@@ -125,6 +125,8 @@
         <waitForPageLoad stepKey="waitForViewOrder"/>
         <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
-        <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
+        <actionGroup ref="StorefrontCheckRefundHGrandTotalActionGroup" stepKey="seeGrandTotal">
+            <argument name="grandTotal" value="555.00"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
index 32c3a5e0a5846..a43ae7552dfb7 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
@@ -121,6 +121,8 @@
         <waitForPageLoad stepKey="waitForViewOrder"/>
         <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
-        <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
+        <actionGroup ref="StorefrontCheckRefundHGrandTotalActionGroup" stepKey="seeGrandTotal">
+            <argument name="grandTotal" value="555.00"/>
+        </actionGroup>
     </test>
 </tests>

From 0919deb92ceff2d7cebfa0d58ac429986b12d09e Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Fri, 10 Sep 2021 11:49:47 +0300
Subject: [PATCH 2/2] corrected a typo

---
 ...efrontCheckRefundGrandTotalActionGroup.xml | 21 +++++++++++++++++++
 ...reateCreditMemoBankTransferPaymentTest.xml |  2 +-
 ...editMemoForOrderWithCashOnDeliveryTest.xml |  2 +-
 ...AdminCreateCreditMemoPartialRefundTest.xml |  2 +-
 ...CreateCreditMemoWithCashOnDeliveryTest.xml |  2 +-
 ...nCreateCreditMemoWithPurchaseOrderTest.xml |  2 +-
 6 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontCheckRefundGrandTotalActionGroup.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontCheckRefundGrandTotalActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontCheckRefundGrandTotalActionGroup.xml
new file mode 100644
index 0000000000000..78084c22a22c4
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontCheckRefundGrandTotalActionGroup.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="StorefrontCheckRefundGrandTotalActionGroup">
+        <annotations>
+            <description>Checks if Refund Grand Total is equal to the provided value.</description>
+        </annotations>
+        <arguments>
+            <argument name="grandTotal" type="string"/>
+        </arguments>
+
+        <see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="{{grandTotal}}" stepKey="seeGrandTotal"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
index 24f35fb8d8f57..add2c03fe0172 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
@@ -135,7 +135,7 @@
         <waitForPageLoad stepKey="waitForViewOrder"/>
         <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToGrandTotal"/>
-        <actionGroup ref="StorefrontCheckRefundHGrandTotalActionGroup" stepKey="seeGrandTotal">
+        <actionGroup ref="StorefrontCheckRefundGrandTotalActionGroup" stepKey="seeGrandTotal">
             <argument name="grandTotal" value="555.00"/>
         </actionGroup>
     </test>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml
index 25722350fd716..79399b01f4515 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml
@@ -94,7 +94,7 @@
         </actionGroup>
 
         <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
-        <actionGroup ref="StorefrontCheckRefundHGrandTotalActionGroup" stepKey="seeGrandTotal">
+        <actionGroup ref="StorefrontCheckRefundGrandTotalActionGroup" stepKey="seeGrandTotal">
             <argument name="grandTotal" value="555.00"/>
         </actionGroup>
     </test>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
index 9946c08284611..698b9e9bd46a7 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
@@ -130,7 +130,7 @@
         <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
         
-        <actionGroup ref="StorefrontCheckRefundHGrandTotalActionGroup" stepKey="seeGrandTotal">
+        <actionGroup ref="StorefrontCheckRefundGrandTotalActionGroup" stepKey="seeGrandTotal">
             <argument name="grandTotal" value="110.00"/>
         </actionGroup>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
index 30a13f7f1a21d..65600165e1258 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
@@ -125,7 +125,7 @@
         <waitForPageLoad stepKey="waitForViewOrder"/>
         <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
-        <actionGroup ref="StorefrontCheckRefundHGrandTotalActionGroup" stepKey="seeGrandTotal">
+        <actionGroup ref="StorefrontCheckRefundGrandTotalActionGroup" stepKey="seeGrandTotal">
             <argument name="grandTotal" value="555.00"/>
         </actionGroup>
     </test>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
index a43ae7552dfb7..cdfbcf969c914 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
@@ -121,7 +121,7 @@
         <waitForPageLoad stepKey="waitForViewOrder"/>
         <actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
         <scrollTo selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" stepKey="scrollToGrandTotal"/>
-        <actionGroup ref="StorefrontCheckRefundHGrandTotalActionGroup" stepKey="seeGrandTotal">
+        <actionGroup ref="StorefrontCheckRefundGrandTotalActionGroup" stepKey="seeGrandTotal">
             <argument name="grandTotal" value="555.00"/>
         </actionGroup>
     </test>