Skip to content

Commit 71cd155

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 90f03ca commit 71cd155

File tree

6 files changed

+107
-32
lines changed

6 files changed

+107
-32
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSelectFromGalleryJPGTest.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,16 @@
3232
<after>
3333
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
3434
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
35-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
35+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
36+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
3637
<argument name="FolderName" value="Storage Root"/>
3738
</actionGroup>
38-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
39-
<argument name="Image" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
39+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
40+
<argument name="FolderName" value="wysiwyg"/>
41+
</actionGroup>
42+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
43+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
44+
<argument name="Image" value="{{ImageFolder.name}}"/>
4045
</actionGroup>
4146
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4247
</after>
@@ -57,9 +62,16 @@
5762
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
5863
<argument name="property" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
5964
</actionGroup>
60-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
65+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
66+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
6167
<argument name="FolderName" value="Storage Root"/>
6268
</actionGroup>
69+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
70+
<argument name="FolderName" value="wysiwyg"/>
71+
</actionGroup>
72+
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
73+
<argument name="ImageFolder" value="ImageFolder"/>
74+
</actionGroup>
6375
<actionGroup ref="AttachImageActionGroup" stepKey="SelectImageFromMediaStorage">
6476
<argument name="Image" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
6577
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,13 @@
3333
<after>
3434
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
3535
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
36-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToMediaGalleryNavigateToFolder">
37-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
36+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
37+
<argument name="FolderName" value="Storage Root"/>
3838
</actionGroup>
39+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
40+
<argument name="FolderName" value="wysiwyg"/>
41+
</actionGroup>
42+
<comment userInput="BIC workaround" stepKey="navigateToMediaGalleryNavigateToFolder"/>
3943
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
4044
<argument name="ImageFolder" value="ImageFolder"/>
4145
</actionGroup>
@@ -94,14 +98,20 @@
9498
<!-- Add Image Link to TinyMCE -->
9599
<actionGroup ref="ClickTinyMCEInsertImageButtonActionGroup" stepKey="clickTinyMCEInsertImageButton"/>
96100
<actionGroup ref="GoToMediaGalleryFromTinyMCEImageModalActionGroup" stepKey="goToMediaGalleryFromTinyMCEImageModal"/>
97-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
101+
<comment userInput="BIC workaround" stepKey="clickTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
102+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
103+
<argument name="FolderName" value="Storage Root"/>
104+
</actionGroup>
105+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
106+
<argument name="FolderName" value="wysiwyg"/>
107+
</actionGroup>
98108
<actionGroup ref="CreateImageFolderActionGroup" stepKey="createTinyMCESelectorBrowseModalStorageRootImageFolder">
99109
<argument name="ImageFolder" value="ImageFolder"/>
100110
</actionGroup>
101111
<actionGroup ref="AttachImageActionGroup" stepKey="selectImageFromTinyMCESelectorBrowseModalStorageRootImageFolder">
102112
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
103113
</actionGroup>
104-
<actionGroup ref="SaveImageActionGroup" stepKey="saveTinyMCESelectorBrowseModalStorageRootImageFolderImage"/>
114+
<actionGroup ref="SaveImageActionGroup" stepKey="saveTinyMCESelectorBrowseModalStorageRootImageFolderImage"/>
105115
<actionGroup ref="FillTinyMCEInsertImageModalAndSaveActionGroup" stepKey="fillTinyMCEInsertImageModalAndSave">
106116
<argument name="textToDisplay" value="{{PageBuilderBannerLinkUrlProperty.value}}"/>
107117
</actionGroup>
@@ -189,11 +199,20 @@
189199
<argument name="wysiwygArea" value="{{WYSIWYGOnPageBuilderInline.inlineCss}}"/>
190200
</actionGroup>
191201
<actionGroup ref="GoToMediaGalleryFromTinyMCEImageModalActionGroup" stepKey="goToMediaGalleryFromInlineWYSIWYGTinyMCEImageModal"/>
192-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickInlineWYSIWYGTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
202+
<comment userInput="BIC workaround" stepKey="clickInlineWYSIWYGTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
203+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder2">
204+
<argument name="FolderName" value="Storage Root"/>
205+
</actionGroup>
206+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder2">
207+
<argument name="FolderName" value="wysiwyg"/>
208+
</actionGroup>
209+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToImageFolderFolder">
210+
<argument name="FolderName" value="{{ImageFolder.name}}"/>
211+
</actionGroup>
193212
<actionGroup ref="AttachImageActionGroup" stepKey="selectImageFromInlineWYSIWYGTinyMCESelectorBrowseModalStorageRootImageFolder">
194213
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
195214
</actionGroup>
196-
<actionGroup ref="SaveImageActionGroup" stepKey="saveInlineWYSIWYGTinyMCESelectorBrowseModalStorageRootImageFolderImage"/>
215+
<actionGroup ref="SaveImageActionGroup" stepKey="saveInlineWYSIWYGTinyMCESelectorBrowseModalStorageRootImageFolderImage"/>
197216
<actionGroup ref="FillTinyMCEInsertImageModalAndSaveActionGroup" stepKey="fillInlineWYSIWYGTinyMCEInsertImageModalAndSave">
198217
<argument name="textToDisplay" value="{{PageBuilderBannerLinkUrlProperty.value}}"/>
199218
</actionGroup>
@@ -223,4 +242,4 @@
223242
<actualResult type="variable">grabIfFrontendAnchorInContentBoolean</actualResult>
224243
</assertFalse>
225244
</test>
226-
</tests>
245+
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,16 @@
4242
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCMSPageB"/>
4343
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
4444
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
45-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
46-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
45+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
46+
<argument name="FolderName" value="Storage Root"/>
4747
</actionGroup>
48-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
49-
<argument name="Image" value="ImageUpload3"/>
48+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
49+
<argument name="FolderName" value="wysiwyg"/>
50+
</actionGroup>
51+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
52+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
53+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
54+
<argument name="ImageFolder" value="ImageFolder"/>
5055
</actionGroup>
5156
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5257
</after>
@@ -94,7 +99,13 @@
9499
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
95100
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
96101
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
97-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
102+
<comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
103+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
104+
<argument name="FolderName" value="Storage Root"/>
105+
</actionGroup>
106+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
107+
<argument name="FolderName" value="wysiwyg"/>
108+
</actionGroup>
98109
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
99110
<argument name="ImageFolder" value="ImageFolder"/>
100111
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,16 @@
4343
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
4444
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
4545
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
46-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
47-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
46+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
47+
<argument name="FolderName" value="Storage Root"/>
4848
</actionGroup>
49-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
50-
<argument name="Image" value="ImageUpload3"/>
49+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
50+
<argument name="FolderName" value="wysiwyg"/>
51+
</actionGroup>
52+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
53+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
54+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
55+
<argument name="ImageFolder" value="ImageFolder"/>
5156
</actionGroup>
5257
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5358
</after>
@@ -105,7 +110,13 @@
105110
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
106111
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
107112
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
108-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
113+
<comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
114+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
115+
<argument name="FolderName" value="Storage Root"/>
116+
</actionGroup>
117+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
118+
<argument name="FolderName" value="wysiwyg"/>
119+
</actionGroup>
109120
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
110121
<argument name="ImageFolder" value="ImageFolder"/>
111122
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,16 @@
4343
<deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
4444
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
4545
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
46-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
47-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
46+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
47+
<argument name="FolderName" value="Storage Root"/>
4848
</actionGroup>
49-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
50-
<argument name="Image" value="ImageUpload3"/>
49+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
50+
<argument name="FolderName" value="wysiwyg"/>
51+
</actionGroup>
52+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
53+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
54+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
55+
<argument name="ImageFolder" value="ImageFolder"/>
5156
</actionGroup>
5257
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5358
</after>
@@ -105,7 +110,13 @@
105110
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
106111
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
107112
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
108-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
113+
<comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
114+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
115+
<argument name="FolderName" value="Storage Root"/>
116+
</actionGroup>
117+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
118+
<argument name="FolderName" value="wysiwyg"/>
119+
</actionGroup>
109120
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
110121
<argument name="ImageFolder" value="ImageFolder"/>
111122
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemInlineWysiwygUploadImageTest.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,16 @@
3636
</before>
3737
<after>
3838
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
39-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
40-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
39+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
40+
<argument name="FolderName" value="Storage Root"/>
4141
</actionGroup>
42-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
43-
<argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
42+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
43+
<argument name="FolderName" value="wysiwyg"/>
44+
</actionGroup>
45+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
46+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
47+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
48+
<argument name="ImageFolder" value="ImageFolder"/>
4449
</actionGroup>
4550
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
4651
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -67,8 +72,14 @@
6772
<waitForPageLoad stepKey="waitForImageSelectorModal"/>
6873
<click selector="{{WYSIWYGOnPageBuilderInline.imageSelectorBrowse}}" stepKey="clickWYSIWYGImageSelectorBrowseButton"/>
6974
<waitForPageLoad stepKey="waitForImageSelectorBrowseModal"/>
70-
<click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
71-
<waitForPageLoad stepKey="waitForStorageRoot"/>
75+
<comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
76+
<comment userInput="BIC workaround" stepKey="waitForStorageRoot"/>
77+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
78+
<argument name="FolderName" value="Storage Root"/>
79+
</actionGroup>
80+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
81+
<argument name="FolderName" value="wysiwyg"/>
82+
</actionGroup>
7283
<actionGroup ref="CreateImageFolderActionGroup" stepKey="createImageFolder">
7384
<argument name="ImageFolder" value="ImageFolder"/>
7485
</actionGroup>

0 commit comments

Comments
 (0)