Skip to content

Commit cbc38f6

Browse files
author
Viktor Kopin
committed
magento/adobe-stock-integration#1806: revert mftf changes, add wait loading mask
1 parent 1535626 commit cbc38f6

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertLargeImageFileSizeTest.xml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,21 @@
2222
<before>
2323
<createData entity="SimpleSubCategory" stepKey="category"/>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25-
<!-- Prepare configuration -->
26-
<magentoCLI command="config:set system/media_gallery_renditions/width 50" stepKey="prepareWidth"/>
27-
<magentoCLI command="config:set system/media_gallery_renditions/height 50" stepKey="prepareHeight"/>
2825
</before>
2926
<after>
30-
<!-- Restore configuration -->
31-
<magentoCLI command="config:set system/media_gallery_renditions/width 1000" stepKey="restoreWidth"/>
32-
<magentoCLI command="config:set system/media_gallery_renditions/height 1000" stepKey="restoreHeight"/>
3327
<!-- Delete uploaded image -->
34-
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
35-
<actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="removeSavedPreview"/>
36-
<actionGroup ref="AdminAdobeStockMediaGalleryClearFiltersActionGroup" stepKey="clearFilters"/>
28+
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPageFoDelete"/>
29+
<actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItemForDelete">
30+
<argument name="categoryName" value="$category.name$"/>
31+
</actionGroup>
32+
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryForDelete"/>
33+
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
34+
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
35+
<argument name="imageName" value="{{ImageUpload.fileName}}"/>
36+
</actionGroup>
37+
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
38+
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
39+
3740
<!-- Delete category -->
3841
<deleteData createDataKey="category" stepKey="deleteCategory"/>
3942
</after>
@@ -46,18 +49,18 @@
4649

4750
<!-- Add image to category from gallery -->
4851
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGallery"/>
49-
<actionGroup ref="AdminAdobeStockOpenFromEnhancedMediaGalleryActionGroup" stepKey="openAdobeStockPanel"/>
50-
<actionGroup ref="AdminSearchImagesOnModalActionGroup" stepKey="searchForUnlicensedImage">
51-
<argument name="query" value="{{AdobeStockUnlicensedImage.id}}"/>
52+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="addCategoryImage">
53+
<argument name="image" value="ImageUpload"/>
54+
</actionGroup>
55+
<actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectImage">
56+
<argument name="imageName" value="{{ImageUpload.fileName}}"/>
5257
</actionGroup>
53-
<actionGroup ref="AdminAdobeStockExpandImagePreviewActionGroup" stepKey="expandImagePreview"/>
54-
<actionGroup ref="AdminAdobeStockSavePreviewActionGroup" stepKey="saveImagePreview"/>
55-
<actionGroup ref="AdminSaveAdobeStockImagePreviewActionGroup" stepKey="confirmSaveImagePreview"/>
56-
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="addSelectedSavedPreview"/>
58+
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="addSelected"/>
59+
5760

5861
<!-- Assert added image size -->
5962
<actionGroup ref="AdminAssertImageUploadFileSizeThanActionGroup" stepKey="assertSize">
60-
<argument name="fileSize" value="1 KB"/>
63+
<argument name="fileSize" value="26 KB"/>
6164
</actionGroup>
6265
</test>
6366
</tests>

app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
<waitForElementVisible selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="waitForAddSelectedButton"/>
1313
<click selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="ClickAddSelected"/>
1414
<wait time="5" stepKey="waitForImageToBeAdded"/>
15+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear"/>
1516
</actionGroup>
1617
</actionGroups>

0 commit comments

Comments
 (0)