Skip to content

Commit 93aa013

Browse files
joanhejoanhe
authored
Merge pull request #41 from magento-arcticfoxes/B2B-1876
B2B-1876: New directories in pub/media do not get synced back to local filesystem from S3 Remote Storage
2 parents 499a4ea + f05d6c9 commit 93aa013

File tree

30 files changed

+354
-42
lines changed

30 files changed

+354
-42
lines changed

‎AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockExpandImagePreviewActionGroup.xml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,9 @@
1212
<annotations>
1313
<description>Expands first image in grid.</description>
1414
</annotations>
15-
<conditionalClick stepKey="closeImagePreview"
16-
selector="{{AdminAdobeStockImagePreviewSection.close}}"
17-
dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}"
18-
visible="true"
19-
/>
20-
<waitForLoadingMaskToDisappear stepKey="waitForImagePreviewToClose"/>
15+
<conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="closeImagePreview"/>
16+
<waitForPageLoad stepKey="waitForImagePreviewToClose"/>
2117
<click selector="{{AdminAdobeStockSection.modal}} {{AdminAdobeStockSection.firstImageInGrid}}" stepKey="clickOnThumbnail"/>
22-
<waitForLoadingMaskToDisappear stepKey="waitForImagePreviewToExpand"/>
18+
<waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
2319
</actionGroup>
2420
</actionGroups>

‎AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockExpandSpecifiedImagePreviewActionGroup.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="AdminAdobeStockExpandSpecifiedImagePreviewActionGroup">
12+
<annotations>
13+
<description>Expands specified image in grid.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="index" type="string" defaultValue="0"/>
17+
</arguments>
18+
<conditionalClick selector="{{AdminAdobeStockImagePreviewSection.close}}" dependentSelector="{{AdminAdobeStockImagePreviewSection.close}}" visible="true" stepKey="closeImagePreview"/>
19+
<waitForPageLoad stepKey="waitForImagePreviewToClose"/>
20+
<click selector="{{AdminAdobeStockSection.modal}} {{AdminAdobeStockSection.imageInGridByIndex(index)}}" stepKey="clickOnThumbnail"/>
21+
<waitForPageLoad stepKey="waitForImagePreviewToExpand"/>
22+
</actionGroup>
23+
</actionGroups>

‎AdobeStockImageAdminUi/Test/Mftf/ActionGroup/AdminAdobeStockSaveViewActionGroup.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="AdminAdobeStockSaveViewActionGroup">
11+
<arguments>
12+
<argument name="viewName" type="string" defaultValue="{{NewGridView.name}}"/>
13+
</arguments>
1114
<click selector="{{AdminGridDefaultViewControls.defaultView}}" stepKey="openViews"/>
1215
<click selector="{{AdminGridDefaultViewControls.saveViewAs}}" stepKey="saveView"/>
13-
<fillField selector="{{AdminGridDefaultViewControls.viewName}}" userInput="Test View" stepKey="inputViewName"/>
16+
<fillField selector="{{AdminGridDefaultViewControls.viewName}}" userInput="{{viewName}}" stepKey="inputViewName"/>
1417
<pressKey selector="{{AdminGridDefaultViewControls.viewName}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
15-
<seeElement selector="{{AdminGridDefaultViewControls.viewByName('Test View')}}{{AdminAdobeStockSection.editViewButtonPartial}}" stepKey="seeEditButton"/>
16-
<click selector="{{AdminGridDefaultViewControls.viewByName('Test View')}}{{AdminAdobeStockSection.editViewButtonPartial}}" stepKey="clickEditButton"/>
18+
<seeElement selector="{{AdminGridDefaultViewControls.viewByName(viewName)}}{{AdminAdobeStockSection.editViewButtonPartial}}" stepKey="seeEditButton"/>
19+
<click selector="{{AdminGridDefaultViewControls.viewByName(viewName)}}{{AdminAdobeStockSection.editViewButtonPartial}}" stepKey="clickEditButton"/>
1720
<seeElement selector="{{AdminAdobeStockSection.deleteViewButton}}" stepKey="seeDeleteButton"/>
1821
<click selector="{{AdminAdobeStockSection.deleteViewButton}}" stepKey="clickDeleteButton"/>
1922
<waitForPageLoad stepKey="waitForDeletion" time="10"/>

‎AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockImagePreviewSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,6 @@
3434
<element name="moreFromThisSeriesImages" selector="//div[@aria-labelledby='series_tab']//div[@class='thumbnail']" type="block"/>
3535
<element name="moreFromThisSeriesSeeMore" selector="//div[@aria-labelledby='series_tab']//div[@class='see-more-wrapper']" type="button"/>
3636
<element name="seeMoreFromSeriesImages" type="block" selector="//*[@id='adobe-stock-images-search-modal']//div[@class='see-more-wrapper']"/>
37+
<element name="imagePreviewTitle" type="text" selector=".preview-row-content .title"/>
3738
</section>
3839
</sections>

