Skip to content

Commit edb22b1

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-38589' into 2.4-develop-pr104
2 parents 5259113 + 320aee9 commit edb22b1

File tree

6 files changed

+85
-6
lines changed

6 files changed

+85
-6
lines changed

‎app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@
3636
<element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]"/>
3737
<element name="confirmDelete" type="button" selector=".action-primary.action-accept"/>
3838
<element name="imageBlockByName" type="block" selector="//div[@data-row='file'][contains(., '{{imageName}}')]" parameterized="true"/>
39+
<element name="insertEditImageModalWindow" type="block" selector=".mce-floatpanel.mce-window[aria-label='Insert/edit image']"/>
3940
</section>
4041
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<actionGroup name="AdminMediaGalleryClickAddSelectedActionGroup">
1212
<waitForElementVisible selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="waitForAddSelectedButton"/>
1313
<click selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="ClickAddSelected"/>
14-
<wait time="5" stepKey="waitForImageToBeAdded"/>
14+
<waitForPageLoad stepKey="waitForImageToBeAdded"/>
1515
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear"/>
1616
</actionGroup>
1717
</actionGroups>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<annotations>
1212
<description>Opens Enhanced MediaGallery from category page by tyniMce4 image icon</description>
1313
</annotations>
14-
15-
<click selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="clickExpandContent"/>
14+
15+
<conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="clickExpandContent"/>
1616
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
1717
<click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
1818
<waitForPageLoad stepKey="waitForPageLoad" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="AdminMediaGalleryGridSection">
11-
<element name="noDataMessage" type="text" selector="div.no-data-message-container"/>
11+
<element name="noDataMessage" type="text" selector="[data-id='media-gallery-masonry-grid'] .no-data-message-container"/>
1212
<element name="nthImageInGrid" type="text" selector="div[class='masonry-image-column'][data-repeat-index='{{row}}'] img" parameterized="true"/>
1313
</section>
1414
</sections>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="AdminEnhancedMediaGalleryVerifyAssetFilterTest">
10+
<test name="AdminEnhancedMediaGalleryVerifyAssetFilterTest" deprecated="Use AdminEnhancedMediaGalleryVerifyFilterByAssetTest instead">
1111
<annotations>
1212
<features value="MediaGallery"/>
1313
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1292"/>
14-
<title value="User sees entities where asset is used in"/>
14+
<title value="DEPRECATED. User sees entities where asset is used in"/>
1515
<stories value="Story 58: User sees entities where asset is used in"/>
1616
<testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951024"/>
1717
<description value="User sees entities where asset is used in"/>
1818
<severity value="CRITICAL"/>
1919
<group value="media_gallery_ui"/>
20+
<skip>
21+
<issueId value="DEPRECATED">Use AdminEnhancedMediaGalleryVerifyFilterByAssetTest instead</issueId>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<createData entity="SimpleSubCategory" stepKey="category"/>

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

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminEnhancedMediaGalleryVerifyFilterByAssetTest">
11+
<annotations>
12+
<features value="MediaGalleryUi"/>
13+
<stories value="Story 58: User sees entities where asset is used in"/>
14+
<title value="User sees entities where asset is used in"/>
15+
<description value="User sees entities where asset is used in"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951024"/>
18+
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1292"/>
19+
<group value="media_gallery_ui"/>
20+
</annotations>
21+
22+
<before>
23+
<createData entity="SimpleSubCategory" stepKey="category"/>
24+
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26+
<actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImages"/>
27+
</before>
28+
29+
<after>
30+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
31+
<actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
32+
<actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImages"/>
33+
34+
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
35+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
36+
37+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
38+
</after>
39+
40+
<actionGroup ref="GoToAdminCategoryPageByIdActionGroup" stepKey="openCategoryPage">
41+
<argument name="id" value="$category.id$"/>
42+
</actionGroup>
43+
<actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
44+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
45+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadFirstIMage">
46+
<argument name="image" value="ImageUpload3"/>
47+
</actionGroup>
48+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
49+
<argument name="image" value="ImageUpload_1"/>
50+
</actionGroup>
51+
<actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectCategoryImageInGrid">
52+
<argument name="imageName" value="{{ImageMetadata.title}}"/>
53+
</actionGroup>
54+
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
55+
<actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
56+
<actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategory"/>
57+
58+
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
59+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFiltersAgain"/>
60+
<actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
61+
<actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
62+
<argument name="filterName" value="Asset"/>
63+
<argument name="optionName" value="{{ImageMetadata.title}}"/>
64+
</actionGroup>
65+
<actionGroup ref="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup" stepKey="applyFilters"/>
66+
<actionGroup ref="AssertAdminCategoryGridPageNumberOfRecordsActionGroup" stepKey="assertOneRecordInGrid">
67+
<argument name="numberOfRecords" value="1 records found"/>
68+
</actionGroup>
69+
<actionGroup ref="AssertAdminCategoryGridPageImageColumnActionGroup" stepKey="assertCategoryGridPageImageColumn"/>
70+
<actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryInGrid">
71+
<argument name="category" value="$category$"/>
72+
</actionGroup>
73+
<actionGroup ref="AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup" stepKey="assertCategoryGridPageProductsInMenuEnabledColumns"/>
74+
</test>
75+
</tests>

0 commit comments

Comments
 (0)