Merge remote-tracking branch 'remotes/github/MAGETWO-91688' into EPAM-PR-33

VeronikaYarats · VeronikaYarats · commit bb81e8be3316 · 2019-01-16T11:21:21.000+03:00
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml
@@ -7,6 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
     <actionGroup name="GoToUserRoles">
         <click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
         <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
@@ -15,18 +16,19 @@
     </actionGroup>
 
     <!--Create new role-->
-    <actionGroup name="AdminCreateRole">
+    <actionGroup name="AdminCreateNewRole">
         <arguments>
             <argument name="role" type="string" defaultValue=""/>
             <argument name="resource" type="string" defaultValue="All"/>
+            <argument name="scope" type="string" defaultValue="Custom"/>
+            <argument name="websites" type="string" defaultValue="Main Website"/>
         </arguments>
         <click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
         <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
         <fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
         <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
         <waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
-        <click selector="{{AdminCreateRoleSection.roleScope}}" stepKey="clickToExpandScopeAccess"/>
-        <click selector="{{AdminCreateRoleSection.scopeValue(resource)}}" stepKey="clickToSelectScopeAccess"/>
+        <click stepKey="checkSales" selector="//a[text()='Sales']"/>
         <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see userInput="You saved the role." stepKey="seeSuccessMessage" />
@@ -46,4 +48,4 @@
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
     </actionGroup>
-</actionGroups>
+</actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml
@@ -41,9 +41,9 @@
 
 
     <!--Delete User-->
-    <actionGroup name="AdminDeleteUserActionGroup">
+    <actionGroup name="AdminDeleteNewUserActionGroup">
+
         <click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
-        <waitForPageLoad stepKey="waitForUserPageToLoad"/>
         <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
         <scrollToTopOfPage stepKey="scrollToTop"/>
         <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
@@ -52,4 +52,5 @@
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see userInput="You deleted the user." stepKey="seeSuccessMessage" />
     </actionGroup>
+
 </actionGroups>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminCreateRoleSection.xml
@@ -21,4 +21,4 @@
         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
     </section>
-</sections>
+</sections>
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteRoleSection.xml
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminDeleteUserSection.xml
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml
diff --git a/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/Braintree/Test/Mftf/Section/AdminUserGridSection.xml
diff --git a/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml b/app/code/Magento/Braintree/Test/Mftf/Test/CreateAnAdminOrderUsingBraintreePaymentTest1.xml
@@ -40,16 +40,18 @@
 
         <!--Create New Role-->
         <actionGroup ref="GoToUserRoles" stepKey="GoToUserRoles"/>
-        <actionGroup ref="AdminCreateRole" stepKey="AdminCreateNewRole"/>
+        <waitForPageLoad stepKey="waitForAllRoles" time="15"/>
+        <actionGroup ref="AdminCreateNewRole" stepKey="AdminCreateNewRole"/>
 
-        <!--Create New User With Specific Role-->
+        <!--Create new admin user-->
         <actionGroup ref="GoToAllUsers" stepKey="GoToAllUsers"/>
+        <waitForPageLoad stepKey="waitForUsers" time="15"/>
         <actionGroup ref="AdminCreateUserAction" stepKey="AdminCreateNewUser"/>
 
         <!--SignOut-->
         <actionGroup ref="logout" stepKey="signOutFromAdmin"/>
 
-        <!--SignIn New User-->
+        <!--Log in as new user-->
         <actionGroup ref="LoginNewUser" stepKey="signInNewUser"/>
         <waitForPageLoad stepKey="waitForLogin" time="3"/>
 
@@ -93,7 +95,7 @@
 
             <!--Delete User -->
             <actionGroup ref="GoToAllUsers" stepKey="GoBackToAllUsers"/>
-            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
+            <actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="AdminDeleteUserActionGroup"/>
 
             <!--Delete Role-->
             <actionGroup ref="GoToUserRoles" stepKey="GoBackToUserRoles"/>
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php
@@ -118,7 +118,8 @@ public function testPrepareMetadata()
                         'config' => [
                             'editorConfig' => [
                                 'enabled' => false
-                            ]
+                            ],
+                            'componentType' => \Magento\Ui\Component\Container::NAME
                         ]
                     ]
                 ]
diff --git a/app/code/Magento/Cms/Ui/Component/DataProvider.php b/app/code/Magento/Cms/Ui/Component/DataProvider.php
@@ -13,6 +13,9 @@
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;
 
