Skip to content

Commit ecd73c9

Browse files
dhaeckerdhaecker
committed
B2B-1876: New directories in pub/media do not get synced back to local filesystem from S3 Remote Storage
 - Fixing mftf tests
1 parent e19e04e commit ecd73c9

11 files changed

+358
-41
lines changed

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryUploadImageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<argument name="image"/>
1717
</arguments>
1818
<waitForPageLoad stepKey="waitForPageFullyLoaded"/>
19-
<waitForElementVisible selector="{{AdminEnhancedMediaGalleryActionsSection.upload}}" stepKey="waitForUploadButton"/>
19+
<waitForElement selector="{{AdminEnhancedMediaGalleryActionsSection.upload}}" stepKey="waitForUploadButton"/>
2020
<attachFile selector="{{AdminEnhancedMediaGalleryActionsSection.upload}}" userInput="{{image.value}}" stepKey="uploadImage"/>
2121
<waitForPageLoad stepKey="waitForPageLoad"/>
2222
<comment userInput="BIC workaround" stepKey="waitForLoadingMaskToDisappear"/>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertAttentionModalActionGroup.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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminMediaGalleryAssertAttentionModalActionGroup">
12+
<annotations>
13+
<description>Verifies that a modal is present that tells the user that they cannot create the directory</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="headerText" type="string" defaultValue="Attention"/>
17+
<argument name="action" type="string" defaultValue="create"/>
18+
<argument name="folderName" type="string" defaultValue="{{AdminMediaGalleryFolderData.name}}"/>
19+
</arguments>
20+
<waitForElementVisible selector="{{AdminMediaGalleryAttentionModalSection.attentionModalHeader(headerText)}}" stepKey="waitForModalHeader"/>
21+
<waitForElementVisible selector="{{AdminMediaGalleryAttentionModalSection.attentionModalContent(action, folderName)}}" stepKey="waitForModalContent"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryCloseAttentionModalActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminMediaGalleryCloseAttentionModalActionGroup">
12+
<annotations>
13+
<description>Closes the attention modal</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="headerText" type="string" defaultValue="Attention"/>
17+
</arguments>
18+
<waitForElementVisible selector="{{AdminMediaGalleryAttentionModalSection.attentionModalOkButton}}" stepKey="waitForModalOkButton" />
19+
<click selector="{{AdminMediaGalleryAttentionModalSection.attentionModalOkButton}}" stepKey="clickModalOkButton"/>
20+
<waitForElementNotVisible selector="{{AdminMediaGalleryAttentionModalSection.attentionModalHeader(headerText)}}" stepKey="waitForModalGone"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryImageDeleteActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</annotations>
1515
<waitForElementVisible selector="{{AdminMediaGalleryHeaderButtonsSection.deleteSelected}}" stepKey="waitForDeleteSelectedButton"/>
1616
<click selector="{{AdminMediaGalleryHeaderButtonsSection.deleteSelected}}" stepKey="ClickDeleteSelectedButton"/>
17-
<waitForLoadingMaskToDisappear stepKey="waitForDeleteModal"/>
17+
<waitForPageLoad stepKey="waitForDeleteModal"/>
1818
<click selector="{{AdminEnhancedMediaGalleryDeleteModalSection.confirmDelete}}" stepKey="confirmDelete"/>
19-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
19+
<waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
2020
</actionGroup>
2121
</actionGroups>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
<entity name="AdminMediaGalleryFolderData">
1212
<data key="name" unique="suffix">folder</data>
1313
</entity>
14+
<entity name="AdminMediaGalleryFolder2Data">
15+
<data key="name" unique="suffix">folder2</data>
16+
</entity>
1417
<entity name="AdminMediaGalleryFolderInvalidData">
1518
<data key="name">,.?/:;'[{]}|~`!@#$%^*()_=+</data>
1619
</entity>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryAttentionModalSection.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminMediaGalleryAttentionModalSection">
12+
<element name="attentionModalHeader" type="block" parameterized="true" selector="//h1[contains(text(), '{{headerText}}')]"/>
13+
<element name="attentionModalContent" type="block" parameterized="true" selector="//aside[contains(@class,'_show')]//div[@data-role='content']//div[text()='Could not {{action}} directories: {{folderName}}']"/>
14+
<element name="attentionModalOkButton" type="button" selector="//button/span[contains(text(),'OK')]"/>
15+
</section>
16+
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
3030
<argument name="FolderName" value="wysiwyg"/>
3131
</actionGroup>
32-
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
32+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
3333
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
3434
</actionGroup>
3535
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder"/>

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

