Skip to content

Commit a420b13

Browse files
sidolovsidolov
authored
ENGCOM-8268: Stabilize CMS Page asset links tests #30069 
2 parents 5977749 + 7f05002 commit a420b13

10 files changed

+139
-47
lines changed

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

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +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" />
35+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
36+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
37+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
38+
<argument name="name" value="blockImage"/>
39+
</actionGroup>
40+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated">
41+
<argument name="name" value="blockImage"/>
42+
</actionGroup>
43+
<waitForPageLoad stepKey="waitForGridToLoadAfterNewFolderCreated"/>
3444
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
3545
<argument name="image" value="ImageUpload3"/>
3646
</actionGroup>
@@ -41,26 +51,33 @@
4151
<click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="saveBlock"/>
4252

4353
<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>
4458
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
45-
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInPages">
59+
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInBlocks">
4660
<argument name="entityName" value="Blocks"/>
4761
</actionGroup>
4862
<actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
4963
<argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
5064
</actionGroup>
65+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterInBlocksGrid"/>
5166

5267
<deleteData createDataKey="block" stepKey="deleteBlock"/>
5368

5469
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
55-
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
70+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
71+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderAgain">
72+
<argument name="name" value="blockImage"/>
73+
</actionGroup>
74+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
5675
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
5776
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
5877

59-
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
60-
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
61-
<argument name="imageName" value="{{ImageMetadata.title}}"/>
78+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
79+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted">
80+
<argument name="name" value="blockImage"/>
6281
</actionGroup>
63-
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
64-
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
6582
</test>
6683
</tests>

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

Lines changed: 40 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminMediaGalleryAssertUsedInLinkPagesGridTest">
1111
<annotations>
12-
<skip>
13-
<issueId value="https://github.com/magento/adobe-stock-integration/issues/1825"/>
14-
</skip>
1512
<features value="AdminMediaGalleryUsedInBlocksFilter"/>
1613
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
1714
<title value="Used in pages link"/>
@@ -24,6 +21,17 @@
2421
<before>
2522
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2623
</before>
24+
<after>
25+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
26+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
27+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
28+
<argument name="name" value="pageTestImage"/>
29+
</actionGroup>
30+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
31+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted">
32+
<argument name="name" value="pageTestImage"/>
33+
</actionGroup>
34+
</after>
2735
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
2836
<actionGroup ref="FillOutCustomCMSPageContentActionGroup" stepKey="fillBasicPageDataForPageWithDefaultStore">
2937
<argument name="title" value="Unique page title MediaGalleryUi"/>
@@ -32,41 +40,52 @@
3240
</actionGroup>
3341

3442
<actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
35-
<waitForPageLoad stepKey="waitForPageLoad" />
43+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
44+
<wait time="5" stepKey="waitFilterReallyCleared"/>
45+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
46+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
47+
<argument name="name" value="pageTestImage"/>
48+
</actionGroup>
49+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated">
50+
<argument name="name" value="pageTestImage"/>
51+
</actionGroup>
52+
<waitForPageLoad stepKey="waitForGridToLoadAfterNewFolderCreated"/>
3653
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
3754
<argument name="image" value="ImageUpload3"/>
3855
</actionGroup>
39-
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
40-
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="editImage"/>
41-
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
42-
<argument name="image" value="UpdatedImageDetails"/>
56+
<actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectContentImageInGrid">
57+
<argument name="imageName" value="{{ImageMetadata.title}}"/>
4358
</actionGroup>
44-
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeViewDetails"/>
45-
4659
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
47-
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="savePage"/>
60+
<waitForPageLoad stepKey="waitForPageLoad10" />
61+
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
62+
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
63+
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="savePage"/>
64+
<waitForPageLoad stepKey="waitForSaveToFinish"/>
65+
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
4866
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
67+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
68+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
69+
<argument name="name" value="pageTestImage"/>
70+
</actionGroup>
4971
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
5072
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInPages">
5173
<argument name="entityName" value="Pages"/>
5274
</actionGroup>
5375
<actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
54-
<argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
76+
<argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
5577
</actionGroup>
5678
<actionGroup ref="AdminDeleteCmsPageFromGridActionGroup" stepKey="deleteCmsPage">
5779
<argument name="urlKey" value="test-page-1"/>
5880
</actionGroup>
81+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersInPageGrid"/>
5982
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
60-
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
83+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
84+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderAgain">
85+
<argument name="name" value="pageTestImage"/>
86+
</actionGroup>
87+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
6188
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
6289
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
63-
64-
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
65-
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
66-
<argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
67-
</actionGroup>
68-
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
69-
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
70-
7190
</test>
7291
</tests>

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminMediaGalleryCmsUiUsedInPagesFilterTest">
1111
<annotations>
12-
<skip>
13-
<issueId value="https://github.com/magento/adobe-stock-integration/issues/1825"/>
14-
</skip>
1512
<features value="AdminMediaGalleryUsedInPagesFilter"/>
1613
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
1714
<title value="Used in pages filter"/>
@@ -58,7 +55,8 @@
5855
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
5956
<argument name="imageName" value="{{ImageMetadata.title}}"/>
6057
</actionGroup>
61-
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
58+
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
59+
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
6260

