Skip to content

Commit 12994f6

Browse files
DianaRusinDianaRusin
committed
Merge remote-tracking branch 'origin/MAGETWO-86104' into 2.2-develop-pr35
2 parents b5630f9 + 8c44dc3 commit 12994f6

File tree

9 files changed

+130
-1
lines changed

9 files changed

+130
-1
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<element name="divByDataIndex" type="input" selector="div[data-index='{{var}}']" parameterized="true"/>
3333
<element name="attributeSetSearchCount" type="text" selector="div[data-index='attribute_set_id'] .admin__action-multiselect-search-count"/>
3434
<element name="attributeLabelByText" type="text" selector="//*[@class='admin__field']//span[text()='{{attributeLabel}}']" parameterized="true"/>
35+
<element name="addAttributeBtn" type="button" selector="#addAttribute"/>
3536
</section>
3637
<section name="ProductInWebsitesSection">
3738
<element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminDeleteUserActionGroup">
11+
<arguments>
12+
<argument name="user_restricted"/>
13+
</arguments>
14+
<amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToUserGrid" />
15+
<waitForPageLoad stepKey="waitForUserGridLoad" />
16+
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{user_restricted.username}}" stepKey="enterUserName" />
17+
<click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch" />
18+
<waitForPageLoad stepKey="waitForGridToLoad"/>
19+
<see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{user_restricted.username}}" stepKey="seeUser" />
20+
<click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="openUserEdit"/>
21+
<waitForPageLoad stepKey="waitForUserEditPageLoad"/>
22+
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterThePassword" />
23+
<click selector="{{AdminEditUserSection.deleteButton}}" stepKey="deleteUser"/>
24+
<waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
25+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
26+
<waitForPageLoad stepKey="waitForSave" />
27+
<see userInput="You deleted the user." stepKey="seeUserDeleteMessage"/>
28+
</actionGroup>
29+
</actionGroups>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,15 @@
1212
<data key="email">admin@magento.com</data>
1313
<data key="password">admin123</data>
1414
</entity>
15+
<entity name="restrictedWebUser" type="user">
16+
<data key="username" unique="suffix">restrictedWebUser</data>
17+
<data key="firstname">restricted</data>
18+
<data key="lastname">webUser</data>
19+
<data key="email" unique="prefix">restrictedWebUser@example.com</data>
20+
<data key="password">123123q</data>
21+
<data key="password_confirmation">123123q</data>
22+
<data key="interface_local">en_US</data>
23+
<data key="is_active">true</data>
24+
<data key="current_password">123123q</data>
25+
</entity>
1526
</entities>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="adminProductInWebsiteRole" type="user_role">
12+
<data key="rolename" unique="suffix">restrictedWebsiteRole</data>
13+
<data key="current_password">123123q</data>
14+
<array key="resource">
15+
<item>Magento_Catalog::catalog</item>
16+
<item>Magento_Catalog::catalog_inventory</item>
17+
<item>Magento_Catalog::products</item>
18+
<item>Magento_Catalog::categories</item>
19+
<item>Magento_Backend::stores</item>
20+
<item>Magento_Backend::stores_attributes</item>
21+
<item>Magento_Catalog::attributes_attributes</item>
22+
</array>
23+
</entity>
24+
<entity name="adminRestrictedProductRole" type="user_role">
25+
<data key="rolename" unique="suffix">restrictedCatalogRole</data>
26+
<data key="current_password">123123q</data>
27+
<array key="resource">
28+
<item>Magento_Catalog::catalog</item>
29+
<item>Magento_Catalog::catalog_inventory</item>
30+
<item>Magento_Catalog::products</item>
31+
</array>
32+
</entity>
33+
</entities>

‎app/code/Magento/User/Test/Mftf/Metadata/user-meta.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
10+
<operation name="CreateUser" dataType="user" type="create"
11+
auth="adminFormKey" url="/admin/user/save/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
12+
<contentType>application/x-www-form-urlencoded</contentType>
13+
<field key="username">string</field>
14+
<field key="firstname">string</field>
15+
<field key="lastname">string</field>
16+
<field key="email">string</field>
17+
<field key="password">string</field>
18+
<field key="password_confirmation">string</field>
19+
<field key="interface_locale">string</field>
20+
<field key="is_active">boolean</field>
21+
<field key="current_password">string</field>
22+
</operation>
23+
</operations>

‎app/code/Magento/User/Test/Mftf/Metadata/user_role-meta.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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
10+
<operation name="CreateUserRole" dataType="user_role" type="create"
11+
auth="adminFormKey" url="/admin/user_role/saverole/" method="POST" successRegex="/messages-message-success/" returnRegex="" >
12+
<contentType>application/x-www-form-urlencoded</contentType>
13+
<field key="rolename">string</field>
14+
<field key="current_password">string</field>
15+
<array key="resource">
16+
<value>string</value>
17+
</array>
18+
</operation>
19+
</operations>

‎app/code/Magento/User/Test/Mftf/Page/AdminEditRolePage.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
9+
<page name="AdminEditRolePage" url="admin/user_role/editrole" module="Magento_User" area="admin">
10+
<section name="AdminEditRoleInfoSection"/>
11+
</page>
12+
</pages>

‎app/code/Magento/User/Test/Mftf/Page/AdminEditUserPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
9-
<page name="AdminEditUserPage" url="admin/user/new" area="admin" module="Magento_User">
9+
<page name="AdminEditUserPage" url="admin/user/edit" area="admin" module="Magento_User">
1010
<section name="AdminEditUserSection"/>
1111
</page>
1212
</pages>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
<element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
1717
<element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
1818
<element name="saveButton" type="button" selector="#save"/>
19+
<element name="deleteButton" type="button" selector="#delete"/>
1920
</section>
2021
</sections>

0 commit comments

Comments
 (0)