Lines changed: 76 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,53 @@
1313
<features value="MediaGallery"/>
1414
<stories value="[Story 60] User manages ACL rules for Media Gallery"/>
1515
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1485"/>
16-
<title value="User manages ACL rules for Media Gallery cretae folder functionality"/>
17-
<description value="User manages ACL rules for Media Gallery cretae folder functionality"/>
16+
<title value="User manages ACL rules for Media Gallery create folder functionality"/>
17+
<description value="User manages ACL rules for Media Gallery create folder functionality"/>
1818
<testCaseId value="https://app.hiptest.com/projects/131313/test-plan/folders/943908/scenarios/3218882"/>
1919
<severity value="MAJOR"/>
2020
<group value="media_gallery_ui"/>
2121
</annotations>
22+
2223
<before>
2324
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdminBefore"/>
2425
</before>
26+
2527
<after>
28+
<!-- Delete User & Role -->
29+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin1"/>
2630
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdminAfter"/>
27-
<amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToUserRoleGrid" />
28-
<waitForPageLoad stepKey="waitForRolesGridLoad" />
31+
<actionGroup ref="AdminUserOpenAdminRolesPageActionGroup" stepKey="navigateToUserRoleGrid"/>
32+
<comment userInput="BIC workaround" stepKey="waitForRolesGridLoad"/>
2933
<actionGroup ref="AdminDeleteRoleActionGroup" stepKey="deleteUserRole">
3034
<argument name="role" value="adminRole"/>
3135
</actionGroup>
32-
<amOnPage url="{{AdminUsersPage.url}}" stepKey="goToAllUsersPage"/>
33-
<waitForPageLoad stepKey="waitForUsersGridLoad" />
36+
<actionGroup ref="AdminOpenAdminUsersPageActionGroup" stepKey="goToAllUsersPage"/>
37+
<comment userInput="BIC workaround" stepKey="waitForUsersGridLoad"/>
3438
<actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="deleteUser">
3539
<argument name="userName" value="{{admin2.username}}"/>
3640
</actionGroup>
37-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
41+
42+
<!-- Delete Created Directories -->
43+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
44+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearGridFilters"/>
45+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
46+
<argument name="FolderName" value="wysiwyg"/>
47+
</actionGroup>
48+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
49+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
50+
</actionGroup>
51+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder"/>
52+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandCategoryFolder">
53+
<argument name="FolderName" value="category"/>
54+
</actionGroup>
55+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder2">
56+
<argument name="name" value="{{AdminMediaGalleryFolder2Data.name}}"/>
57+
</actionGroup>
58+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder2"/>
59+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin2"/>
3860
</after>
3961

62+
<!-- Create Admin User & Role -->
4063
<actionGroup ref="AdminFillUserRoleRequiredDataActionGroup" stepKey="fillUserRoleRequiredData">
4164
<argument name="User" value="adminRole"/>
4265
<argument name="restrictedRole" value="Media Gallery"/>
@@ -51,24 +74,67 @@
5174
<argument name="restrictedRole" value="Pages"/>
5275
</actionGroup>
5376
<actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveRole"/>
54-
5577
<actionGroup ref="AdminCreateUserActionGroup" stepKey="createAdminUser">
5678
<argument name="role" value="adminRole"/>
5779
<argument name="User" value="admin2"/>
5880
</actionGroup>
59-
6081
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
6182

83+
<!-- Login as New User -->
6284
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
6385
<argument name="username" value="{{admin2.username}}"/>
6486
<argument name="password" value="{{admin2.password}}"/>
6587
</actionGroup>
6688
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
6789
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
90+
91+
<!-- Verify Cannot Create Directory Under Storage Root -->
6892
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
6993
<actionGroup ref="AdminAssertMediaGalleryButtonNotDisabledOnPageActionGroup" stepKey="assertCreateButtonEnabledAllOthersDisabled">
7094
<argument name="buttonName" value="Create Folder"/>
7195
</actionGroup>
72-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
96+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
97+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="attemptToCreateNewFolder">
98+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
99+
</actionGroup>
100+
<actionGroup ref="AdminMediaGalleryAssertAttentionModalActionGroup" stepKey="assertAttentionModal">
101+
<argument name="action" value="create"/>
102+
<argument name="folderName" value="{{AdminMediaGalleryFolderData.name}}"/>
103+
</actionGroup>
104+
<actionGroup ref="AdminMediaGalleryCloseAttentionModalActionGroup" stepKey="closeAttentionModal"/>
105+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasNotCreated">
106+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
107+
</actionGroup>
108+
109+
<!-- Verify Can Create Directory Under Wysiwyg -->
110+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolder">
111+
<argument name="name" value="wysiwyg"/>
112+
</actionGroup>
113+
<actionGroup ref="AdminAssertMediaGalleryButtonNotDisabledOnPageActionGroup" stepKey="assertCreateButtonEnabledAllOthersDisabled2">
114+
<argument name="buttonName" value="Create Folder"/>
115+
</actionGroup>
116+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderFormWysiywg"/>
117+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolderWysiywg">
118+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
119+
</actionGroup>
120+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreatedWysiywg">
121+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
122+
</actionGroup>
123+
124+
<!-- Verify Can Create Directory Under Category -->
125+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCategoryFolder">
126+
<argument name="name" value="category"/>
127+
</actionGroup>
128+
<actionGroup ref="AdminAssertMediaGalleryButtonNotDisabledOnPageActionGroup" stepKey="assertCreateButtonEnabledAllOthersDisabled3">
129+
<argument name="buttonName" value="Create Folder"/>
130+
</actionGroup>
131+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderFormCategory"/>
132+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolderCategory">
133+
<argument name="name" value="{{AdminMediaGalleryFolder2Data.name}}"/>
134+
</actionGroup>
135+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreatedCategory">
136+
<argument name="name" value="{{AdminMediaGalleryFolder2Data.name}}"/>
137+
</actionGroup>
138+
<comment userInput="BIC workaround" stepKey="logoutFromAdmin"/>
73139
</test>
74140
</tests>

0 commit comments

Comments
 (0)