Skip to content

Commit e690a8d

Browse files
Nazar65Nazar65
committed
Refactor mftf tests
1 parent 7940f59 commit e690a8d

4 files changed

+17
-82
lines changed

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderAclTest.xml

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,13 @@
4444
<actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="switchToRoleResourceTab"/>
4545
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryResource">
4646
<argument name="User" value="adminRole"/>
47-
<argument name="restrictedRole" value="Media Gallery"/>
48-
</actionGroup>
49-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="uncheckDeleteFolder">
50-
<argument name="User" value="adminRole"/>
51-
<argument name="restrictedRole" value="Delete Folder"/>
47+
<argument name="restrictedRole" value="Create Folder"/>
5248
</actionGroup>
53-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="UncheckAddSelected">
54-
<argument name="User" value="adminRole"/>
55-
<argument name="restrictedRole" value="Insert Assets into the content"/>
56-
</actionGroup>
57-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="UncheckUploadAssets">
58-
<argument name="User" value="adminRole"/>
59-
<argument name="restrictedRole" value="Upload Assets"/>
60-
</actionGroup>
61-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryUnchekDeleteAssets">
62-
<argument name="User" value="adminRole"/>
63-
<argument name="restrictedRole" value="Delete Assets"/>
64-
</actionGroup>
65-
66-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
49+
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
6750
<argument name="User" value="adminRole"/>
6851
<argument name="restrictedRole" value="Pages"/>
69-
</actionGroup>
70-
<actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveRole"/>
52+
</actionGroup>
53+
<actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveRole"/>
7154

7255
<actionGroup ref="AdminCreateUserActionGroup" stepKey="createAdminUser">
7356
<argument name="role" value="adminRole"/>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteAssetsAclTest.xml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,16 @@
4242
<argument name="restrictedRole" value="Media Gallery"/>
4343
</actionGroup>
4444
<actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="switchToRoleResourceTab"/>
45-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryResource">
46-
<argument name="User" value="adminRole"/>
47-
<argument name="restrictedRole" value="Media Gallery"/>
48-
</actionGroup>
4945
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="uncheckDeleteFolder">
5046
<argument name="User" value="adminRole"/>
51-
<argument name="restrictedRole" value="Create Folder"/>
52-
</actionGroup>
53-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="UncheckAddSelected">
54-
<argument name="User" value="adminRole"/>
55-
<argument name="restrictedRole" value="Insert Assets into the content"/>
56-
</actionGroup>
57-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="UncheckUploadAssets">
58-
<argument name="User" value="adminRole"/>
59-
<argument name="restrictedRole" value="Upload Assets"/>
60-
</actionGroup>
61-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryUnchekDeleteAssets">
62-
<argument name="User" value="adminRole"/>
63-
<argument name="restrictedRole" value="Delete Folder"/>
47+
<argument name="restrictedRole" value="Delete Assets"/>
6448
</actionGroup>
6549

66-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
50+
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
6751
<argument name="User" value="adminRole"/>
6852
<argument name="restrictedRole" value="Pages"/>
69-
</actionGroup>
70-
<actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveRole"/>
53+
</actionGroup>
54+
<actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveRole"/>
7155

7256
<actionGroup ref="AdminCreateUserActionGroup" stepKey="createAdminUser">
7357
<argument name="role" value="adminRole"/>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteFolderAclTest.xml

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,30 +44,14 @@
4444
<actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="switchToRoleResourceTab"/>
4545
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryResource">
4646
<argument name="User" value="adminRole"/>
47-
<argument name="restrictedRole" value="Media Gallery"/>
48-
</actionGroup>
49-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="uncheckDeleteFolder">
50-
<argument name="User" value="adminRole"/>
51-
<argument name="restrictedRole" value="Create Folder"/>
52-
</actionGroup>
53-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="UncheckAddSelected">
54-
<argument name="User" value="adminRole"/>
55-
<argument name="restrictedRole" value="Insert Assets into the content"/>
56-
</actionGroup>
57-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="UncheckUploadAssets">
58-
<argument name="User" value="adminRole"/>
59-
<argument name="restrictedRole" value="Upload Assets"/>
60-
</actionGroup>
61-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryUnchekDeleteAssets">
62-
<argument name="User" value="adminRole"/>
63-
<argument name="restrictedRole" value="Delete Assets"/>
47+
<argument name="restrictedRole" value="Delete Folder"/>
6448
</actionGroup>
65-
66-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
49+
50+
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
6751
<argument name="User" value="adminRole"/>
6852
<argument name="restrictedRole" value="Pages"/>
69-
</actionGroup>
70-
<actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveRole"/>
53+
</actionGroup>
54+
<actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveRole"/>
7155

7256
<actionGroup ref="AdminCreateUserActionGroup" stepKey="createAdminUser">
7357
<argument name="role" value="adminRole"/>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadAssetsAclTest.xml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,16 @@
4242
<argument name="restrictedRole" value="Media Gallery"/>
4343
</actionGroup>
4444
<actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="switchToRoleResourceTab"/>
45-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryResource">
46-
<argument name="User" value="adminRole"/>
47-
<argument name="restrictedRole" value="Media Gallery"/>
48-
</actionGroup>
49-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="uncheckDeleteFolder">
50-
<argument name="User" value="adminRole"/>
51-
<argument name="restrictedRole" value="Create Folder"/>
52-
</actionGroup>
53-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="UncheckAddSelected">
54-
<argument name="User" value="adminRole"/>
55-
<argument name="restrictedRole" value="Insert Assets into the content"/>
56-
</actionGroup>
57-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="UncheckUploadAssets">
58-
<argument name="User" value="adminRole"/>
59-
<argument name="restrictedRole" value="Delete Assets"/>
60-
</actionGroup>
6145
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryUnchekDeleteAssets">
6246
<argument name="User" value="adminRole"/>
63-
<argument name="restrictedRole" value="Delete Folder"/>
47+
<argument name="restrictedRole" value="Upload Assets"/>
6448
</actionGroup>
6549

66-
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
50+
<actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="AddMediaGalleryPagesResource">
6751
<argument name="User" value="adminRole"/>
6852
<argument name="restrictedRole" value="Pages"/>
69-
</actionGroup>
70-
<actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveRole"/>
53+
</actionGroup>
54+
<actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveRole"/>
7155

7256
<actionGroup ref="AdminCreateUserActionGroup" stepKey="createAdminUser">
7357
<argument name="role" value="adminRole"/>

0 commit comments

Comments
 (0)