Skip to content

Commit 4c9ad05

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 74cb3cc commit 4c9ad05

8 files changed

+162
-69
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNewImageTest.xml

Lines changed: 45 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,16 @@
3131
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
3232
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
3333
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
34-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
35-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
34+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
35+
<argument name="FolderName" value="Storage Root"/>
3636
</actionGroup>
37-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
38-
<argument name="Image" value="ImageUpload"/>
37+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
38+
<argument name="FolderName" value="wysiwyg"/>
39+
</actionGroup>
40+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
41+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
42+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
43+
<argument name="ImageFolder" value="ImageFolder"/>
3944
</actionGroup>
4045
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4146
</after>
@@ -51,33 +56,44 @@
5156
<click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse"/>
5257
<waitForPageLoad stepKey="waitForPageLoad2"/>
5358
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
54-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToStorageRootFolder">
59+
<comment userInput="BIC workaround" stepKey="navigateToStorageRootFolder"/>
60+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
5561
<argument name="FolderName" value="Storage Root"/>
5662
</actionGroup>
57-
<click selector="{{MediaGallerySection.CreateFolder}}" stepKey="createFolder"/>
58-
<waitForElementVisible selector="{{MediaGallerySection.FolderName}}" stepKey="waitForPopup"/>
59-
<fillField selector="{{MediaGallerySection.FolderName}}" userInput="{{ImageFolder.name}}" stepKey="fillFolderName"/>
60-
<click selector="{{MediaGallerySection.AcceptFolderName}}" stepKey="acceptFolderName"/>
61-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
62-
<conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickStorageRootArrowIfClosed" visible="true"/>
63-
<waitForPageLoad stepKey="waitForPageLoad3"/>
64-
<conditionalClick selector="{{MediaGallerySection.WysiwygArrow}}" dependentSelector="{{MediaGallerySection.checkIfWysiwygArrowExpand}}" stepKey="clickWysiwygArrowIfClosed" visible="true"/>
65-
<waitForPageLoad stepKey="waitForPageLoad4"/>
66-
<waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder"/>
67-
<click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder"/>
68-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear3"/>
69-
<attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{ImageUpload.file}}" stepKey="uploadImage1"/>
70-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear4"/>
71-
<waitForElementVisible selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="waitForUploadImage1"/>
72-
<seeElement selector="{{MediaGallerySection.imageSelected(ImageUpload.file)}}" stepKey="seeImageSelected"/>
73-
<waitForElementVisible selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="waitForUploadImage2"/>
74-
<click selector="{{MediaGallerySection.InsertFile}}" stepKey="clickInsertBtn"/>
75-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear5"/>
76-
<waitForElementVisible selector="{{MediaGallerySection.OkBtn}}" stepKey="waitForOkBtn"/>
77-
<fillField selector="{{MediaGallerySection.ImageDescription}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription"/>
78-
<fillField selector="{{MediaGallerySection.Height}}" userInput="{{ImageUpload.height}}" stepKey="fillImageHeight"/>
79-
<click selector="{{MediaGallerySection.OkBtn}}" stepKey="clickOkBtn"/>
80-
<waitForPageLoad stepKey="waitForPageLoad5"/>
63+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
64+
<argument name="FolderName" value="wysiwyg"/>
65+
</actionGroup>
66+
<actionGroup ref="CreateImageFolderActionGroup" stepKey="createFolder">
67+
<argument name="ImageFolder" value="ImageFolder"/>
68+
</actionGroup>
69+
<comment userInput="BIC workaround" stepKey="waitForPopup"/>
70+
<comment userInput="BIC workaround" stepKey="fillFolderName"/>
71+
<comment userInput="BIC workaround" stepKey="acceptFolderName"/>
72+
<comment userInput="BIC workaround" stepKey="waitForLoadingMaskToDisappear2"/>
73+
<actionGroup ref="AttachImageActionGroup" stepKey="attachImage1">
74+
<argument name="Image" value="ImageUpload3"/>
75+
</actionGroup>
76+
<comment userInput="BIC workaround" stepKey="clickStorageRootArrowIfClosed"/>
77+
<comment userInput="BIC workaround" stepKey="waitForPageLoad3"/>
78+
<comment userInput="BIC workaround" stepKey="clickWysiwygArrowIfClosed"/>
79+
<comment userInput="BIC workaround" stepKey="waitForPageLoad4"/>
80+
<comment userInput="BIC workaround" stepKey="waitForNewFolder"/>
81+
<comment userInput="BIC workaround" stepKey="clickOnCreatedFolder"/>
82+
<comment userInput="BIC workaround" stepKey="waitForLoadingMaskToDisappear3"/>
83+
<comment userInput="BIC workaround" stepKey="uploadImage1"/>
84+
<comment userInput="BIC workaround" stepKey="waitForLoadingMaskToDisappear4"/>
85+
<comment userInput="BIC workaround" stepKey="waitForUploadImage1"/>
86+
<comment userInput="BIC workaround" stepKey="seeImageSelected"/>
87+
<comment userInput="BIC workaround" stepKey="waitForUploadImage2"/>
88+
<actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
89+
<comment userInput="BIC workaround" stepKey="clickInsertBtn"/>
90+
<comment userInput="BIC workaround" stepKey="waitForLoadingMaskToDisappear5"/>
91+
<actionGroup ref="FillOutUploadImagePopupActionGroup" stepKey="fillOutUploadImagePopup"/>
92+
<comment userInput="BIC workaround" stepKey="waitForOkBtn"/>
93+
<comment userInput="BIC workaround" stepKey="fillImageDescription"/>
94+
<comment userInput="BIC workaround" stepKey="fillImageHeight"/>
95+
<comment userInput="BIC workaround" stepKey="clickOkBtn"/>
96+
<comment userInput="BIC workaround" stepKey="waitForPageLoad5"/>
8197
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
8298
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilder"/>
8399
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage2">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToColumnOnStageTextTest.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,16 @@
2828
</before>
2929
<after>
3030
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
31-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
32-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
31+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
32+
<argument name="FolderName" value="Storage Root"/>
3333
</actionGroup>
34-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
35-
<argument name="Image" value="ImageUpload3"/>
34+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
35+
<argument name="FolderName" value="wysiwyg"/>
36+
</actionGroup>
37+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
38+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
39+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
40+
<argument name="ImageFolder" value="ImageFolder"/>
3641
</actionGroup>
3742
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
3843
<deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
@@ -113,8 +118,14 @@
113118
<waitForPageLoad stepKey="waitForPageLoad"/>
114119
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
115120
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
116-
<click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
117-
<waitForPageLoad stepKey="waitForPageLoad2"/>
121+
<comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
122+
<comment userInput="BIC workaround" stepKey="waitForPageLoad2"/>
123+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
124+
<argument name="FolderName" value="Storage Root"/>
125+
</actionGroup>
126+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
127+
<argument name="FolderName" value="wysiwyg"/>
128+
</actionGroup>
118129
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
119130
<argument name="ImageFolder" value="ImageFolder"/>
120131
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToTabOnStageTest.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,16 @@
2828
</before>
2929
<after>
3030
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
31-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
32-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
31+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
32+
<argument name="FolderName" value="Storage Root"/>
3333
</actionGroup>
34-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
35-
<argument name="Image" value="ImageUpload3"/>
34+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
35+
<argument name="FolderName" value="wysiwyg"/>
36+
</actionGroup>
37+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
38+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
39+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
40+
<argument name="ImageFolder" value="ImageFolder"/>
3641
</actionGroup>
3742
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
3843
<deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
@@ -119,8 +124,14 @@
119124
<waitForPageLoad stepKey="waitForPageLoad"/>
120125
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
121126
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
122-
<click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
123-
<waitForPageLoad stepKey="waitForPageLoad2"/>
127+
<comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
128+
<comment userInput="BIC workaround" stepKey="waitForPageLoad2"/>
129+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
130+
<argument name="FolderName" value="Storage Root"/>
131+
</actionGroup>
132+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
133+
<argument name="FolderName" value="wysiwyg"/>
134+
</actionGroup>
124135
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
125136
<argument name="ImageFolder" value="ImageFolder"/>
126137
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorTestWithoutTinyMCETest.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,16 @@
3131
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
3232
<deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
3333
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
34-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
35-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
34+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
35+
<argument name="FolderName" value="Storage Root"/>
3636
</actionGroup>
37-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
38-
<argument name="Image" value="ImageUpload3"/>
37+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
38+
<argument name="FolderName" value="wysiwyg"/>
39+
</actionGroup>
40+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
41+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
42+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
43+
<argument name="ImageFolder" value="ImageFolder"/>
3944
</actionGroup>
4045
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4146
</after>
@@ -118,8 +123,14 @@
118123
<waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>
119124
<click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>
120125
<waitForPageLoad stepKey="waitForPageLoad1"/>
121-
<click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
122-
<waitForPageLoad stepKey="waitForPageLoad2"/>
126+
<comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
127+
<comment userInput="BIC workaround" stepKey="waitForPageLoad2"/>
128+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
129+
<argument name="FolderName" value="Storage Root"/>
130+
</actionGroup>
131+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
132+
<argument name="FolderName" value="wysiwyg"/>
133+
</actionGroup>
123134
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
124135
<argument name="ImageFolder" value="ImageFolder"/>
125136
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddImageTest.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,16 @@
3636
<after>
3737
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG1"/>
3838
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
39-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
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="DeleteImageFromStorage2">
43-
<argument name="Image" value="ImageUpload3"/>
42+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
43+
<argument name="FolderName" value="wysiwyg"/>
44+
</actionGroup>
45+
<comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
46+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage2"/>
47+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
48+
<argument name="ImageFolder" value="ImageFolder"/>
4449
</actionGroup>
4550
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4651
</after>
@@ -56,8 +61,14 @@
5661
<waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>
5762
<click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>
5863
<waitForPageLoad stepKey="waitForPageLoad"/>
59-
<click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
60-
<waitForPageLoad stepKey="waitForPageLoad2"/>
64+
<comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
65+
<comment userInput="BIC workaround" stepKey="waitForPageLoad2"/>
66+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
67+
<argument name="FolderName" value="Storage Root"/>
68+
</actionGroup>
69+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
70+
<argument name="FolderName" value="wysiwyg"/>
71+
</actionGroup>
6172
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
6273
<argument name="ImageFolder" value="ImageFolder"/>
6374
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineImageEditingTest.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,16 @@
2727
</before>
2828
<after>
2929
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
30-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
31-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
30+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
31+
<argument name="FolderName" value="Storage Root"/>
3232
</actionGroup>
33-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
34-
<argument name="Image" value="ImageUpload3"/>
33+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
34+
<argument name="FolderName" value="wysiwyg"/>
35+
</actionGroup>
36+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
37+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
38+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
39+
<argument name="ImageFolder" value="ImageFolder"/>
3540
</actionGroup>
3641
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
3742
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -56,8 +61,14 @@
5661
<waitForPageLoad stepKey="waitForPageLoad"/>
5762
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
5863
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
59-
<click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
60-
<waitForPageLoad stepKey="waitForPageLoad2"/>
64+
<comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
65+
<comment userInput="BIC workaround" stepKey="waitForPageLoad2"/>
66+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
67+
<argument name="FolderName" value="Storage Root"/>
68+
</actionGroup>
69+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
70+
<argument name="FolderName" value="wysiwyg"/>
71+
</actionGroup>
6172
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
6273
<argument name="ImageFolder" value="ImageFolder"/>
6374
</actionGroup>

0 commit comments

Comments
 (0)