Merge branch 'ACQE-6423' into ACQE-functional-mainline-deployment_Ver1

Author: manjusha729

app/code/Magento/Tax/Test/Mftf/Test/ApplyTaxesAndFptForSimpleProductWithCanadianPstOriginTest.xml

@@ -17,8 +17,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="AC-4061"/>
             <group value="tax_isolated" />
-            <!-- Will be fixed in the scope of ACQE-6423 -->
-            <group value="pr_exclude" />
         </annotations>
         <before>
              <!-- Create a new user with canadian address -->
@@ -125,32 +123,16 @@
             <!-- delete created Two Tax Rates & Rules -->
             <!-- delete first tax rule and rate -->
             <!--Go to the tax rule page and delete the row created-->
-            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteFirstRule">
-                <argument name="name" value="Canada-GST-5%"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
+                <argument name="taxRuleCode" value="Canada-GST-5%" />
             </actionGroup>
-            <!-- Go to the tax rate page -->
-            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
-            <!-- Delete the tax rate that was created -->
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteTaxRate">
-                <argument name="name" value="Canada-GST-5%"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteSecondRule">
+                <argument name="taxRuleCode" value="Canada-GST-PST-5%" />
             </actionGroup>
-            <!-- delete second tax rule and rate -->
-            <!--Go to the tax rule page and delete the row created-->
-            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToSecondTaxRulesPage"/>
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteSecondRule">
-                <argument name="name" value="Canada-GST-PST-5%"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
-            </actionGroup>
-            <!-- Go to the tax rate page -->
-            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToSecondTaxRatesPage"/>
-            <!-- Delete the tax rate that was created -->
-            <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteSecondTaxRate">
-                <argument name="name" value="Canada-GST-PST-5%"/>
-                <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
+            <actionGroup ref="AdminDeleteMultipleTaxRatesActionGroup" stepKey="deleteAllNonDefaultTaxRates">
+                <argument name="expectedRemainingRows" value="0"/>
             </actionGroup>
+
             <!-- Reset shipping origin -->
             <actionGroup ref="AdminResetShippingOriginConfigurationActionGroup" stepKey="ResetCaliforniaShippingOrigin"/>
             <!-- delete created attribute category and simple product -->