+/**
+ * DataProvider for cms ui.
+ */
 class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
 {
     /**
@@ -67,6 +70,8 @@ public function __construct(
     }
 
     /**
+     * Get authorization info.
+     *
      * @deprecated 101.0.7
      * @return AuthorizationInterface|mixed
      */
@@ -95,7 +100,8 @@ public function prepareMetadata()
                             'config' => [
                                 'editorConfig' => [
                                     'enabled' => false
-                                ]
+                                ],
+                                'componentType' => \Magento\Ui\Component\Container::NAME
                             ]
                         ]
                     ]
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateRoleActionGroup">
+        <arguments>
+            <argument name="restrictedRole"/>
+            <argument name="User"/>
+        </arguments>
+        <amOnPage url="{{AdminEditRolePage.url}}" stepKey="navigateToNewRole"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <fillField selector="{{AdminEditRoleInfoSection.roleName}}" userInput="{{User.name}}" stepKey="fillRoleName" />
+        <fillField selector="{{AdminEditRoleInfoSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterPassword" />
+        <click selector="{{AdminEditRoleInfoSection.roleResourcesTab}}" stepKey="clickRoleResourcesTab" />
+        <waitForElementVisible selector="{{AdminEditRoleResourcesSection.roleScopes}}"  stepKey="waitForScopeSelection" />
+        <selectOption selector="{{AdminEditRoleResourcesSection.resourceAccess}}" userInput="0" stepKey="selectResourceAccessCustom"/>
+        <waitForElementVisible stepKey="waitForElementVisible" selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}" time="30"/>
+        <click stepKey="clickContentBlockCheckbox" selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}"/>
+        <click selector="{{AdminEditRoleInfoSection.saveButton}}" stepKey="clickSaveRoleButton" />
+        <waitForPageLoad stepKey="waitForPageLoad2" />
+    </actionGroup>
+    <!--Create new role-->
+    <actionGroup name="AdminCreateRole">
+        <arguments>
+            <argument name="role" type="string" defaultValue=""/>
+            <argument name="resource" type="string" defaultValue="All"/>
+            <argument name="scope" type="string" defaultValue="Custom"/>
+            <argument name="websites" type="string" defaultValue="Main Website"/>
+        </arguments>
+        <click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
+        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
+        <fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
+        <waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
+        <click stepKey="checkSales" selector="//a[text()='Sales']"/>
+        <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
+        <see userInput="You saved the role." stepKey="seeSuccessMessage" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
@@ -10,23 +10,24 @@
     <actionGroup name="AdminCreateUserActionGroup">
         <arguments>
             <argument name="role"/>
-            <argument name="User" defaultValue="admin2"/>
+            <argument name="User" defaultValue="newAdmin"/>
         </arguments>
-        <amOnPage url="{{AdminEditUserPage.url}}" stepKey="navigateToNewUser"/>
-        <waitForPageLoad stepKey="waitForPageLoad1" />
-        <fillField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{admin2.username}}" stepKey="enterUserName" />
-        <fillField selector="{{AdminEditUserSection.firstNameTextField}}" userInput="{{admin2.firstName}}" stepKey="enterFirstName" />
-        <fillField selector="{{AdminEditUserSection.lastNameTextField}}" userInput="{{admin2.lastName}}" stepKey="enterLastName" />
-        <fillField selector="{{AdminEditUserSection.emailTextField}}" userInput="{{admin2.username}}@magento.com" stepKey="enterEmail" />
-        <fillField selector="{{AdminEditUserSection.passwordTextField}}" userInput="{{admin2.password}}" stepKey="enterPassword" />
-        <fillField selector="{{AdminEditUserSection.pwConfirmationTextField}}" userInput="{{admin2.password}}" stepKey="confirmPassword" />
+        <amOnPage url="{{AdminUsersPage.url}}" stepKey="amOnAdminUsersPage"/>
+        <waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
+        <click selector="{{AdminCreateUserSection.create}}" stepKey="clickToCreateNewUser"/>
+        <fillField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{newAdmin.username}}" stepKey="enterUserName" />
+        <fillField selector="{{AdminEditUserSection.firstNameTextField}}" userInput="{{newAdmin.firstName}}" stepKey="enterFirstName" />
+        <fillField selector="{{AdminEditUserSection.lastNameTextField}}" userInput="{{newAdmin.lastName}}" stepKey="enterLastName" />
+        <fillField selector="{{AdminEditUserSection.emailTextField}}" userInput="{{newAdmin.username}}@magento.com" stepKey="enterEmail" />
+        <fillField selector="{{AdminEditUserSection.passwordTextField}}" userInput="{{newAdmin.password}}" stepKey="enterPassword" />
+        <fillField selector="{{AdminEditUserSection.pwConfirmationTextField}}" userInput="{{newAdmin.password}}" stepKey="confirmPassword" />
         <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
         <scrollToTopOfPage stepKey="scrollToTopOfPage" />
         <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRole" />
