Skip to content

Commit c305e11

Browse files
atwix-frameworkatwix-framework
committed
Refactoring
1 parent 61baafc commit c305e11

File tree

6 files changed

+76
-29
lines changed

6 files changed

+76
-29
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnBackendActionGroup.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="AssertMessageOnBackendActionGroup">
12+
<arguments>
13+
<argument name="message" type="string" defaultValue="The password entered for the current user is invalid. Verify the password and try again." />
14+
<argument name="messageType" type="string" defaultValue="error" />
15+
</arguments>
16+
<see userInput="{{message}}" selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
17+
</actionGroup>
18+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
<element name="nthSuccess" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
1414
<element name="error" type="text" selector="#messages div.message-error"/>
1515
<element name="notice" type="text" selector=".message.message-notice.notice"/>
16+
<element name="messageByType" type="text" selector="#messages div.message-{{messageType}}" parameterized="true" />
1617
</section>
1718
</sections>

‎app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,46 @@
2727
<magentoCLI command="admin:user:unlock {{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="unlockAdminUser"/>
2828
</after>
2929
<!-- Perform add new role 6 specified number of times. -->
30-
<actionGroup ref="AdminCreateRoleRequiredFieldsActionGroup" stepKey="failedSaveRoleFirstAttempt">
30+
<actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="openCreateRolePage"/>
31+
32+
<actionGroup ref="AdminFillRoleRequiredFieldsActionGroup" stepKey="fillFieldFirstAttempt">
3133
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
32-
<argument name="messageSelector" value="{{AdminMessagesSection.error}}" />
33-
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
3434
</actionGroup>
35-
<actionGroup ref="AdminCreateRoleRequiredFieldsActionGroup" stepKey="failedSaveRoleSecondAttempt">
35+
<actionGroup ref="AssertSaveRoleActionGroup" stepKey="saveRoleFirstAttempt"/>
36+
<actionGroup ref="AssertMessageOnBackendActionGroup" stepKey="checkFirstSaveRoleError"/>
37+
38+
<actionGroup ref="AdminFillRoleRequiredFieldsActionGroup" stepKey="fillFieldSecondAttempt">
3639
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
37-
<argument name="messageSelector" value="{{AdminMessagesSection.error}}" />
38-
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
3940
</actionGroup>
40-
<actionGroup ref="AdminCreateRoleRequiredFieldsActionGroup" stepKey="failedSaveRoleThirdAttempt">
41+
<actionGroup ref="AssertSaveRoleActionGroup" stepKey="saveRoleSecondAttempt"/>
42+
<actionGroup ref="AssertMessageOnBackendActionGroup" stepKey="checkSecondSaveRoleError"/>
43+
44+
<actionGroup ref="AdminFillRoleRequiredFieldsActionGroup" stepKey="fillFieldThirdAttempt">
4145
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
42-
<argument name="messageSelector" value="{{AdminMessagesSection.error}}" />
43-
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
4446
</actionGroup>
45-
<actionGroup ref="AdminCreateRoleRequiredFieldsActionGroup" stepKey="failedSaveRoleFourthAttempt">
47+
<actionGroup ref="AssertSaveRoleActionGroup" stepKey="saveRoleThirdAttempt"/>
48+
<actionGroup ref="AssertMessageOnBackendActionGroup" stepKey="checkThirdSaveRoleError"/>
49+
50+
<actionGroup ref="AdminFillRoleRequiredFieldsActionGroup" stepKey="fillFieldFourthAttempt">
4651
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
47-
<argument name="messageSelector" value="{{AdminMessagesSection.error}}" />
48-
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
4952
</actionGroup>
50-
<actionGroup ref="AdminCreateRoleRequiredFieldsActionGroup" stepKey="failedSaveRoleFifthAttempt">
53+
<actionGroup ref="AssertSaveRoleActionGroup" stepKey="saveRoleFourthAttempt"/>
54+
<actionGroup ref="AssertMessageOnBackendActionGroup" stepKey="checkFourthSaveRoleError"/>
55+
56+
<actionGroup ref="AdminFillRoleRequiredFieldsActionGroup" stepKey="fillFieldFifthAttempt">
5157
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
52-
<argument name="messageSelector" value="{{AdminMessagesSection.error}}" />
53-
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
5458
</actionGroup>
55-
<actionGroup ref="AdminCreateRoleRequiredFieldsActionGroup" stepKey="failedSaveRoleSixthAttempt">
59+
<actionGroup ref="AssertSaveRoleActionGroup" stepKey="saveRoleFifthAttempt"/>
60+
<actionGroup ref="AssertMessageOnBackendActionGroup" stepKey="checkFifthSaveRoleError"/>
61+
62+
<actionGroup ref="AdminFillRoleRequiredFieldsActionGroup" stepKey="fillFieldSixthAttempt">
5663
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
57-
<argument name="messageSelector" value="{{AdminLoginFormSection.error}}" />
58-
<argument name="message" value="Your account is temporarily disabled. Please try again later." />
5964
</actionGroup>
65+
<actionGroup ref="AssertSaveRoleActionGroup" stepKey="saveRoleSixthAttempt"/>
66+
<actionGroup ref="AssertAdminNotSuccessLoginActionGroup" stepKey="checkFifthError">
67+
<argument name="message" value="Your account is temporarily disabled. Please try again later."/>
68+
</actionGroup>
69+
6070
<!-- Try to login as admin and check error -->
6171
<actionGroup ref="LoginAsAdmin" stepKey="loginAsLockedAdmin"/>
6272
<actionGroup ref="AssertAdminNotSuccessLoginActionGroup" stepKey="checkLoginError"/>

‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleRequiredFieldsActionGroup.xml renamed to ‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillRoleRequiredFieldsActionGroup.xml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,14 @@
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="AdminCreateRoleRequiredFieldsActionGroup">
10+
<actionGroup name="AdminFillRoleRequiredFieldsActionGroup">
1111
<arguments>
1212
<argument name="roleName" type="string" defaultValue="{{adminRole.name}}"/>
1313
<argument name="currentAdminPassword" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
1414
<argument name="message" type="string" defaultValue="You saved the role." />
1515
<argument name="messageSelector" type="string" defaultValue="{{AdminMessagesSection.success}}" />
1616
</arguments>
17-
18-
<!-- Open Admin New Role Page -->
19-
<amOnPage url="{{AdminEditRolePage.url}}" stepKey="amOnNewAdminRolePage"/>
20-
<waitForPageLoad stepKey="waitForNewAdminRolePageLoad"/>
21-
22-
<!-- Fill required fields -->
2317
<fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{roleName}}" stepKey="fillRoleName"/>
2418
<fillField selector="{{AdminCreateRoleSection.password}}" userInput="{{currentAdminPassword}}" stepKey="fillCurrentUserPassword"/>
25-
<click selector="{{AdminCreateRoleSection.save}}" stepKey="saveNewRole"/>
26-
<waitForPageLoad stepKey="waitForSaveResultLoad"/>
27-
28-
<see userInput="{{message}}" selector="{{messageSelector}}" stepKey="verifyMessage" />
2919
</actionGroup>
3020
</actionGroups>

‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenCreateRolePageActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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="AdminOpenCreateRolePageActionGroup">
11+
<amOnPage url="{{AdminEditRolePage.url}}" stepKey="amOnNewAdminRolePage"/>
12+
<waitForPageLoad stepKey="waitForNewAdminRolePageLoad"/>
13+
</actionGroup>
14+
</actionGroups>

‎app/code/Magento/User/Test/Mftf/ActionGroup/AssertSaveRoleActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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="AssertSaveRoleActionGroup">
11+
<click selector="{{AdminCreateRoleSection.save}}" stepKey="saveRole"/>
12+
<waitForPageLoad stepKey="waitForSaveResultLoad"/>
13+
</actionGroup>
14+
</actionGroups>

0 commit comments

Comments
 (0)