Skip to content

Commit 8e16a67

Browse files
Lusine-PapyanLusine-Papyan
committed
MAGETWO-69893: Error appears when restricted user tries to add new category from product page
- Updated automated test script
1 parent 4b8dcbc commit 8e16a67

File tree

7 files changed

+47
-23
lines changed

7 files changed

+47
-23
lines changed

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@
3838
<waitForPageLoad stepKey="waitForSaveUser" time="10"/>
3939
<see userInput="You saved the user." stepKey="seeSuccessMessage" />
4040
</actionGroup>
41-
4241
<!--Delete User-->
4342
<actionGroup name="AdminDeleteNewUserActionGroup">
44-
45-
<click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
46-
<fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
43+
<arguments>
44+
<argument name="userName" type="string" defaultValue="John"/>
45+
</arguments>
46+
<click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser(userName)}}"/>
47+
<fillField stepKey="typeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
4748
<scrollToTopOfPage stepKey="scrollToTop"/>
4849
<click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
4950
<waitForPageLoad stepKey="waitForDeletePopupOpen" time="5"/>
5051
<click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
5152
<waitForPageLoad stepKey="waitForPageLoad" time="10"/>
5253
<see userInput="You deleted the user." stepKey="seeSuccessMessage" />
5354
</actionGroup>
54-
5555
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,19 @@
3131
<argument name="sku" value="{{_defaultProduct.sku}}"/>
3232
</actionGroup>
3333
<actionGroup ref="resetProductGridToDefaultView" stepKey="resetFiltersIfExist"/>
34-
<actionGroup ref="SignOut" stepKey="signOut"/>
34+
<actionGroup ref="logout" stepKey="logoutOfUser"/>
3535
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
3636
<!--Delete created data-->
3737
<comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
38-
<actionGroup ref="AdminDeleteCreatedRoleActionGroup" stepKey="deleteUserRole">
38+
<amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToUserRoleGrid" />
39+
<waitForPageLoad stepKey="waitForRolesGridLoad" />
40+
<actionGroup ref="AdminDeleteRoleActionGroup" stepKey="deleteUserRole">
3941
<argument name="role" value="adminRole"/>
4042
</actionGroup>
41-
<actionGroup ref="AdminDeleteCreatedUserActionGroup" stepKey="deleteUser">
42-
<argument name="user" value="newAdmin"/>
43+
<amOnPage url="{{AdminUsersPage.url}}" stepKey="goToAllUsersPage"/>
44+
<waitForPageLoad stepKey="waitForUsersGridLoad" />
45+
<actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="deleteUser">
46+
<argument name="userName" value="{{admin2.username}}"/>
4347
</actionGroup>
4448
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
4549
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
@@ -65,14 +69,13 @@
6569
<comment userInput="Create user and assign role to it" stepKey="commentCreateUser"/>
6670
<actionGroup ref="AdminCreateUserActionGroup" stepKey="createAdminUser">
6771
<argument name="role" value="adminRole"/>
68-
<argument name="User" value="newAdmin"/>
72+
<argument name="User" value="admin2"/>
6973
</actionGroup>
7074
<!--Log out of admin and login with newly created user-->
7175
<comment userInput="Log out of admin and login with newly created user" stepKey="commentLoginWithNewUser"/>
72-
<actionGroup ref="SignOut" stepKey="signOut"/>
73-
<actionGroup ref="LoginAsAnyUser" stepKey="loginActionGroup">
74-
<argument name="uname" value="{{newAdmin.username}}"/>
75-
<argument name="passwd" value="{{newAdmin.password}}"/>
76+
<actionGroup ref="logout" stepKey="logoutOfAdmin"/>
77+
<actionGroup ref="LoginNewUser" stepKey="loginActionGroup">
78+
<argument name="user" value="admin2"/>
7679
</actionGroup>
7780
<!--Go to create product page-->
7881
<comment userInput="Go to create product page" stepKey="commentGoCreateProductPage"/>

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/SwitchAccountActionGroup.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@
1919

