From d0ba33745ab8bedcd4a18f6757c7d5dd9ac4712a Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 7 Sep 2020 16:17:13 +0300
Subject: [PATCH 1/3] added AdminDeleteTaxRateActionGroup

---
 .../AdminDeleteTaxRateActionGroup.xml         | 28 +++++++++++++++++++
 .../AdminCreateTaxRateAllPostCodesTest.xml    |  9 ++----
 .../Test/AdminCreateTaxRateLargeRateTest.xml  |  9 ++----
 ...AdminCreateTaxRateSpecificPostcodeTest.xml |  9 ++----
 ...dminCreateTaxRateWiderZipCodeRangeTest.xml |  9 ++----
 .../AdminCreateTaxRateZipCodeRangeTest.xml    |  9 ++----
 .../Mftf/Test/DeleteTaxRateEntityTest.xml     | 11 +++-----
 7 files changed, 47 insertions(+), 37 deletions(-)
 create mode 100644 app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRateActionGroup.xml

diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRateActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRateActionGroup.xml
new file mode 100644
index 0000000000000..b609ef8827764
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRateActionGroup.xml
@@ -0,0 +1,28 @@
+<?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="AdminDeleteTaxRateActionGroup">
+        <annotations>
+            <description>Goes to the Admin Tax Rate grid page. Deletes the provided Tax Rate Code.</description>
+        </annotations>
+        <arguments>
+            <argument name="taxRateCode" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCode}}" stepKey="fillNameFilter"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
+        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
+        <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
index be7185a5166a2..f2f7d78ea2650 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
@@ -23,12 +23,9 @@
         </before>
         <after>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
-            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+                <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
+            </actionGroup>
         </after>
 
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
index 89cfdd0eb9943..144f6b644d168 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
@@ -23,12 +23,9 @@
         </before>
         <after>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
-            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+                <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
+            </actionGroup>
         </after>
 
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
index a3386cada436f..49a89b33d55d0 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
@@ -23,12 +23,9 @@
         </before>
         <after>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
-            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+                <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
+            </actionGroup>
         </after>
 
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
index 6ceeae953139c..620ad1909c6f8 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
@@ -23,12 +23,9 @@
         </before>
         <after>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
-            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+                <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
+            </actionGroup>
         </after>
 
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
index 4f9e876fed696..fe8f67f880f49 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
@@ -23,12 +23,9 @@
         </before>
         <after>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
-            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
-            <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
-            <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-            <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
-            <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-            <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+                <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
+            </actionGroup>
         </after>
 
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
index eb774297b8322..baae945bd8d1d 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
@@ -25,14 +25,11 @@
 
         <!-- Search the tax rate on tax grid page -->
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
-        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
-        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
-        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
-        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
 
-        <!-- Delete values on the tax rate form page -->
-        <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-        <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+        <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+            <argument name="taxRateCode" value="{{initialTaxRate.code}}" />
+        </actionGroup>
+
         <see selector="{{AdminMessagesSection.success}}" userInput="You Deleted the tax rate." stepKey="seeSuccess1"/>
 
         <!-- Confirm Deleted TaxIdentifier(from the above step) on the tax rate grid page -->

From caaf4699d348236e951ea094a886b38e1391c6bf Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 7 Sep 2020 22:23:33 +0300
Subject: [PATCH 2/3] add code review recommendations

---
 .../AdminDeleteTaxRateActionGroup.xml         | 16 +++----------
 .../AdminFilterTaxRateByCodeActionGroup.xml   | 23 +++++++++++++++++++
 .../AdminCreateTaxRateAllPostCodesTest.xml    |  7 +++++-
 .../Test/AdminCreateTaxRateLargeRateTest.xml  |  7 +++++-
 ...AdminCreateTaxRateSpecificPostcodeTest.xml |  7 +++++-
 ...dminCreateTaxRateWiderZipCodeRangeTest.xml |  7 +++++-
 .../AdminCreateTaxRateZipCodeRangeTest.xml    |  7 +++++-
 .../Mftf/Test/DeleteTaxRateEntityTest.xml     | 10 +++++---
 .../AdminClickRowInGridActionGroup.xml        | 19 +++++++++++++++
 .../Section/AdminDataGridTableSection.xml     |  2 +-
 10 files changed, 83 insertions(+), 22 deletions(-)
 create mode 100644 app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminFilterTaxRateByCodeActionGroup.xml
 create mode 100644 app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickRowInGridActionGroup.xml

diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRateActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRateActionGroup.xml
index b609ef8827764..1aab6ea2c4eec 100644
--- a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRateActionGroup.xml
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminDeleteTaxRateActionGroup.xml
@@ -10,19 +10,9 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminDeleteTaxRateActionGroup">
         <annotations>
-            <description>Goes to the Admin Tax Rate grid page. Deletes the provided Tax Rate Code.</description>
+            <description>Delete Tax Rate.</description>
         </annotations>
-        <arguments>
-            <argument name="taxRateCode" type="string"/>
-        </arguments>
-
-        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
-        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCode}}" stepKey="fillNameFilter"/>
-        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
-        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
-        <click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
-        <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
+        <click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDeleteRate"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOk"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminFilterTaxRateByCodeActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminFilterTaxRateByCodeActionGroup.xml
new file mode 100644
index 0000000000000..2b110e969b113
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminFilterTaxRateByCodeActionGroup.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="AdminFilterTaxRateByCodeActionGroup">
+        <annotations>
+            <description>Filter Tax Rates by tax rate code.</description>
+        </annotations>
+        <arguments>
+            <argument name="taxRateCode" type="string"/>
+        </arguments>
+
+        <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCode}}" stepKey="fillNameFilter"/>
+        <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
+        <waitForPageLoad stepKey="waitForTaxRuleSearch"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
index f2f7d78ea2650..494c0ae74c375 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
@@ -23,9 +23,14 @@
         </before>
         <after>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
-            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
+            <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
                 <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
             </actionGroup>
+            <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
+                <argument name="row_number" value="1" />
+            </actionGroup>
+            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
         </after>
 
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
index 144f6b644d168..e195a0b86cb26 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
@@ -23,9 +23,14 @@
         </before>
         <after>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
-            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
+            <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
                 <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
             </actionGroup>
+            <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
+                <argument name="row_number" value="1" />
+            </actionGroup>
+            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
         </after>
 
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
index 49a89b33d55d0..bff1bb95e9540 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
@@ -23,9 +23,14 @@
         </before>
         <after>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
-            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
+            <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
                 <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
             </actionGroup>
+            <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
+                <argument name="row_number" value="1" />
+            </actionGroup>
+            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
         </after>
 
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
index 620ad1909c6f8..570608bb6adf6 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
@@ -23,9 +23,14 @@
         </before>
         <after>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
-            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
+            <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
                 <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
             </actionGroup>
+            <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
+                <argument name="row_number" value="1" />
+            </actionGroup>
+            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
         </after>
 
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
index fe8f67f880f49..a8e47b77e27c0 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
@@ -23,9 +23,14 @@
         </before>
         <after>
             <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
-            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
+            <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
                 <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
             </actionGroup>
+            <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
+                <argument name="row_number" value="1" />
+            </actionGroup>
+            <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
         </after>
 
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
index baae945bd8d1d..341b2e1aa6344 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
@@ -25,10 +25,14 @@
 
         <!-- Search the tax rate on tax grid page -->
         <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
-
-        <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
-            <argument name="taxRateCode" value="{{initialTaxRate.code}}" />
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
+        <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
+            <argument name="taxRateCode" value="$$initialTaxRate.code$$" />
+        </actionGroup>
+        <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
+            <argument name="row_number" value="1" />
         </actionGroup>
+        <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
 
         <see selector="{{AdminMessagesSection.success}}" userInput="You Deleted the tax rate." stepKey="seeSuccess1"/>
 
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickRowInGridActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickRowInGridActionGroup.xml
new file mode 100644
index 0000000000000..c538a6d530645
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickRowInGridActionGroup.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="AdminClickRowInGridActionGroup">
+        <arguments>
+            <argument name="row_number" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminDataGridTableSection.row(row_number)}}" stepKey="clickOnFirstRow"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
index fcee31c0bd80c..11e42353a0663 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
@@ -13,7 +13,7 @@
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{col}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
         <element name="rowCheckbox" type="checkbox" selector="table.data-grid tbody > tr:nth-of-type({{row}}) td.data-grid-checkbox-cell input" parameterized="true"/>
