Skip to content

Commit 70b1ff3

Browse files
okolesnykokolesnyk
committed
Test improvements:
 - test stabilization
1 parent d5fe1e5 commit 70b1ff3

17 files changed

+175
-97
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClickMainButtonActionGroup.xml renamed to ‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClickFormActionButtonActionGroup.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
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="AdminClickMainButtonActionGroup">
11+
<actionGroup name="AdminClickFormActionButtonActionGroup">
1212
<arguments>
13-
<argument name="button" type="string" />
14-
</arguments>
15-
<waitForElementVisible selector="{{button}}" stepKey="waitForButton"/>
16-
<click selector="{{button}}" stepKey="clickButton"/>
13+
<argument name="buttonSelector" type="string" />
14+
</arguments>
15+
<waitForElementVisible selector="{{buttonSelector}}" stepKey="waitForButton"/>
16+
<click selector="{{buttonSelector}}" stepKey="clickButton"/>
1717
<waitForPageLoad stepKey="waitForPageLoad"/>
1818
</actionGroup>
1919
</actionGroups>

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterGridActionGroup.xml renamed to ‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminFilterLegacyGridActionGroup.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
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="AdminFilterGridActionGroup">
11+
<actionGroup name="AdminFilterLegacyGridActionGroup">
1212
<arguments>
13-
<argument name="field" type="string"/>
13+
<argument name="fieldSelector" type="string"/>
1414
<argument name="value" type="string"/>
15-
<argument name="button" type="string" defaultValue="{{AdminSecondaryGridSection.searchButton}}"/>
15+
<argument name="button" type="string" defaultValue="{{AdminLegacyDataGridFilterSection.apply}}"/>
1616
</arguments>
17+
<click selector="{{AdminLegacyDataGridFilterSection.clear}}" stepKey="resetFilters" />
18+
<waitForPageLoad stepKey="waitForFilterReset" />
1719
<fillField selector="{{field}}" userInput="{{value}}" stepKey="fillFieldInFilter"/>
1820
<click selector="{{button}}" stepKey="clickSearchButton"/>
21+
<waitForPageLoad stepKey="waitForFiltersApply" />
1922
</actionGroup>
2023
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
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="AdminResetGridFilterActionGroup">
11+
<actionGroup name="AdminResetLegacyGridFilterActionGroup">
1212
<arguments>
13-
<argument name="selector" type="string" defaultValue="{{AdminSecondaryGridSection.resetFilters}}"/>
13+
<argument name="selector" type="string" defaultValue="{{AdminLegacyDataGridFilterSection.clear}}"/>
1414
</arguments>
1515
<click selector="{{selector}}" stepKey="clickResetButton"/>
1616
</actionGroup>

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

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

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

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

‎app/code/Magento/Variable/Test/Mftf/ActionGroup/AdminFillVariableFormActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminFillVariableFormActionGroup">
11+
<arguments>
12+
<argument name="variable" />
13+
</arguments>
14+
<fillField selector="{{AdminVariableFormSection.code}}" userInput="{{variable.code}}" stepKey="fillVariableCode"/>
15+
<fillField selector="{{AdminVariableFormSection.name}}" userInput="{{variable.name}}" stepKey="fillVariableName"/>
16+
<fillField selector="{{AdminVariableFormSection.html}}" userInput="{{variable.html}}" stepKey="fillVariableHtml"/>
17+
<fillField selector="{{AdminVariableFormSection.plain}}" userInput="{{variable.plain}}" stepKey="fillVariablePlain"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="AdminFilterVariableGridActionGroup">
12+
<arguments>
13+
<argument name="variable" type="entity"/>
14+
</arguments>
15+
<click selector="{{AdminLegacyDataGridFilterSection.clear}}" stepKey="resetFilters" />
16+
<waitForPageLoad stepKey="waitForFilterReset" />
17+
<fillField selector="{{AdminVariableGridFilterSection.codeField}}" userInput="{{variable.code}}" stepKey="fillCodeFieldInFilter"/>
18+
<fillField selector="{{AdminVariableGridFilterSection.nameField}}" userInput="{{variable.name}}" stepKey="fillNameFieldInFilter"/>
19+
<click selector="{{AdminLegacyDataGridFilterSection.apply}}" stepKey="clickSearchButton"/>
20+
<waitForPageLoad stepKey="waitForFiltersApply" />
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
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="AdminNavigateToVariablePageActionGroup">
11+
<actionGroup name="AdminNavigateToVariablePageByCodeActionGroup">
1212
<arguments>
1313
<argument name="code" type="string"/>
1414
</arguments>
15-
<click selector="{{CustomVariableSection.GridCustomVariableCode(code)}}" stepKey="goToCustomVariableEditPage"/>
15+
<click selector="{{AdminLegacyDataGridTableSection.rowTemplateStrict(code)}}" stepKey="goToCustomVariableEditPage"/>
16+
<waitForPageLoad stepKey="waitForVariableEditPageOpen" />
1617
</actionGroup>
1718
</actionGroups>

‎app/code/Magento/Variable/Test/Mftf/ActionGroup/AdminNavigateToNewVariablePageActionGroup.xml renamed to ‎app/code/Magento/Variable/Test/Mftf/ActionGroup/AdminOpenNewVariablePageActionGroup.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="AdminNavigateToNewVariablePageActionGroup">
11+
<actionGroup name="AdminOpenNewVariablePageActionGroup">
1212
<amOnPage url="{{AdminNewVariablePage.url}}" stepKey="openNewVariablePage"/>
1313
<waitForPageLoad stepKey="waitForPageLoad"/>
1414
</actionGroup>

‎app/code/Magento/Variable/Test/Mftf/ActionGroup/AdminNavigateToVariablesGridPageActionGroup.xml renamed to ‎app/code/Magento/Variable/Test/Mftf/ActionGroup/AdminOpenVariablesGridPageActionGroup.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="AdminNavigateToVariablesGridPageActionGroup">
11+
<actionGroup name="AdminOpenVariablesGridPageActionGroup">
1212
<amOnPage url="{{AdminVariablesPage.url}}" stepKey="openVariablesGridPage"/>
1313
<waitForPageLoad stepKey="waitForPageLoad"/>
1414
</actionGroup>

0 commit comments

Comments
 (0)