Skip to content

Commit dcd0a76

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 71cd155 commit dcd0a76

File tree

2 files changed

+43
-23
lines changed

2 files changed

+43
-23
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlAddToCMSPageTest.xml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<severity value="BLOCKER"/>
1717
<useCaseId value="MC-1408"/>
1818
<testCaseId value="MC-2584"/>
19-
<group value="pagebuilder"/>
19+
<!-- <group value="pagebuilder"/>-->
2020
<group value="pagebuilder-html"/>
2121
</annotations>
2222
<before>
@@ -34,11 +34,16 @@
3434
<after>
3535
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
3636
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
37-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
38-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
37+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
38+
<argument name="FolderName" value="Storage Root"/>
3939
</actionGroup>
40-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
41-
<argument name="Image" value="ImageUpload3"/>
40+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
41+
<argument name="FolderName" value="wysiwyg"/>
42+
</actionGroup>
43+
<comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
44+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage2"/>
45+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
46+
<argument name="ImageFolder" value="ImageFolder"/>
4247
</actionGroup>
4348
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4449
</after>
@@ -61,7 +66,13 @@
6166
<argument name="page" value="$$createCMSPage.identifier$$"/>
6267
</actionGroup>
6368
<actionGroup ref="clickHtmlInsertImageButton" stepKey="clickInsertImageInHtmlCode"/>
64-
<actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
69+
<comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
70+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
71+
<argument name="FolderName" value="Storage Root"/>
72+
</actionGroup>
73+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
74+
<argument name="FolderName" value="wysiwyg"/>
75+
</actionGroup>
6576
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
6677
<argument name="ImageFolder" value="ImageFolder"/>
6778
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageTest.xml

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<severity value="BLOCKER"/>
1717
<useCaseId value="MAGETWO-83926"/>
1818
<testCaseId value="MC-2694"/>
19-
<group value="pagebuilder"/>
19+
<!-- <group value="pagebuilder"/>-->
2020
<group value="pagebuilder-image"/>
2121
</annotations>
2222
<before>
@@ -30,27 +30,29 @@
3030
</before>
3131
<after>
3232
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
33-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder1">
34-
<argument name="FolderName" value="{{PageBuilderImageProperty_JPG.path}}"/>
33+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
34+
<argument name="FolderName" value="Storage Root"/>
3535
</actionGroup>
36-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
37-
<argument name="Image" value="PageBuilderImageProperty_JPG"/>
36+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
37+
<argument name="FolderName" value="wysiwyg"/>
3838
</actionGroup>
39-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
40-
<argument name="FolderName" value="{{PageBuilderImageProperty_JPG2.path}}"/>
39+
<actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
40+
<argument name="ImageFolder" value="ImageFolder"/>
4141
</actionGroup>
42-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
43-
<argument name="Image" value="PageBuilderImageProperty_JPG2"/>
42+
<comment userInput="BIC workaround" stepKey="NavigateToFolder1"/>
43+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToWysiwygFolder">
44+
<argument name="FolderName" value="wysiwyg"/>
4445
</actionGroup>
45-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder3">
46-
<argument name="FolderName" value="{{ImageFolder.name}}"/>
46+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
47+
<argument name="Image" value="PageBuilderImageProperty_JPG"/>
4748
</actionGroup>
48-
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage3">
49+
<comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
50+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
4951
<argument name="Image" value="PageBuilderImageProperty_JPG2"/>
5052
</actionGroup>
51-
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder4">
52-
<argument name="FolderName" value="{{PageBuilderMobileImagePropertyGif.path}}"/>
53-
</actionGroup>
53+
<comment userInput="BIC workaround" stepKey="NavigateToFolder3"/>
54+
<comment userInput="BIC workaround" stepKey="DeleteImageFromStorage3"/>
55+
<comment userInput="BIC workaround" stepKey="NavigateToFolder4"/>
5456
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage4">
5557
<argument name="Image" value="PageBuilderMobileImagePropertyGif"/>
5658
</actionGroup>
@@ -102,11 +104,18 @@
102104
<actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
103105
<argument name="property" value="PageBuilderImageProperty_JPG2"/>
104106
</actionGroup>
105-
<click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
106-
<waitForPageLoad stepKey="waitForPageLoad"/>
107+
<comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
108+
<comment userInput="BIC workaround" stepKey="waitForPageLoad"/>
109+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
110+
<argument name="FolderName" value="Storage Root"/>
111+
</actionGroup>
112+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
113+
<argument name="FolderName" value="wysiwyg"/>
114+
</actionGroup>
107115
<actionGroup ref="CreateImageFolderActionGroup" stepKey="createImageFolder">
108116
<argument name="ImageFolder" value="ImageFolder"/>
109117
</actionGroup>
118+
<pause stepKey="1"/>
110119
<actionGroup ref="AttachImageActionGroup" stepKey="SelectImageFromMediaStorage">
111120
<argument name="Image" value="PageBuilderImageProperty_JPG2"/>
112121
</actionGroup>

0 commit comments

Comments
 (0)