MAGETWO-86480: Restricted admin user can remove product from other websites

Author: zakdma

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AttributeSetTest.php

@@ -94,7 +94,7 @@ public function testModifyMeta()
      * @return void
      * @dataProvider modifyMetaLockedDataProvider
      */
-    public function testModifyMetaLocked($locked)
+    public function testModifyMetaLocked(bool $locked)
     {
         $this->productMock->expects($this->any())
             ->method('isLockedAttribute')
@@ -107,6 +107,9 @@ public function testModifyMetaLocked($locked)
         );
     }
 
+    /**
+     * @return array
+     */
     public function modifyMetaLockedDataProvider()
     {
         return [[true], [false]];

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CategoriesTest.php

@@ -119,7 +119,7 @@ public function testModifyMeta()
      * @return void
      * @dataProvider modifyMetaLockedDataProvider
      */
-    public function testModifyMetaLocked($locked)
+    public function testModifyMetaLocked(bool $locked)
     {
         $groupCode = 'test_group_code';
         $meta = [
@@ -148,6 +148,9 @@ public function testModifyMetaLocked($locked)
         $this->assertEquals($locked, $modifyMeta['arguments']['data']['config']['disabled']);
     }
 
+    /**
+     * @return array
+     */
     public function modifyMetaLockedDataProvider()
     {
         return [[true], [false]];

app/code/Magento/User/Test/Mftf/ActionGroup/AdminAssigningUserRoleActionGroup.xml renamed to app/code/Magento/User/Test/Mftf/ActionGroup/AdminAssignUserRoleActionGroup.xml

@@ -7,30 +7,30 @@
 -->
 <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="AdminAssigningUserRoleActionGroup">
+    <actionGroup name="AdminAssignUserRoleActionGroup">
         <arguments>
             <argument name="user_restricted"/>
             <argument name="user_role" />
         </arguments>
         <amOnPage url="{{AdminUsersPage.url}}" stepKey="amOnAdminUsersPage"/>
+        <waitForPageLoad stepKey="wait1" time="10"/>
         <fillField stepKey="fillUsernameSearch" selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{user_restricted.username}}"/>
         <click stepKey="clickSearchButton" selector="{{AdminUserGridSection.searchButton}}"/>
-        <waitForPageLoad stepKey="wait1" time="10"/>
+        <waitForPageLoad stepKey="wait2" time="10"/>
         <see stepKey="seeFoundUsername" selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{user_restricted.username}}"/>
         <click stepKey="clickFoundUsername" selector="{{AdminUserGridSection.searchResultFirstRow}}"/>
-        <waitForPageLoad stepKey="wait2" time="30"/>
+        <waitForPageLoad stepKey="wait3" time="30"/>
         <seeInField stepKey="seeUsernameInField" selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{user_restricted.username}}"/>
         <fillField stepKey="fillCurrentPassword" selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
         <scrollToTopOfPage stepKey="scrollToTopOfPage" />
         <click stepKey="clickUserRoleTab" selector="{{AdminEditUserSection.userRoleTab}}"/>
-
         <fillField selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="{{user_role.rolename}}" stepKey="fillRoleNameSearch"/>
         <click stepKey="clickSearchButtonUserRole" selector="{{AdminEditUserSection.searchButton}}"/>
-        <waitForPageLoad stepKey="wait3" time="10"/>
+        <waitForPageLoad stepKey="wait4" time="10"/>
         <see stepKey="seeFoundRoleName" selector="{{AdminEditUserSection.roleNameInFirstRow}}" userInput="{{user_role.rolename}}"/>
         <click stepKey="clickFoundRoleName" selector="{{AdminEditUserSection.searchResultFirstRow}}"/>
         <click stepKey="clickSaveButton" selector="{{AdminEditUserSection.saveButton}}"/>
-        <waitForPageLoad stepKey="wait4" time="10"/>
+        <waitForPageLoad stepKey="wait5" time="10"/>
         <see stepKey="saveUserSuccessMessage" selector="{{AdminUserGridSection.successMessage}}" userInput="You saved the user."/>
     </actionGroup>
 </actionGroups>

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

@@ -21,8 +21,8 @@
         <waitForPageLoad stepKey="waitForUserEditPageLoad"/>
         <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterThePassword" />
         <click selector="{{AdminEditUserSection.deleteButton}}" stepKey="deleteUser"/>
-        <waitForElementVisible selector="{{AdminEditUserSection.message}}" stepKey="waitForConfirmModal"/>
-        <click selector="{{AdminEditUserSection.ok}}" stepKey="confirmDelete"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
         <waitForPageLoad stepKey="waitForSave" />
         <see userInput="You deleted the user." stepKey="seeUserDeleteMessage"/>
     </actionGroup>

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

@@ -17,7 +17,5 @@
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
         <element name="saveButton" type="button" selector="#save"/>
         <element name="deleteButton" type="button" selector="#delete"/>
-        <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept"/>
-        <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
     </section>
 </sections>