Skip to content

Commit 204c4d9

Browse files
committed
some changes
1 parent 03932b5 commit 204c4d9

8 files changed

+9
-39
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
2828
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
2929
</actionGroup>
30-
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
31-
<argument name="row_number" value="1" />
32-
</actionGroup>
30+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
3331
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3432
</after>
3533

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
2828
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
2929
</actionGroup>
30-
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
31-
<argument name="row_number" value="1" />
32-
</actionGroup>
30+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
31+
3332
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3433
</after>
3534

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
2828
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
2929
</actionGroup>
30-
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
31-
<argument name="row_number" value="1" />
32-
</actionGroup>
30+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
3331
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3432
</after>
3533

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
2828
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
2929
</actionGroup>
30-
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
31-
<argument name="row_number" value="1" />
32-
</actionGroup>
30+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
3331
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3432
</after>
3533

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
2828
<argument name="taxRateCode" value="{{SimpleTaxRate.code}}" />
2929
</actionGroup>
30-
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
31-
<argument name="row_number" value="1" />
32-
</actionGroup>
30+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
3331
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3432
</after>
3533

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
<actionGroup ref="AdminFilterTaxRateByCodeActionGroup" stepKey="filterByCode">
3030
<argument name="taxRateCode" value="$$initialTaxRate.code$$" />
3131
</actionGroup>
32-
<actionGroup ref="AdminClickRowInGridActionGroup" stepKey="clickFirstRow">
33-
<argument name="row_number" value="1" />
34-
</actionGroup>
32+
<actionGroup ref="AdminSelectFirstGridRowActionGroup" stepKey="clickFirstRow"/>
3533
<actionGroup ref="AdminDeleteTaxRateActionGroup" stepKey="deleteTaxRate"/>
3634

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

app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminClickRowInGridActionGroup.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
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"/>
16-
<element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true" timeout="30"/>
16+
<element name="row" type="text" selector="table.data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
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)