6361
<actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="navigateToCmsPageGrid"/>
6462
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
@@ -68,5 +66,6 @@
6866
<actionGroup ref="AdminDeleteCmsPageFromGridActionGroup" stepKey="deleteCmsPage">
6967
<argument name="urlKey" value="test-page-1"/>
7068
</actionGroup>
69+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clickApplyFiltersButton"/>
7170
</test>
7271
</tests>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<actionGroup name="AdminOpenMediaGalleryFromPageNoEditorActionGroup">
1212
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
1313
<waitForElementVisible selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="waitForInsertImageButton" />
14+
<scrollTo selector="{{CmsWYSIWYGSection.InsertImageBtn}}" x="0" y="-80" stepKey="scrollToInsertImageButton"/>
1415
<click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImage" />
1516
<!-- wait for initial media gallery load, where the gallery chrome loads (and triggers loading modal) -->
1617
<waitForPageLoad stepKey="waitForMediaGalleryInitialLoad"/>

‎app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="AdminEnhancedMediaGalleryViewDetailsSection">
1111
<element name="title" type="text" selector=".image-title"/>
12-
<element name="contentType" type="text" selector="[data-ui-id='content-type']"/>
12+
<element name="contentType" type="text" selector="span[data-ui-id='content-type']"/>
1313
<element name="type" type="text" selector="//div[@class='attribute']/span[contains(text(), 'Type')]/following-sibling::div"/>
1414
<element name="height" type="text" selector="//div[@class='attribute']/span[contains(text(), 'Height')]/following-sibling::div"/>
1515
<element name="description" type="text" selector=".image-details-section.description p"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@
5151
<actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertSecondImageInGrid">
5252
<argument name="title" value="ImageUpload_1.filename"/>
5353
</actionGroup>
54+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
5455
</test>
5556
</tests>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
3939
<argument name="category" value="$$category$$"/>
4040
</actionGroup>
4141
<actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
42+
<waitForPageLoad stepKey="waitForPageLoad"/>
43+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
44+
<actionGroup ref="AdminMediaGalleryExpandFolderActionGroup" stepKey="expandCatalogFolder">
45+
<argument name="fieldId" value="catalog"/>
46+
</actionGroup>
47+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCategoryFolder">
48+
<argument name="name" value="category"/>
49+
</actionGroup>
4250
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
4351
<argument name="image" value="ImageUpload3"/>
4452
</actionGroup>

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminMediaGalleryDisabledContentFilterTest">
1111
<annotations>
12-
<skip>
13-
<issueId value="https://github.com/magento/adobe-stock-integration/issues/1825"/>
14-
</skip>
1512
<features value="MediaGallery"/>
1613
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1464"/>
1714
<title value="User filter asset by disabled content"/>
@@ -36,6 +33,16 @@
3633
<argument name="category" value="$$category$$"/>
3734
</actionGroup>
3835
<actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
36+
<waitForPageLoad stepKey="waitForPageLoad" />
37+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
38+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
39+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
40+
<argument name="name" value="testImage"/>
41+
</actionGroup>
42+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated">
43+
<argument name="name" value="testImage"/>
44+
</actionGroup>
45+
<waitForPageLoad stepKey="waitForGridToLoadAfterNewFolderCreated"/>
3946
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
4047
<argument name="image" value="ImageUpload3"/>
4148
</actionGroup>
@@ -57,12 +64,14 @@
5764
<actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
5865
<argument name="title" value="ImageMetadata.title"/>
5966
</actionGroup>
60-
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
61-
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
62-
<argument name="imageName" value="{{ImageMetadata.title}}"/>
67+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterInMediaGalleryGrid"/>
68+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderToDelete">
69+
<argument name="name" value="testImage"/>
6370
</actionGroup>
64-
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
65-
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
66-
71+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
72+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted">
73+
<argument name="name" value="testImage"/>
74+
</actionGroup>
75+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
6776
</test>
6877
</tests>

0 commit comments

Comments
 (0)