Skip to content

Commit fe88f29

Browse files
eduard13eduard13
committed
Refactoring the Action Groups. Minor fixes
1 parent 01c96b8 commit fe88f29

9 files changed

+52
-16
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClickMainButtonActionGroup.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="AdminClickMainButtonActionGroup">
12+
<arguments>
13+
<argument name="button" type="string" />
14+
</arguments>
15+
<waitForElementVisible selector="{{button}}" stepKey="waitForButton"/>
16+
<click selector="{{button}}" stepKey="clickButton"/>
17+
<waitForPageLoad stepKey="waitForPageLoad"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminResetFilterActionGroup.xml renamed to ‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminResetGridFilterActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AdminResetFilterActionGroup">
11+
<actionGroup name="AdminResetGridFilterActionGroup">
1212
<arguments>
1313
<argument name="selector" type="string" defaultValue="{{AdminSecondaryGridSection.resetFilters}}"/>
1414
</arguments>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertValueInGridActionGroup.xml renamed to ‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertValueInAdminGridActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AssertValueInGridActionGroup">
10+
<actionGroup name="AssertValueInAdminGridActionGroup">
1111
<arguments>
1212
<argument name="value" type="string" />
1313
</arguments>

‎app/code/Magento/Backend/Test/Mftf/Section/AdminGridTableSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminGridTableSection">
1212
<element name="row" type="text" selector="table.data-grid tbody tr[data-role=row]:nth-of-type({{row}})" parameterized="true"/>
13-
<element name="rowByValue" type="text" selector="//tr[@data-role='row'] //td[contains(., '{{var}}')]" parameterized="true" timeout="30"/>
13+
<element name="rowByValue" type="text" selector="//table[@class='data-grid']//tr[@data-role='row'] //td[contains(., '{{var}}')]" parameterized="true" timeout="30"/>
1414
</section>
1515
</sections>

‎app/code/Magento/Variable/Test/Mftf/ActionGroup/AdminCreateCustomVariableActionGroup.xml renamed to ‎app/code/Magento/Variable/Test/Mftf/ActionGroup/AdminFillFormCustomVariableActionGroup.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminCreateCustomVariableActionGroup">
11-
<amOnPage url="admin/admin/system_variable/new/" stepKey="goToNewCustomVariablePage"/>
12-
<waitForPageLoad stepKey="waitForPageLoad"/>
10+
<actionGroup name="AdminFillFormCustomVariableActionGroup">
1311
<fillField selector="{{CustomVariableSection.variableCode}}" userInput="{{customVariable.code}}" stepKey="fillVariableCode"/>
1412
<fillField selector="{{CustomVariableSection.variableName}}" userInput="{{customVariable.name}}" stepKey="fillVariableName"/>
1513
<fillField selector="{{CustomVariableSection.variableHTML}}" userInput="{{customVariable.html}}" stepKey="fillVariableHtml"/>
1614
<fillField selector="{{CustomVariableSection.variablePlain}}" userInput="{{customVariable.plain}}" stepKey="fillVariablePlain"/>
17-
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveVariable"/>
18-
<waitForPageLoad stepKey="waitForPageLoad2"/>
1915
</actionGroup>
2016
</actionGroups>

‎app/code/Magento/Variable/Test/Mftf/ActionGroup/NavigateToNewVariablePageActionGroup.xml renamed to ‎app/code/Magento/Variable/Test/Mftf/ActionGroup/AdminNavigateToNewVariablePageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="NavigateToNewVariablePageActionGroup">
11+
<actionGroup name="AdminNavigateToNewVariablePageActionGroup">
1212
<amOnPage url="{{AdminNewVariablePage.url}}" stepKey="openNewVariablePage"/>
1313
<waitForPageLoad stepKey="waitForPageLoad"/>
1414
</actionGroup>

‎app/code/Magento/Variable/Test/Mftf/ActionGroup/AdminNavigateToVariablePageActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AdminNavigateToVariablePageActionGroup">
12+
<arguments>
13+
<argument name="code" type="string"/>
14+
</arguments>
15+
<click selector="{{CustomVariableSection.GridCustomVariableCode(code)}}" stepKey="goToCustomVariableEditPage"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Variable/Test/Mftf/ActionGroup/NavigateToVariablesPageActionGroup.xml renamed to ‎app/code/Magento/Variable/Test/Mftf/ActionGroup/AdminNavigateToVariablesGridPageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="NavigateToVariablesPage">
11+
<actionGroup name="AdminNavigateToVariablesGridPageActionGroup">
1212
<amOnPage url="{{AdminVariablesPage.url}}" stepKey="openVariablesGridPage"/>
1313
<waitForPageLoad stepKey="waitForPageLoad"/>
1414
</actionGroup>

‎app/code/Magento/Variable/Test/Mftf/Test/CreateCustomVariableEntityTest.xml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,15 @@
2121
<before>
2222
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2323
</before>
24-
<actionGroup ref="AdminCreateCustomVariableActionGroup" stepKey="createCustomVariable"/>
24+
<after>
25+
<actionGroup ref="AdminResetGridFilterActionGroup" stepKey="resetVariablesGrid"/>
26+
<actionGroup ref="logout" stepKey="logout"/>
27+
</after>
28+
<actionGroup ref="AdminNavigateToNewVariablePageActionGroup" stepKey="goToNewVariableAdminPage"/>
29+
<actionGroup ref="AdminFillFormCustomVariableActionGroup" stepKey="fillInCustomVariableData"/>
30+
<actionGroup ref="AdminClickMainButtonActionGroup" stepKey="clickSaveCustomVariable">
31+
<argument name="button" value="{{AdminMainActionsSection.save}}"/>
32+
</actionGroup>
2533
<actionGroup ref="AssertMessageActionGroup" stepKey="seeSuccessMessage">
2634
<argument name="message" value="You saved the custom variable."/>
2735
</actionGroup>
@@ -33,12 +41,8 @@
3341
<argument name="field" value="{{AdminVariablesFilterSection.nameFilter}}"/>
3442
<argument name="value" value="{{customVariable.name}}"/>
3543
</actionGroup>
36-
<actionGroup ref="AssertValueInGridActionGroup" stepKey="seeNewVariableInGrid">
44+
<actionGroup ref="AssertValueInAdminGridActionGroup" stepKey="seeNewVariableInGrid">
3745
<argument name="value" value="{{customVariable.code}}"/>
3846
</actionGroup>
39-
<after>
40-
<actionGroup ref="AdminResetFilterActionGroup" stepKey="resetVariablesGrid"/>
41-
<actionGroup ref="logout" stepKey="logout"/>
42-
</after>
4347
</test>
4448
</tests>

0 commit comments

Comments
 (0)