Skip to content

Commit 5df1b7e

Browse files
author
joweecaquicla
committed
magento/adobe-stock-integration#1825: Stabilize CMS Page asset links tests - modified mftf test files
1 parent 1eaa4e2 commit 5df1b7e

File tree

3 files changed

+55
-28
lines changed

3 files changed

+55
-28
lines changed

‎app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,17 @@
3030
<argument name="CMSBlockPage" value="$$block$$"/>
3131
</actionGroup>
3232
<click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImageIcon" />
33-
<waitForPageLoad stepKey="waitForPageLoad" />
33+
<waitForPageLoad stepKey="waitForInitialPageLoad" />
34+
<waitForPageLoad stepKey="waitForSecondaryPageLoad" />
3435
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
35-
<actionGroup ref="AdminMediaGalleryExpandFolderActionGroup" stepKey="expandCatalogFolder">
36-
<argument name="fieldId" value="catalog"/>
36+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
37+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
38+
<argument name="name" value="blockImage"/>
3739
</actionGroup>
38-
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCategoryFolder">
39-
<argument name="name" value="category"/>
40+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated">
41+
<argument name="name" value="blockImage"/>
4042
</actionGroup>
43+
<waitForPageLoad stepKey="waitForGridToLoadAfterNewFolderCreated"/>
4144
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
4245
<argument name="image" value="ImageUpload3"/>
4346
</actionGroup>
@@ -48,8 +51,12 @@
4851
<click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="saveBlock"/>
4952

5053
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
54+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
55+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
56+
<argument name="name" value="blockImage"/>
57+
</actionGroup>
5158
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
52-
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInPages">
59+
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInBlocks">
5360
<argument name="entityName" value="Blocks"/>
5461
</actionGroup>
5562
<actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
@@ -60,15 +67,17 @@
6067
<deleteData createDataKey="block" stepKey="deleteBlock"/>
6168

6269
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
70+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
71+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderAgain">
72+
<argument name="name" value="blockImage"/>
73+
</actionGroup>
6374
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
6475
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
6576
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
6677

67-
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
68-
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
69-
<argument name="imageName" value="{{ImageMetadata.title}}"/>
78+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
79+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted">
80+
<argument name="name" value="blockImage"/>
7081
</actionGroup>
71-
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
72-
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
7382
</test>
7483
</tests>

‎app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkPagesGridTest.xml

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,15 @@
2929
</actionGroup>
3030

3131
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
32+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
33+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
34+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
35+
<argument name="name" value="pageImage"/>
36+
</actionGroup>
37+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated">
38+
<argument name="name" value="pageImage"/>
39+
</actionGroup>
40+
<waitForPageLoad stepKey="waitForGridToLoadAfterNewFolderCreated"/>
3241
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
3342
<argument name="image" value="ImageUpload3"/>
3443
</actionGroup>
@@ -42,6 +51,10 @@
4251
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
4352
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="savePage"/>
4453
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
54+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
55+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
56+
<argument name="name" value="pageImage"/>
57+
</actionGroup>
4558
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
4659
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInPages">
4760
<argument name="entityName" value="Pages"/>
@@ -52,18 +65,19 @@
5265
<actionGroup ref="AdminDeleteCmsPageFromGridActionGroup" stepKey="deleteCmsPage">
5366
<argument name="urlKey" value="test-page-1"/>
5467
</actionGroup>
55-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickApplyFiltersButton"/>
68+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersInPageGrid"/>
5669
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
70+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
71+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderAgain">
72+
<argument name="name" value="pageImage"/>
73+
</actionGroup>
5774
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
5875
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
5976
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
6077

61-
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
62-
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
63-
<argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
78+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
79+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted">
80+
<argument name="name" value="pageImage"/>
6481
</actionGroup>
65-
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
66-
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
67-
6882
</test>
6983
</tests>

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

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,14 @@
3535
<actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
3636
<waitForPageLoad stepKey="waitForPageLoad" />
3737
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
38-
<actionGroup ref="AdminMediaGalleryExpandFolderActionGroup" stepKey="expandCatalogFolder">
39-
<argument name="fieldId" value="catalog"/>
38+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
39+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
40+
<argument name="name" value="testImage"/>
4041
</actionGroup>
41-
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCategoryFolder">
42-
<argument name="name" value="category"/>
42+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated">
43+
<argument name="name" value="testImage"/>
4344
</actionGroup>
45+
<waitForPageLoad stepKey="waitForGridToLoadAfterNewFolderCreated"/>
4446
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
4547
<argument name="image" value="ImageUpload3"/>
4648
</actionGroup>
@@ -62,12 +64,14 @@
6264
<actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
6365
<argument name="title" value="ImageMetadata.title"/>
6466
</actionGroup>
65-
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
66-
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
67-
<argument name="imageName" value="{{ImageMetadata.title}}"/>
67+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterInMediaGalleryGrid"/>
68+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderToDelete">
69+
<argument name="name" value="testImage"/>
6870
</actionGroup>
69-
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
70-
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
71-
71+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
72+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted">
73+
<argument name="name" value="testImage"/>
74+
</actionGroup>
75+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
7276
</test>
7377
</tests>

0 commit comments

Comments
 (0)