Skip to content

Commit 05f5f37

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-7806: [MFTF] use ActionGroup go to AdminTaxRuleGridPage #29004
- Merge Pull Request #29004 from Usik2203/magento2:mftf-AdminTaxRuleGridPage-url - Merged commits: 1. 3d288c7 2. 89f88ff 3. a489a77
2 parents 2841088 + a489a77 commit 05f5f37

File tree

29 files changed

+59
-77
lines changed

29 files changed

+59
-77
lines changed

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2828

2929
<!-- Go to tax rule page -->
30-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
31-
<waitForPageLoad stepKey="waitForTaxRatePage"/>
30+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
3231
<click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
3332
<fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
3433

@@ -49,8 +48,7 @@
4948
</before>
5049
<after>
5150
<!-- Go to the tax rule page and delete the row we created-->
52-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
53-
<waitForPageLoad stepKey="waitForRulesPage"/>
51+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
5452
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
5553
<argument name="name" value="SampleRule"/>
5654
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,7 @@
115115
</after>
116116

117117
<!-- Create a Tax Rule -->
118-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
119-
<waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
118+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
120119
<click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
121120
<waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
122121

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@
101101

102102
<after>
103103
<!-- Go to the tax rule page and delete the row we created-->
104-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
105-
<waitForPageLoad stepKey="waitForRulesPage"/>
104+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
106105

107106
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
108107
<argument name="name" value="{{TaxRule.name}}"/>

‎app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
<createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
3535
<createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
3636
<!-- Go to tax rule page -->
37-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
38-
<waitForPageLoad stepKey="waitForTaxRatePage"/>
37+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
3938
<click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
4039
<fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
4140
<!-- Add tax rule with 20% tax rate -->
@@ -62,8 +61,7 @@
6261
</before>
6362
<after>
6463
<!-- Removed created Data -->
65-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
66-
<waitForPageLoad stepKey="waitForRulesPage"/>
64+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
6765
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
6866
<argument name="name" value="SampleRule"/>
6967
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>

‎app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxRuleGridOpenPageActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminTaxRuleGridOpenPageActionGroup">
12+
<annotations>
13+
<description>Go to tax rule grid page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleGridPage"/>
17+
<waitForPageLoad stepKey="waitForTaxRulePage"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Tax/Test/Mftf/Test/AdminCheckCreditMemoTotalsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<!-- Reset admin order filter -->
5151
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
5252
<!-- Go to the tax rule page and delete the row we created-->
53-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
53+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
5454
<actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
5555
<argument name="name" value="{{defaultTaxRule.code}}"/>
5656
<argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>

‎app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
<deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
3030
</after>
3131

32-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
33-
<waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
32+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
3433
<click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
3534
<waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
3635
<!-- Create a tax rule with defaults -->

‎app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@
6969
<seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="20.0000" stepKey="seeRate"/>
7070

7171
<!-- Go to the tax rule grid page and verify our tax rate can be used in the rule -->
72-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
73-
<waitForPageLoad stepKey="waitForTaxRuleIndex"/>
72+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
7473
<click selector="{{AdminGridMainControls.add}}" stepKey="clickAddNewTaxRule"/>
7574
<see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
7675
</test>

‎app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@
6060
<seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="999.0000" stepKey="seeRate"/>
6161

6262
<!-- Verify we see expected values on the tax rule form page -->
63-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
64-
<waitForPageLoad stepKey="waitForTaxRateIndex4"/>
63+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
6564
<click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
6665
<see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
6766
</test>

‎app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
<seeInField selector="{{AdminTaxRateFormSection.country}}" userInput="Canada" stepKey="seeCountry2"/>
5959

6060
<!-- Verify we see expected values on the tax rule form page -->
61-
<amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
62-
<waitForPageLoad stepKey="waitForTaxRateIndex4"/>
61+
<actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
6362
<click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
6463
<see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
6564
</test>

0 commit comments

Comments
 (0)