-        <fillField selector="{{AdminEditUserRoleSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
-        <click selector="{{AdminEditUserRoleSection.searchButton}}" stepKey="clickSearch" />
+        <fillField selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole" />
+        <click selector="{{AdminEditUserSection.searchButton}}" stepKey="clickSearch" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
-        <click selector="{{AdminEditUserRoleSection.searchResultFirstRow}}" stepKey="selectRole" />
+        <click selector="{{AdminEditUserSection.searchResultFirstRow}}" stepKey="selectRole" />
         <click selector="{{AdminEditUserSection.saveButton}}" stepKey="clickSaveUser" />
         <waitForPageLoad stepKey="waitForPageLoad2" />
         <see userInput="You saved the user." stepKey="seeSuccessMessage" />
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedRoleActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteCreatedRoleActionGroup">
+        <arguments>
+            <argument name="role" defaultValue=""/>
+        </arguments>
+        <amOnPage url="{{AdminRolesPage.url}}" stepKey="amOnAdminUsersPage"/>
+        <waitForPageLoad stepKey="waitForUserRolePageLoad"/>
+        <click stepKey="clickToAddNewRole" selector="{{AdminDeleteRoleSection.role(role.name)}}"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteRoleSection.current_pass}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <click stepKey="clickToDeleteRole" selector="{{AdminDeleteRoleSection.delete}}"/>
+        <waitForElementVisible stepKey="wait" selector="{{AdminDeleteRoleSection.confirm}}" time="30"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteRoleSection.confirm}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteUserActionGroup.xml
@@ -7,6 +7,21 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteUserActionGroup">
+        <arguments>
+            <argument name="user"/>
+        </arguments>
+        <amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
+        <waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
+        <click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.name)}}"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click stepKey="clickToDeleteRole" selector="{{AdminDeleteUserSection.delete}}"/>
+        <waitForElementVisible stepKey="wait" selector="{{AdminDeleteRoleSection.confirm}}" time="30"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see stepKey="seeDeleteMessageForUser" userInput="You deleted the user."/>
+    </actionGroup>
     <actionGroup name="AdminDeleteCustomUserActionGroup">
         <arguments>
             <argument name="user"/>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -17,5 +17,6 @@
         <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
         <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
         <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
+        <element name="blockName" type="checkbox" selector="//*[text()='{{var}}']//*[@class='jstree-checkbox']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection.xml
@@ -14,4 +14,11 @@
         <element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
     </section>
+
+    <section name="AdminDeleteRoleSection">
+        <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
+        <element name="current_pass" type="button" selector="#current_password"/>
+        <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
+        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
+    </section>
 </sections>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminUserGridSection.xml

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ public function testPrepareMetadata()`
`118`	`118`	`'config' => [`
`119`	`119`	`'editorConfig' => [`
`120`	`120`	`'enabled' => false`
`121`		`- ]`
	`121`	`+ ],`
	`122`	`+ 'componentType' => \Magento\Ui\Component\Container::NAME`
`122`	`123`	`]`
`123`	`124`	`]`
`124`	`125`	`]`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`	`use Magento\Framework\AuthorizationInterface;`
`14`	`14`	`use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;`
`15`	`15`
	`16`	`+/**`
	`17`	`+ * DataProvider for cms ui.`
	`18`	`+ */`
`16`	`19`	`class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider`
`17`	`20`	`{`
`18`	`21`	`/**`
`@@ -67,6 +70,8 @@ public function __construct(`
`67`	`70`	`}`
`68`	`71`
`69`	`72`	`/**`
	`73`	`+ * Get authorization info.`
	`74`	`+ *`
`70`	`75`	`* @deprecated 101.0.7`
`71`	`76`	`* @return AuthorizationInterface\|mixed`
`72`	`77`	`*/`
`@@ -95,7 +100,8 @@ public function prepareMetadata()`
`95`	`100`	`'config' => [`
`96`	`101`	`'editorConfig' => [`
`97`	`102`	`'enabled' => false`
`98`		`- ]`
	`103`	`+ ],`
	`104`	`+ 'componentType' => \Magento\Ui\Component\Container::NAME`
`99`	`105`	`]`
`100`	`106`	`]`
`101`	`107`	`]`