Merge branch 'MAGETWO-91529' of https://github.com/magento-borg/magento2ce into MAGETWO-91529

Author: Joan He

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Analytics/Data/UserData.xml

@@ -18,5 +18,16 @@
         <data key="interface_local">en_US</data>
         <data key="is_active">true</data>
         <data key="current_password">123123q</data>
+</entity>
+    <entity name="restrictedWebUser" type="user">
+        <data key="username" unique="suffix">restrictedWebUser</data>
+        <data key="firstname">restricted</data>
+        <data key="lastname">webUser</data>
+        <data key="email" unique="prefix">restrictedWebUser@example.com</data>
+        <data key="password">123123q</data>
+        <data key="password_confirmation">123123q</data>
+        <data key="interface_local">en_US</data>
+        <data key="is_active">true</data>
+        <data key="current_password">123123q</data>
     </entity>
 </entities>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/User/Section/AdminEditRoleInfoSection.xml

@@ -12,6 +12,10 @@
         <element name="roleResourcesTab" type="button" selector="#role_info_tabs_account"/>
         <element name="backButton" type="button" selector="button[title='Back']"/>
         <element name="resetButton" type="button" selector="button[title='Reset']"/>
+        <element name="deleteButton" type="button" selector="button[title='Delete Role']"/>
         <element name="saveButton" type="button" selector="button[title='Save Role']"/>
+        <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"/>
     </section>
 </sections>