Skip to content

Commit caaf469

Browse files
Usik2203Usik2203
committed
add code review recommendations
1 parent d0ba337 commit caaf469

10 files changed

+83
-22
lines changed

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,9 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminDeleteTaxRateActionGroup">
1212
<annotations>
13-
<description>Goes to the Admin Tax Rate grid page. Deletes the provided Tax Rate Code.</description>
13+
<description>Delete Tax Rate.</description>
1414
</annotations>
15-
<arguments>
16-
<argument name="taxRateCode" type="string"/>
17-
</arguments>
18-
19-
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
20-
<fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCode}}" stepKey="fillNameFilter"/>
21-
<click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
22-
<waitForPageLoad stepKey="waitForTaxRuleSearch"/>
23-
<click selector="{{AdminTaxRateGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
24-
<waitForPageLoad stepKey="waitForPageLoad"/>
25-
<click selector="{{AdminTaxRateFormSection.deleteRate}}" stepKey="clickDeleteRate"/>
26-
<click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
15+
<click selector="{{AdminMainActionsSection.delete}}" stepKey="clickDeleteRate"/>
16+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickOk"/>
2717
</actionGroup>
2818
</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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
26-
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
26+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
27+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
2728
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
2829
</actionGroup>
30+
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
31+
<argument name="row_number" value="1" />
32+
</actionGroup>
33+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
2934
</after>
3035

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

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
26-
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
26+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
27+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
2728
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
2829
</actionGroup>
30+
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
31+
<argument name="row_number" value="1" />
32+
</actionGroup>
33+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
2934
</after>
3035

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

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
26-
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
26+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
27+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
2728
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
2829
</actionGroup>
30+
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
31+
<argument name="row_number" value="1" />
32+
</actionGroup>
33+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
2934
</after>
3035

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

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
26-
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
26+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
27+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
2728
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
2829
</actionGroup>
30+
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
31+
<argument name="row_number" value="1" />
32+
</actionGroup>
33+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
2934
</after>
3035

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

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
26-
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
26+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
27+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
2728
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
2829
</actionGroup>
30+
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
31+
<argument name="row_number" value="1" />
32+
</actionGroup>
33+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
2934
</after>
3035

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

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

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

2626
<!-- Search the tax rate on tax grid page -->
2727
<actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
28-
29-
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate">
30-
<argument name="taxRateCode" value="{{initialTaxRate.code}}" />
28+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickClearFilters"/>
29+
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
30+
<argument name="taxRateCode" value="$$initialTaxRate.code$$" />
31+
</actionGroup>
32+
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
33+
<argument name="row_number" value="1" />
3134
</actionGroup>
35+
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3236

3337
<see selector="{{AdminMessagesSection.success}}" userInput="You Deleted the tax rate." stepKey="seeSuccess1"/>
3438

‎app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickRowInGridActionGroup.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="AdminClickRowInGridActionGroup">
12+
<arguments>
13+
<argument name="row_number" type="string"/>
14+
</arguments>
15+
16+
<click selector="{{AdminDataGridTableSection.row(row_number)}}" stepKey="clickOnFirstRow"/>
17+
<waitForPageLoad stepKey="waitForPageLoad"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
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"/>
16-
<element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
16+
<element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true" timeout="30"/>
1717
<element name="rows" type="text" selector="table.data-grid tbody > tr.data-row"/>
1818
<!--Specific cell e.g. {{Section.gridCell('1', 'Name')}}-->
1919
<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"/>

0 commit comments

Comments
 (0)