Skip to content

Commit 03e0313

Browse files
okolesnykokolesnyk
committed
Test improvements:
- removed duplicate action groups - added test case id - updated annotations - issue magento/magento-functional-tests-migration/381 - pull request magento/magento-functional-tests-migration/699
1 parent 1399502 commit 03e0313

9 files changed

+80
-82
lines changed

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

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

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

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

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminFillIntegrationFormActionGroup.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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="AdminFillIntegrationFormActionGroup">
11+
<arguments>
12+
<argument name="integration" type="entity" />
13+
<argument name="currentAdminPassword" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" />
14+
</arguments>
15+
16+
<fillField selector="{{AdminNewIntegrationFormSection.integrationName}}" userInput="{{integration.name}}" stepKey="fillIntegrationName"/>
17+
<fillField selector="{{AdminNewIntegrationFormSection.currentPassword}}" userInput="{{currentAdminPassword}}" stepKey="fillCurrentUserPassword"/>
18+
19+
<click selector="{{AdminNewIntegrationFormSection.apiTab}}" stepKey="clickToOpenApiTab"/>
20+
<waitForPageLoad stepKey="waitForApiTab" />
21+
22+
<selectOption userInput="{{integration.resourceAccess}}" selector="{{AdminNewIntegrationFormSection.resourceAccess}}" stepKey="selectResourceAccess" />
23+
<performOn stepKey="checkNeededResources" selector="{{AdminNewIntegrationFormSection.resourceTree}}" function="function($I,$apiResources={{integration.resources}}){foreach($apiResources as $apiResource){$I->conditionalClick('//li[@data-id=\'' . $apiResource . '\']//*[@class=\'jstree-checkbox\']','//li[@data-id=\'' . $apiResource . '\' and contains(@class, \'jstree-checked\')]',false);}}" />
24+
</actionGroup>
25+
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminFillIntegrationRequiredFieldsActionGroup.xml

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

‎app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminSaveIntegrationActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
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="AdminSaveIntegrationActionGroup">
11-
<click selector="{{AdminNewIntegrationSection.save}}" stepKey="saveIntegration"/>
10+
<actionGroup name="AdminClickSaveButtonIntegrationFormActionGroup">
11+
<click selector="{{AdminNewIntegrationFormSection.save}}" stepKey="saveIntegration"/>
1212
<waitForPageLoad stepKey="waitForSaveResultLoad"/>
1313
</actionGroup>
1414
</actionGroups>

‎app/code/Magento/Integration/Test/Mftf/Data/IntegrationData.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11-
<entity name="IntegrationData" type="admin">
12-
<data key="name" unique="prefix">_Integration</data>
11+
<entity name="defaultIntegrationData">
12+
<data key="name" unique="prefix"> Integration</data>
13+
<data key="resourceAccess">All</data>
14+
<data key="resources">[]</data>
1315
</entity>
1416
</entities>

‎app/code/Magento/Integration/Test/Mftf/Page/AdminNewIntegrationPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="AdminNewIntegrationPage" url="admin/integration/new/" area="admin" module="Magento_Integration">
12-
<section name="AdminNewIntegrationSection"/>
12+
<section name="AdminNewIntegrationFormSection"/>
1313
</page>
1414
</pages>

‎app/code/Magento/Integration/Test/Mftf/Section/AdminNewIntegrationSection.xml renamed to ‎app/code/Magento/Integration/Test/Mftf/Section/AdminNewIntegrationFormSection.xml

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

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11-
<section name="AdminNewIntegrationSection">
11+
<section name="AdminNewIntegrationFormSection">
12+
<element name="integrationInfoTab" type="block" selector="#integration_edit_tabs #integration_edit_tabs_info_section" />
1213
<element name="integrationName" type="input" selector="#edit_form input[name='name']"/>
1314
<element name="currentPassword" type="input" selector="#edit_form input[name='current_password']"/>
15+
16+
<element name="apiTab" type="block" selector="#integration_edit_tabs #integration_edit_tabs_api_section" />
17+
<element name="resourceAccess" type="select" selector="[data-ui-id='integration-edit-tabs-tab-content-api-section'] [name='all_resources']" />
18+
<element name="resourceTree" type="block" selector="[data-ui-id='integration-edit-tabs-tab-content-api-section'] [data-role='resource-tree']"/>
19+
1420
<element name="save" type="button" selector="#save-split-button-button"/>
1521
</section>
1622
</sections>

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

