Skip to content

Commit 02ef2f9

Browse files
kate-kyzymakate-kyzyma
committed
Fixing issues
1 parent e8e92ac commit 02ef2f9

File tree

5 files changed

+20
-25
lines changed

5 files changed

+20
-25
lines changed

app/code/Magento/User/Test/Mftf/ActionGroup/AssertRoleInGridActionGroup.xml renamed to app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminRoleInGridActionGroup.xml

Lines changed: 2 additions & 2 deletions
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="AssertRoleInGridActionGroup">
10+
<actionGroup name="AssertAdminRoleInGridActionGroup">
1111
<arguments>
1212
<argument name="roleName" type="string"/>
1313
</arguments>
@@ -17,4 +17,4 @@
1717
<waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
1818
<see selector="{{AdminRoleGridSection.roleNameInFirstRow}}" userInput="{{roleName}}" stepKey="seeTheRole"/>
1919
</actionGroup>
20-
</actionGroups>
20+
</actionGroups>

app/code/Magento/User/Test/Mftf/ActionGroup/AssertRoleNotInGridActionGroup.xml renamed to app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminRoleNotInGridActionGroup.xml

Lines changed: 2 additions & 2 deletions
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="AssertRoleNotInGridActionGroup">
10+
<actionGroup name="AssertAdminRoleNotInGridActionGroup">
1111
<arguments>
1212
<argument name="roleName" type="string"/>
1313
</arguments>
@@ -17,4 +17,4 @@
1717
<waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
1818
<see selector="{{AdminRoleGridSection.emptyRecords}}" userInput="We couldn't find any records." stepKey="seeEmptyRecordMessage"/>
1919
</actionGroup>
20-
</actionGroups>
20+
</actionGroups>

‎app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818
<data key="resourceAccess">All</data>
1919
<data key="resources">[]</data>
2020
</entity>
21-
<entity name="roleAdmin" type="role">
22-
<data key="name" unique="suffix">Admin </data>
23-
<data key="resourceAccess">All</data>
24-
<data key="resources">[]</data>
25-
</entity>
2621
<entity name="roleSales" type="role">
2722
<data key="name" unique="suffix">Role Sales </data>
2823
<data key="resourceAccess">Custom</data>

‎app/code/Magento/User/Test/Mftf/Test/AdminCreateUserRoleEntityTest.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
3535
<argument name="message" value="You saved the role."/>
3636
</actionGroup>
37-
<actionGroup ref="AssertRoleInGridActionGroup" stepKey="assertRoleInGrid">
37+
<actionGroup ref="AssertAdminRoleInGridActionGroup" stepKey="assertRoleInGrid">
38+
<argument name="roleName" value="{{roleSales.name}}"/>
39+
</actionGroup>
40+
<!--Delete New Roles-->
41+
<actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteSaleRole">
3842
<argument name="roleName" value="{{roleSales.name}}"/>
3943
</actionGroup>
4044

@@ -47,31 +51,28 @@
4751
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessageSecondTime">
4852
<argument name="message" value="You saved the role."/>
4953
</actionGroup>
50-
<actionGroup ref="AssertRoleInGridActionGroup" stepKey="assertRoleInGridSecondTime">
54+
<actionGroup ref="AssertAdminRoleInGridActionGroup" stepKey="assertRoleInGridSecondTime">
55+
<argument name="roleName" value="{{roleAdministrator.name}}"/>
56+
</actionGroup>
57+
<!--Delete New Roles-->
58+
<actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteAdministratorRole">
5159
<argument name="roleName" value="{{roleAdministrator.name}}"/>
5260
</actionGroup>
5361

5462
<!--Create a new role using incorrect current_password-->
5563
<actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePageThirdTime"/>
5664
<actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleFormThirdTime">
57-
<argument name="role" value="roleAdmin"/>
58-
<argument name="currentAdminPassword" value="WrongPassword"/>
65+
<argument name="role" value="roleAdministrator"/>
66+
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID"/>
5967
</actionGroup>
6068
<actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRoleThirdTime"/>
6169
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertErrorMessage">
6270
<argument name="messageType" value="error"/>
6371
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again."/>
6472
</actionGroup>
65-
<actionGroup ref="AssertRoleNotInGridActionGroup" stepKey="assertRoleNotInGrid">
66-
<argument name="roleName" value="{{roleAdmin.name}}"/>
67-
</actionGroup>
68-
69-
<!--Delete New Roles-->
70-
<actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteSaleRole">
71-
<argument name="roleName" value="{{roleSales.name}}"/>
72-
</actionGroup>
73-
<actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteAdministratorRole">
73+
<actionGroup ref="AssertAdminRoleNotInGridActionGroup" stepKey="assertRoleNotInGrid">
7474
<argument name="roleName" value="{{roleAdministrator.name}}"/>
7575
</actionGroup>
76+
7677
</test>
77-
</tests>
78+
</tests>

‎dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\User\Test\TestCase\CreateAdminUserRoleEntityTest" summary="Create Admin User Role" ticketId="MAGETWO-23413">
1010
<variation name="CreateAdminUserRoleEntityTestVariation1">
11-
<data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
11+
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, mftf_migrated:yes</data>
1212
<data name="role/data/rolename" xsi:type="string">AdminRole%isolation%</data>
1313
<data name="role/data/current_password" xsi:type="string">%current_password%</data>
1414
<data name="role/data/resource_access" xsi:type="string">Custom</data>
1515
<data name="role/data/roles_resources" xsi:type="string">Sales</data>
1616
<constraint name="Magento\User\Test\Constraint\AssertRoleSuccessSaveMessage" />
1717
<constraint name="Magento\User\Test\Constraint\AssertRoleInGrid" />
18-
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
1918
</variation>
2019
<variation name="CreateAdminUserRoleEntityTestVariation2">
2120
<data name="role/data/rolename" xsi:type="string">AdminRole%isolation%</data>

0 commit comments

Comments
 (0)