-        <element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
+        <element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true" timeout="30"/>
         <element name="rows" type="text" selector="table.data-grid tbody > tr.data-row"/>
         <!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
         <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>

From 204c4d9f933df1bb2949f060d6f53df68eab3994 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 9 Sep 2020 15:45:35 +0300
Subject: [PATCH 3/3] some changes

---
 .../AdminCreateTaxRateAllPostCodesTest.xml    |  4 +---
 .../Test/AdminCreateTaxRateLargeRateTest.xml  |  5 ++---
 ...AdminCreateTaxRateSpecificPostcodeTest.xml |  4 +---
 ...dminCreateTaxRateWiderZipCodeRangeTest.xml |  4 +---
 .../AdminCreateTaxRateZipCodeRangeTest.xml    |  4 +---
 .../Mftf/Test/DeleteTaxRateEntityTest.xml     |  4 +---
 .../AdminClickRowInGridActionGroup.xml        | 19 -------------------
 .../Section/AdminDataGridTableSection.xml     |  4 ++--
 8 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickRowInGridActionGroup.xml

diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
index 494c0ae74c375..ceb04a9c42e66 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
@@ -27,9 +27,7 @@
             <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
                 <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
             </actionGroup>
-            <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
-                <argument name="row_number" value="1" />
-            </actionGroup>
+            <actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
             <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
index e195a0b86cb26..7497b950a8c0e 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
@@ -27,9 +27,8 @@
             <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
                 <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
             </actionGroup>
-            <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
-                <argument name="row_number" value="1" />
-            </actionGroup>
+            <actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
+
             <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
index bff1bb95e9540..da89ad3e9337c 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
@@ -27,9 +27,7 @@
             <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
                 <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
             </actionGroup>
-            <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
-                <argument name="row_number" value="1" />
-            </actionGroup>
+            <actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
             <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
index 570608bb6adf6..da30157d94182 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
@@ -27,9 +27,7 @@
             <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
                 <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
             </actionGroup>
-            <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
-                <argument name="row_number" value="1" />
-            </actionGroup>
+            <actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
             <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
index a8e47b77e27c0..93e0f6514e83b 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
@@ -27,9 +27,7 @@
             <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
                 <argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
             </actionGroup>
-            <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
-                <argument name="row_number" value="1" />
-            </actionGroup>
+            <actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
             <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
index 341b2e1aa6344..751989497d10e 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
@@ -29,9 +29,7 @@
         <actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
             <argument name="taxRateCode" value="$$initialTaxRate.code$$" />
         </actionGroup>
-        <actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
-            <argument name="row_number" value="1" />
-        </actionGroup>
+        <actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
         <actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
 
         <see selector="{{AdminMessagesSection.success}}" userInput="You Deleted the tax rate." stepKey="seeSuccess1"/>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickRowInGridActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickRowInGridActionGroup.xml
deleted file mode 100644
index c538a6d530645..0000000000000
--- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickRowInGridActionGroup.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="AdminClickRowInGridActionGroup">
-        <arguments>
-            <argument name="row_number" type="string"/>
-        </arguments>
-
-        <click selector="{{AdminDataGridTableSection.row(row_number)}}" stepKey="clickOnFirstRow"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
index 11e42353a0663..c5b000259e265 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
@@ -9,11 +9,11 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDataGridTableSection">
-        <element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)" timeout="60"/>
+        <element name="firstRow" type="button" selector="table.data-grid tbody > tr:nth-of-type(1)" timeout="60"/>
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{col}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
         <element name="rowCheckbox" type="checkbox" selector="table.data-grid tbody > tr:nth-of-type({{row}}) td.data-grid-checkbox-cell input" parameterized="true"/>
-        <element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true" timeout="30"/>
+        <element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
         <element name="rows" type="text" selector="table.data-grid tbody > tr.data-row"/>
         <!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
         <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>