Skip to content

Commit 7fae25d

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-38851' into 2.4-develop-pr100
2 parents 1304205 + 672768c commit 7fae25d

5 files changed

+111
-5
lines changed

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.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="AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest">
10+
<test name="AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest" deprecated="Use AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest instead">
1111
<annotations>
1212
<features value="AdminMediaGalleryCategoryGrid"/>
1313
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
14-
<title value="User can open each entity the asset is associated with in a separate tab to manage association"/>
14+
<title value="DEPRECATED. User can open each entity the asset is associated with in a separate tab to manage association"/>
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/943908/scenarios/4523889"/>
1717
<description value="User can open each entity the asset is associated with in a separate tab to manage association"/>
1818
<severity value="CRITICAL"/>
1919
<group value="media_gallery_ui"/>
20+
<skip>
21+
<issueId value="DEPRECATED">Use AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest instead</issueId>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<createData entity="SimpleSubCategory" stepKey="category"/>

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

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
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="AdminMediaGalleryCatalogUiVerifyUsedInLinkedCategoryGridTest">
11+
<annotations>
12+
<features value="MediaGalleryCatalogUi"/>
13+
<stories value="Story 58: User sees entities where asset is used in" />
14+
<title value="User can open each entity the asset is associated with in a separate tab to manage association"/>
15+
<description value="User can open each entity the asset is associated with in a separate tab to manage association"/>
16+
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
17+
<testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4523889"/>
18+
<severity value="CRITICAL"/>
19+
<group value="media_gallery_ui"/>
20+
</annotations>
21+
22+
<before>
23+
<createData entity="SimpleSubCategory" stepKey="category"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
26+
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
27+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
28+
</before>
29+
30+
<after>
31+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
32+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetMediaGalleryGridFilters"/>
33+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder"/>
34+
<actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
35+
<actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted"/>
36+
<actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
37+
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
38+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
39+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
40+
</after>
41+
42+
<actionGroup ref="GoToAdminCategoryPageByIdActionGroup" stepKey="openCategoryPage">
43+
<argument name="id" value="$category.id$"/>
44+
</actionGroup>
45+
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
46+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear" />
47+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetMediaGalleryGridFilters"/>
48+
<actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
49+
<actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
50+
<actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
51+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
52+
<argument name="image" value="ImageUpload"/>
53+
</actionGroup>
54+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
55+
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="editImage"/>
56+
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
57+
<argument name="image" value="UpdatedImageDetails"/>
58+
</actionGroup>
59+
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeViewDetails"/>
60+
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedCategoryImage"/>
61+
<actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategory"/>
62+
63+
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploaderToVerifyLink"/>
64+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCategoryImageFolder"/>
65+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
66+
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInCategories">
67+
<argument name="entityName" value="Categories"/>
68+
</actionGroup>
69+
<actionGroup ref="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterApplied">
70+
<argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
71+
</actionGroup>
72+
<actionGroup ref="AssertAdminCategoryGridPageNumberOfRecordsActionGroup" stepKey="assertOneRecordInGrid">
73+
<argument name="numberOfRecords" value="1 records found"/>
74+
</actionGroup>
75+
<actionGroup ref="AssertAdminCategoryGridPageImageColumnActionGroup" stepKey="assertCategoryGridPageImageColumn">
76+
<argument name="file" value="{{UpdatedImageDetails.file}}"/>
77+
</actionGroup>
78+
<actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryInGrid">
79+
<argument name="category" value="$category$"/>
80+
</actionGroup>
81+
<actionGroup ref="AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup" stepKey="assertCategoryGridPageProductsInMenuEnabledColumns"/>
82+
83+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetCategoriesGridFilters"/>
84+
85+
<actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
86+
<actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setAssetFilter">
87+
<argument name="filterName" value="Asset"/>
88+
<argument name="optionName" value="{{UpdatedImageDetails.title}}"/>
89+
</actionGroup>
90+
<actionGroup ref="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup" stepKey="applyFilters"/>
91+
<actionGroup ref="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterAppliedAfterUrlFilterApplier">
92+
<argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
93+
</actionGroup>
94+
95+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
96+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
97+
<actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="openCategoryImageFolder"/>
98+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
99+
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
100+
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
101+
</test>
102+
</tests>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<description>Edit image from the View Details panel</description>
1414
</annotations>
1515
<click selector="{{AdminEnhancedMediaGalleryViewDetailsSection.edit}}" stepKey="editImage"/>
16-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
16+
<waitForElementVisible selector="{{AdminEnhancedMediaGalleryEditDetailsSection.modalTitle}}" stepKey="waitForLoadingMaskToDisappear"/>
1717
</actionGroup>
1818
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
<fillField selector="{{AdminEnhancedMediaGalleryEditDetailsSection.title}}" userInput="{{image.title}}" stepKey="setTitle" />
2020
<fillField selector="{{AdminEnhancedMediaGalleryEditDetailsSection.description}}" userInput="{{image.description}}" stepKey="setDescription" />
2121
<click selector="{{AdminEnhancedMediaGalleryEditDetailsSection.save}}" stepKey="saveDetails"/>
22-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
22+
<waitForElementVisible selector="{{AdminEnhancedMediaGalleryViewDetailsSection.modalTitle}}" stepKey="waitForLoadingMaskToDisappear"/>
2323
</actionGroup>
2424
</actionGroups>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<element name="addNewKeyword" type="input" selector="[data-ui-id='add-keyword']"/>
1717
<element name="removeSelectedKeyword" type="button" selector="//span[contains(text(), '{{keyword}}')]/following-sibling::button[@data-action='remove-selected-item']" parameterized="true"/>
1818
<element name="cancel" type="button" selector="#image-details-action-cancel"/>
19-
<element name="save" type="button" selector="#image-details-action-save"/>
19+
<element name="save" type="button" selector="#image-details-action-save" timeout="30"/>
20+
<element name="modalTitle" type="text" selector="//aside[contains(@class, 'media-gallery-edit-image-details') and contains(@class, '_show')]//h1[contains(., 'Edit Image')]"/>
2021
</section>
2122
</sections>

0 commit comments

Comments
 (0)