Skip to content

Commit 79a8867

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 ca77398 commit 79a8867

6 files changed

+101
-42
lines changed

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterOnTest.xml

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,22 @@
3030
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3131
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
3232
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
33-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters"/>
34-
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToAssertEmptyUsedIn"/>
35-
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
36-
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
37-
38-
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
39-
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
40-
<argument name="imageName" value="{{ImageMetadata.title}}"/>
33+
<comment userInput="BIC workaround" stepKey="clearFilters"/>
34+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
35+
<argument name="FolderName" value="wysiwyg"/>
4136
</actionGroup>
42-
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
43-
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
44-
45-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersAfterDeleteImages"/>
37+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
38+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
39+
</actionGroup>
40+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder"/>
41+
<comment userInput="BIC workaround" stepKey="openViewImageDetailsToAssertEmptyUsedIn"/>
42+
<comment userInput="BIC workaround" stepKey="assertThereIsNoUsedInSection"/>
43+
<comment userInput="BIC workaround" stepKey="closeDetails"/>
44+
<comment userInput="BIC workaround" stepKey="enableMassActionToDeleteImages"/>
45+
<comment userInput="BIC workaround" stepKey="selectFirstImageToDelete"/>
46+
<comment userInput="BIC workaround" stepKey="clickDeleteSelectedButton"/>
47+
<comment userInput="BIC workaround" stepKey="deleteImages"/>
48+
<comment userInput="BIC workaround" stepKey="clearFiltersAfterDeleteImages"/>
4649
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
4750
</after>
4851

@@ -51,6 +54,13 @@
5154
</actionGroup>
5255
<actionGroup ref="AdminOpenMediaGalleryTinyMceActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
5356
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
57+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolder">
58+
<argument name="name" value="wysiwyg"/>
59+
</actionGroup>
60+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openCreateFolderForm"/>
61+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFolder">
62+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
63+
</actionGroup>
5464
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
5565
<argument name="image" value="ImageUpload3"/>
5666
</actionGroup>
@@ -62,7 +72,7 @@
6272
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
6373
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
6474
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView2"/>
65-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
75+
<comment userInput="BIC workaround" stepKey="clearFilter"/>
6676
<actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
6777
<actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
6878
<argument name="filterName" value="Used in Products"/>
@@ -76,7 +86,6 @@
7686
<actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
7787
<argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
7888
</actionGroup>
79-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersOnProductGrid"/>
80-
89+
<comment userInput="BIC workaround" stepKey="clearFiltersOnProductGrid"/>
8190
</test>
8291
</tests>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryButtonNotDisabledOnPageActionGroup.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="AdminAssertMediaGalleryButtonNotDisabledOnPageActionGroup">
1111
<annotations>
12-
<description>Validates that the provided elemen present on page but have attribute disabled.</description>
12+
<description>Validates that the provided element is present on the page but is disabled.</description>
1313
</annotations>
1414
<arguments>
1515
<argument name="buttonName" type="string"/>
1616
</arguments>
17-
1817
<grabMultiple selector="{{AdminEnhancedMediaGalleryActionsSection.notDisabledButtons}}" stepKey="verifyDisabledAttribute"/>
19-
2018
<assertEquals stepKey="assertSelectedCategories">
2119
<actualResult type="variable">verifyDisabledAttribute</actualResult>
2220
<expectedResult type="array">[{{buttonName}}]</expectedResult>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyNotUsedOptionFilterTest.xml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,19 @@
2626
<after>
2727
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
2828
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
29-
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
30-
<argument name="name" value="wysiwyg"/>
31-
</actionGroup>
32-
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
33-
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
34-
<argument name="imageName" value="{{ImageMetadata.title}}"/>
35-
</actionGroup>
36-
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
37-
<argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
29+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
30+
<argument name="FolderName" value="wysiwyg"/>
3831
</actionGroup>
39-
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
40-
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImage"/>
32+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
33+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
34+
</actionGroup>
35+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder"/>
36+
<comment userInput="BIC workaround" stepKey="enableMassActionToDeleteImages"/>
37+
<comment userInput="BIC workaround" stepKey="selectFirstImageToDelete"/>
38+
<comment userInput="BIC workaround" stepKey="selectSecondImageToDelete"/>
39+
<comment userInput="BIC workaround" stepKey="clikDeleteSelectedButton"/>
40+
<comment userInput="BIC workaround" stepKey="deleteImage"/>
41+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
4142
</after>
4243