2020
<!--Login New User-->
2121
<actionGroup name="LoginNewUser">
22+
<arguments>
23+
<argument name="user" defaultValue="NewAdmin"/>
24+
</arguments>
2225
<amOnPage url="{{_ENV.MAGENTO_BACKEND_NAME}}" stepKey="navigateToAdmin"/>
23-
<fillField userInput="{{NewAdmin.username}}" selector="{{LoginFormSection.username}}" stepKey="fillUsername"/>
24-
<fillField userInput="{{NewAdmin.password}}" selector="{{LoginFormSection.password}}" stepKey="fillPassword"/>
26+
<fillField userInput="{{user.username}}" selector="{{LoginFormSection.username}}" stepKey="fillUsername"/>
27+
<fillField userInput="{{user.password}}" selector="{{LoginFormSection.password}}" stepKey="fillPassword"/>
2528
<click selector="{{LoginFormSection.signIn}}" stepKey="clickLogin"/>
2629
</actionGroup>
2730
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<remove keyForRemoval="fillRoleName"/>
4040
<remove keyForRemoval="enterPassword"/>
4141
<remove keyForRemoval="clickRoleResourcesTab"/>
42+
<remove keyForRemoval="waitForScopeSelection"/>
4243
<remove keyForRemoval="clickSaveRoleButton"/>
4344
<remove keyForRemoval="waitForPageLoad2"/>
4445
<scrollTo selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}" x="0" y="-100" stepKey="scrollToResourceElement" after="selectResourceAccessCustom"/>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<amOnPage url="{{AdminUsersPage.url}}" stepKey="amOnAdminUsersPage"/>
1616
<waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
1717
<click selector="{{AdminCreateUserSection.create}}" stepKey="clickToCreateNewUser"/>
18-
<fillField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{newAdmin.username}}" stepKey="enterUserName" />
19-
<fillField selector="{{AdminEditUserSection.firstNameTextField}}" userInput="{{newAdmin.firstName}}" stepKey="enterFirstName" />
20-
<fillField selector="{{AdminEditUserSection.lastNameTextField}}" userInput="{{newAdmin.lastName}}" stepKey="enterLastName" />
21-
<fillField selector="{{AdminEditUserSection.emailTextField}}" userInput="{{newAdmin.username}}@magento.com" stepKey="enterEmail" />
22-
<fillField selector="{{AdminEditUserSection.passwordTextField}}" userInput="{{newAdmin.password}}" stepKey="enterPassword" />
23-
<fillField selector="{{AdminEditUserSection.pwConfirmationTextField}}" userInput="{{newAdmin.password}}" stepKey="confirmPassword" />
18+
<fillField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{User.username}}" stepKey="enterUserName" />
19+
<fillField selector="{{AdminEditUserSection.firstNameTextField}}" userInput="{{User.firstName}}" stepKey="enterFirstName" />
20+
<fillField selector="{{AdminEditUserSection.lastNameTextField}}" userInput="{{User.lastName}}" stepKey="enterLastName" />
21+
<fillField selector="{{AdminEditUserSection.emailTextField}}" userInput="{{User.username}}@magento.com" stepKey="enterEmail" />
22+
<fillField selector="{{AdminEditUserSection.passwordTextField}}" userInput="{{User.password}}" stepKey="enterPassword" />
23+
<fillField selector="{{AdminEditUserSection.pwConfirmationTextField}}" userInput="{{User.password}}" stepKey="confirmPassword" />
2424
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
2525
<scrollToTopOfPage stepKey="scrollToTopOfPage" />
2626
<click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRole" />

‎app/code/Magento/User/Test/Mftf/Section/AdminEditRoleResourcesSection.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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
9+
<section name="AdminEditRoleResourcesSection">
10+
<element name="roleScopes" type="select" selector="#gws_is_all"/>
11+
<element name="resourceAccess" type="select" selector="#all"/>
12+
<element name="resources" type="checkbox" selector="#role_info_tabs_account"/>
13+
<element name="storeName" type="checkbox" selector="//label[contains(text(),'{{var1}}')]" parameterized="true"/>
14+
<element name="reportsCheckbox" type="text" selector="//li[@data-id='Magento_Reports::report']//a[text()='Reports']"/>
15+
<element name="userRoles" type="text" selector="//span[contains(text(), 'User Roles')]"/>
16+
</section>
17+
</sections>

‎app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</section>
1717

1818
<section name="AdminDeleteUserSection">
19-
<element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
19+
<element name="theUser" selector="//td[contains(text(), '{{userName}}')]" type="button" parameterized="true"/>
2020
<element name="password" selector="#user_current_password" type="input"/>
2121
<element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
2222
<element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>

0 commit comments

Comments
 (0)