Skip to content

Commit f8c17a2

Browse files
dhaeckerdhaecker
committed
B2B-1897: New directories in pub/media do not get synced back to local filesystem from S3 Remote Storage
 - Fix MFTF tests
1 parent 92274af commit f8c17a2

File tree

5 files changed

+81
-26
lines changed

5 files changed

+81
-26
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.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/BlockRenderBannerThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.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/BlockRenderSlideItemThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.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/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorTestWithoutTinyMCE3Test.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/ViewportSwitcherMobile/ViewportSwitcherMobileTextThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.xml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,16 @@
4646
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCMSPageB"/>
4747
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
4848
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
49-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
50-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
49+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
50+
<argument name="FolderName" value="Storage Root"/>
5151
</actionGroup>
52-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
53-
<argument name="Image" value="ImageUpload3"/>
52+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
53+
<argument name="FolderName" value="wysiwyg"/>
54+
</actionGroup>
55+
<comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
56+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
57+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
58+
<argument name="ImageFolder" value="ImageFolder"/>
5459
</actionGroup>
5560
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5661
</after>
@@ -93,7 +98,13 @@
9398
<actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
9499
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
95100
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
96-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
101+
<comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
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>
97108
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
98109
<argument name="ImageFolder" value="ImageFolder"/>
99110
</actionGroup>

0 commit comments

Comments
 (0)