4344
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
@@ -46,6 +47,13 @@
4647
</actionGroup>
4748
<actionGroup ref="AdminOpenMediaGalleryTinyMceActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
4849
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
50+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolder">
51+
<argument name="name" value="wysiwyg"/>
52+
</actionGroup>
53+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openCreateFolderForm"/>
54+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFolder">
55+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
56+
</actionGroup>
4957
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadFirstImage">
5058
<argument name="image" value="ImageUpload3"/>
5159
</actionGroup>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddFromImageDetailsTest.xml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
2424
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
2525
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
26+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolder">
27+
<argument name="name" value="wysiwyg"/>
28+
</actionGroup>
29+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openCreateFolderForm"/>
30+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFolder">
31+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
32+
</actionGroup>
2633
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
2734
<argument name="image" value="ImageUpload"/>
2835
</actionGroup>
@@ -31,8 +38,16 @@
3138
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
3239
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
3340
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
34-
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
35-
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
41+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
42+
<argument name="FolderName" value="wysiwyg"/>
43+
</actionGroup>
44+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
45+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
46+
</actionGroup>
47+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder"/>
48+
<comment userInput="BIC workaround" stepKey="viewImageDetails"/>
49+
<comment userInput="BIC workaround" stepKey="deleteImage"/>
50+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
3651
</after>
3752
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
3853
<actionGroup ref="AdminEnhancedMediaGalleryAddImageFromImageDetailsActionGroup" stepKey="addImageFromViewDetails"/>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEnabledContentFilterTest.xml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,32 @@
2525
</before>
2626
<after>
2727
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
28-
<actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="deleteImage"/>
28+
<comment userInput="BIC workaround" stepKey="deleteImage"/>
29+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
2930
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
31+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
32+
<argument name="FolderName" value="wysiwyg"/>
33+
</actionGroup>
34+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
35+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
36+
</actionGroup>
37+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder"/>
3038
<deleteData createDataKey="category" stepKey="deleteCategory"/>
39+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
3140
</after>
3241
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
3342
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
3443
<argument name="category" value="$$category$$"/>
3544
</actionGroup>
3645
<actionGroup ref="AdminOpenMediaGalleryTinyMceActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
3746
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
47+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolder">
48+
<argument name="name" value="wysiwyg"/>
49+
</actionGroup>
50+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openCreateFolderForm"/>
51+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFolder">
52+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
53+
</actionGroup>
3854
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
3955
<argument name="image" value="ImageUpload3"/>
4056
</actionGroup>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewContentFilterTest.xml

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,40 @@
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
</before>
2525
<after>
26+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
2627
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
28+
<actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
29+
<argument name="FolderName" value="wysiwyg"/>
30+
</actionGroup>
31+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
32+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
33+
</actionGroup>
34+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteCreatedFolder"/>
35+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
2736
<deleteData createDataKey="createCMSPage" stepKey="deleteCmsPage"/>
2837
</after>
2938
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
3039
<argument name="CMSPage" value="$$createCMSPage$$"/>
3140
</actionGroup>
3241
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGallery"/>
3342
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetToDefaultView"/>
43+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectWysiwygFolder">
44+
<argument name="name" value="wysiwyg"/>
45+
</actionGroup>
46+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openCreateFolderForm"/>
47+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFolder">
48+
<argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
49+
</actionGroup>
3450
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
3551
<argument name="image" value="ImageUpload3"/>
3652
</actionGroup>
3753
<actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectImageInGrid">
3854
<argument name="imageName" value="{{ImageMetadata.title}}"/>
3955
</actionGroup>
4056
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedImage"/>
41-
<scrollToTopOfPage stepKey="scrollToTop"/>
42-
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSavePage"/>
43-
<waitForPageLoad stepKey="waitForPageSave"/>
57+
<comment userInput="BIC workaround" stepKey="scrollToTop"/>
58+
<actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="clickSavePage"/>
59+
<comment userInput="BIC workaround" stepKey="waitForPageSave"/>
4460
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
4561
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="clearGridFilters"/>
4662
<actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
@@ -52,12 +68,9 @@
5268
<actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
5369
<argument name="title" value="ImageMetadata.title"/>
5470
</actionGroup>
55-
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
56-
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
57-
<argument name="imageName" value="{{ImageMetadata.title}}"/>
58-
</actionGroup>
59-
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
60-
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
61-
71+
<comment userInput="BIC workaround" stepKey="enableMassActionToDeleteImages"/>
72+
<comment userInput="BIC workaround" stepKey="selectFirstImageToDelete"/>
73+
<comment userInput="BIC workaround" stepKey="clikDeleteSelectedButton"/>
74+
<comment userInput="BIC workaround" stepKey="deleteImages"/>
6275
</test>
6376
</tests>

0 commit comments

Comments
 (0)