‎AdobeStockImageAdminUi/Test/Mftf/Section/AdminAdobeStockSection.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<element name="panelTitle" type="block" selector="[data-role=title]"/>
1616
<element name="searchInput" type="input" selector="//div[@class='adobe-stock-images-search-modal-content']//input[contains(@class, 'data-grid-search-control')]"/>
1717
<element name="firstImageInGrid" type="block" selector="[data-role=grid-wrapper] img[data-role=thumbnail]"/>
18+
<element name="imageInGridByIndex" type="block" parameterized="true" selector="[data-role=grid-wrapper] [data-repeat-index='{{index}}'] img[data-role=thumbnail]"/>
1819
<element name="searchButton" type="button" selector="#words + button.action-submit"/>
1920
<element name="imageSrc" type="text" selector="//div[@class='masonry-image-column' and contains(@data-repeat-index, '0')]//img[@src='{{src}}']" parameterized="true"/>
2021
<element name="firstImageAfterSearch" type="text" selector="div[class='masonry-image-column'][data-repeat-index='0'] img"/>

‎AdobeStockImageAdminUi/Test/Mftf/Suite/AdobeStockMediaGallerySuite.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@
1616
<actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableEnhancedMediaGallery">
1717
<argument name="enabled" value="1"/>
1818
</actionGroup>
19+
20+
<!-- Create Media Gallery Directories for `catalog/category` and `wysiwyg` -->
21+
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
22+
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromCategoryImage"/>
23+
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
24+
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
1926
</before>
2027
<after>
2128
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockCheckAddSelectedButtonIsNotAvailableInMassDeleteModeTest.xml‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,19 @@
2626
</before>
2727
<after>
2828
<!-- Disable WYSIWYG -->
29-
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
29+
<actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
3030

3131
<!-- Delete images -->
32-
<actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImages"/>
32+
<comment userInput="BIC workaround" stepKey="deleteAllImages"/>
33+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
34+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
35+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
36+
<argument name="FolderName" value="wysiwyg"/>
37+
</actionGroup>
38+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
39+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
40+
</actionGroup>
41+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder"/>
3342

3443
<!-- Logout from admin panel -->
3544
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
@@ -40,9 +49,16 @@
4049
<actionGroup ref="AdminOpenMediaGalleryTinyMceActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
4150

4251
<!-- Clear filter-->
43-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
52+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearGridFilters"/>
4453

4554
<!-- Upload images -->
55+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolder">
56+
<argument name="name" value="wysiwyg"/>
57+
</actionGroup>
58+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
59+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
60+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
61+
</actionGroup>
4662
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
4763
<argument name="image" value="ImageUpload"/>
4864
</actionGroup>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockImageVerifyLicenseActionOnMediaGallery.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,26 @@
2222
<before>
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
25+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearGridFilters"/>
26+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolder">
27+
<argument name="name" value="wysiwyg"/>
28+
</actionGroup>
29+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
30+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
31+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
32+
</actionGroup>
2533
<actionGroup ref="AdminAdobeStockOpenFromEnhancedMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
2634
</before>
2735
<after>
36+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
2837
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
38+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
39+
<argument name="FolderName" value="wysiwyg"/>
40+
</actionGroup>
41+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
42+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
43+
</actionGroup>
44+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder"/>
2945
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3046
</after>
3147
<actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
@@ -38,6 +54,9 @@
3854
<actionGroup ref="AssertAdminAdobeStockImageAssertLicenseButtonMediaGalleryActionGroup" stepKey="assertLicenseButton"/>
3955
<actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="removeSavedPreview"/>
4056
<actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
57+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
58+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
59+
</actionGroup>
4160
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
4261
<argument name="image" value="ImageUpload3"/>
4362
</actionGroup>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockIncorrectSecretSignInTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
</actionGroup>
2929
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
3030
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
31+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
3132
<actionGroup ref="AdminAdobeStockOpenPanelFromMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
3233
</before>
3334
<actionGroup ref="AdminAdobeStockClickSignInActionGroup" stepKey="clickOnSignIn"/>

‎AdobeStockImageAdminUi/Test/Mftf/Test/AdminAdobeStockInsertRenditionImageFromGalleryFileSizeTest.xml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,16 @@
3333
<actionGroup ref="AdminRenditionsSetImageSizeActionGroup" stepKey="restoreRenditionsConfig"/>
3434
<!-- Delete uploaded image -->
3535
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
36-
<actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="removeSavedPreview"/>
37-
<actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
36+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
37+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandCategoryFolder">
38+
<argument name="FolderName" value="category"/>
39+
</actionGroup>
40+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
41+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
42+
</actionGroup>
43+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder"/>
44+
<comment userInput="BIC workaround" stepKey="removeSavedPreview"/>
45+
<comment userInput="BIC workaround" stepKey="clearFilters"/>
3846
<!-- Delete category -->
3947
<deleteData createDataKey="category" stepKey="deleteCategory"/>
4048
</after>
@@ -47,6 +55,14 @@
4755

4856
<!-- Add image to category from gallery -->
4957
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGallery"/>
58+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearGridFilters"/>
59+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCategoryFolder">
60+
<argument name="name" value="category"/>
61+
</actionGroup>
62+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
63+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
64+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
65+
</actionGroup>
5066
<actionGroup ref="AdminAdobeStockOpenFromEnhancedMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
5167
<actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
5268
<argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>

0 commit comments

Comments
 (0)