Lines changed: 41 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<title value="Lock admin user when creating new integration"/>
1616
<description value="Runs Lock admin user when creating new integration test."/>
1717
<severity value="MAJOR"/>
18+
<testCaseId value="MC-14382" />
1819
<group value="security"/>
1920
<group value="mtf_migrated"/>
2021
</annotations>
@@ -30,47 +31,68 @@
3031
<actionGroup ref="AdminOpenNewIntegrationPageActionGroup" stepKey="openNewIntegrationPage"/>
3132
<!-- Perform add new admin user 6 specified number of times.
3233
"The password entered for the current user is invalid. Verify the password and try again." appears after each attempt.-->
33-
<actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldFirstAttempt">
34+
<actionGroup ref="AdminFillIntegrationFormActionGroup" stepKey="fillFieldFirstAttempt">
35+
<argument name="integration" value="defaultIntegrationData" />
3436
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
3537
</actionGroup>
36-
<actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationFirstAttempt"/>
37-
<actionGroup ref="AssertMessageOnAdminActionGroup" stepKey="checkFirstSaveIntegrationError"/>
38+
<actionGroup ref="AdminClickSaveButtonIntegrationFormActionGroup" stepKey="saveIntegrationFirstAttempt"/>
39+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="checkFirstSaveIntegrationError">
40+
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
41+
<argument name="messageType" value="error" />
42+
</actionGroup>
3843

39-
<actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldSecondAttempt">
44+
<actionGroup ref="AdminFillIntegrationFormActionGroup" stepKey="fillFieldSecondAttempt">
45+
<argument name="integration" value="defaultIntegrationData" />
4046
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
4147
</actionGroup>
42-
<actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationSecondAttempt"/>
43-
<actionGroup ref="AssertMessageOnAdminActionGroup" stepKey="checkSecondSaveIntegrationError"/>
48+
<actionGroup ref="AdminClickSaveButtonIntegrationFormActionGroup" stepKey="saveIntegrationSecondAttempt"/>
49+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="checkSecondSaveIntegrationError">
50+
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
51+
<argument name="messageType" value="error" />
52+
</actionGroup>
4453

45-
<actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldThirdAttempt">
54+
<actionGroup ref="AdminFillIntegrationFormActionGroup" stepKey="fillFieldThirdAttempt">
55+
<argument name="integration" value="defaultIntegrationData" />
4656
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
4757
</actionGroup>
48-
<actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationThirdAttempt"/>
49-
<actionGroup ref="AssertMessageOnAdminActionGroup" stepKey="checkThirdSaveIntegrationError"/>
58+
<actionGroup ref="AdminClickSaveButtonIntegrationFormActionGroup" stepKey="saveIntegrationThirdAttempt"/>
59+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="checkThirdSaveIntegrationError">
60+
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
61+
<argument name="messageType" value="error" />
62+
</actionGroup>
5063

51-
<actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldFourthAttempt">
64+
<actionGroup ref="AdminFillIntegrationFormActionGroup" stepKey="fillFieldFourthAttempt">
65+
<argument name="integration" value="defaultIntegrationData" />
5266
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
5367
</actionGroup>
54-
<actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationFourthAttempt"/>
55-
<actionGroup ref="AssertMessageOnAdminActionGroup" stepKey="checkFourthSaveIntegrationError"/>
68+
<actionGroup ref="AdminClickSaveButtonIntegrationFormActionGroup" stepKey="saveIntegrationFourthAttempt"/>
69+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="checkFourthSaveIntegrationError">
70+
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
71+
<argument name="messageType" value="error" />
72+
</actionGroup>
5673

57-
<actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldFifthAttempt">
74+
<actionGroup ref="AdminFillIntegrationFormActionGroup" stepKey="fillFieldFifthAttempt">
75+
<argument name="integration" value="defaultIntegrationData" />
5876
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
5977
</actionGroup>
60-
<actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationFifthAttempt"/>
61-
<actionGroup ref="AssertMessageOnAdminActionGroup" stepKey="checkFifthSaveIntegrationError"/>
78+
<actionGroup ref="AdminClickSaveButtonIntegrationFormActionGroup" stepKey="saveIntegrationFifthAttempt"/>
79+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="checkFifthSaveIntegrationError">
80+
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
81+
<argument name="messageType" value="error" />
82+
</actionGroup>
6283

6384
<!-- Last invalid current password save integration attempt and check logout error -->
64-
<actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldLastAttempt">
85+
<actionGroup ref="AdminFillIntegrationFormActionGroup" stepKey="fillFieldLastAttempt">
86+
<argument name="integration" value="defaultIntegrationData" />
6587
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
6688
</actionGroup>
67-
<actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationLastAttempt"/>
68-
<actionGroup ref="AssertAdminLoginErrorMessageActionGroup" stepKey="checkFifthError">
89+
<actionGroup ref="AdminClickSaveButtonIntegrationFormActionGroup" stepKey="saveIntegrationLastAttempt"/>
90+
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkFifthError">
6991
<argument name="message" value="Your account is temporarily disabled. Please try again later."/>
7092
</actionGroup>
7193

7294
<!-- Try to login as admin and check error -->
7395
<actionGroup ref="LoginAsAdmin" stepKey="loginAsLockedAdmin"/>
74-
<actionGroup ref="AssertAdminLoginErrorMessageActionGroup" stepKey="checkLoginError"/>
96+
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginError" />
7597
</test>
7698
</tests>

0 commit comments

Comments
 (0)