Skip to content

Commit d7152ac

Browse files
gabrieldagamagabrieldagama
authored
ENGCOM-8192: [MFTF] add new AdminDeleteTaxRateActionGroup #29929 
2 parents 4d73b70 + 6658a92 commit d7152ac

9 files changed

+79
-38
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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="AdminDeleteTaxRateActionGroup">
12+
<annotations>
13+
<description>Delete Tax Rate.</description>
14+
</annotations>
15+
<click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDeleteRate"/>
16+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOk"/>
17+
</actionGroup>
18+
</actionGroups>

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="AdminFilterTaxRateByCodeActionGroup">
12+
<annotations>
13+
<description>Filter Tax Rates by tax rate code.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="taxRateCode" type="string"/>
17+
</arguments>
18+
19+
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCode}}" stepKey="fillNameFilter"/>
20+
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
21+
<waitForPageLoad stepKey="waitForTaxRuleSearch"/>
22+
</actionGroup>
23+
</actionGroups>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
26-
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
27-
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
28-
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
29-
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
30-
<click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
31-
<click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
26+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
27+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
28+
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
29+
</actionGroup>
30+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
31+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3232
</after>
3333

3434
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
26-
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
27-
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
28-
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
29-
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
30-
<click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
31-
<click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
26+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
27+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
28+
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
29+
</actionGroup>
30+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
31+
32+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3233
</after>
3334

3435
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
26-
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
27-
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
28-
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
29-
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
30-
<click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
31-
<click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
26+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
27+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
28+
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
29+
</actionGroup>
30+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
31+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3232
</after>
3333

3434
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
26-
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
27-
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
28-
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
29-
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
30-
<click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
31-
<click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
26+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
27+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
28+
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
29+
</actionGroup>
30+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
31+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3232
</after>
3333

3434
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
26-
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
27-
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
28-
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
29-
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
30-
<click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
31-
<click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
26+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
27+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
28+
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
29+
</actionGroup>
30+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
31+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3232
</after>
3333

3434
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525

2626
<!-- Search the tax rate on tax grid page -->
2727
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
28-
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
29-
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
30-
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
31-
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow1"/>
28+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
29+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
30+
<argument name="taxRateCode" value="$$initialTaxRate.code$$" />
31+
</actionGroup>
32+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
33+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3234

33-
<!-- Delete values on the tax rate form page -->
34-
<click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
35-
<click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
3635
<see selector="{{AdminMessagesSection.success}}" userInput="You Deleted the tax rate." stepKey="seeSuccess1"/>
3736

3837
<!-- Confirm Deleted TaxIdentifier(from the above step) on the tax rate grid page -->

‎app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminDataGridTableSection">
12-
<element name="firstRow" type="button" selector="tr.data-row:nth-of-type(1)" timeout="60"/>
12+
<element name="firstRow" type="button" selector="table.data-grid tbody > tr:nth-of-type(1)" timeout="60"/>
1313
<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"/>
1414
<element name="column" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{col}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
1515
<element name="rowCheckbox" type="checkbox" selector="table.data-grid tbody > tr:nth-of-type({{row}}) td.data-grid-checkbox-cell input" parameterized="true"/>

0 commit comments

Comments
 (0)