Skip to content

Commit 69f8d96

Browse files
slavvkaslavvka
authored
ENGCOM-7972: MFTF tests coverage for Used In links && fix bug with category grid urlFIlterApplie #29392 
2 parents 98eb658 + 8bae5e6 commit 69f8d96

File tree

8 files changed

+114
-10
lines changed

8 files changed

+114
-10
lines changed

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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="AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest">
11+
<annotations>
12+
<features value="AdminMediaGalleryCategoryGrid"/>
13+
<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"/>
15+
<stories value="Story 58: User sees entities where asset is used in" />
16+
<testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4523889"/>
17+
<description value="User can open each entity the asset is associated with in a separate tab to manage association"/>
18+
<severity value="CRITICAL"/>
19+
<group value="media_gallery_ui"/>
20+
</annotations>
21+
<before>
22+
<createData entity="SimpleSubCategory" stepKey="category"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
</before>
25+
<after>
26+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
27+
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
28+
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
29+
<argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
30+
</actionGroup>
31+
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
32+
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
33+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
34+
</after>
35+
36+
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
37+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
38+
<argument name="category" value="$$category$$"/>
39+
</actionGroup>
40+
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
41+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
42+
<argument name="image" value="ImageUpload"/>
43+
</actionGroup>
44+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
45+
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="editImage"/>
46+
<actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
47+
<argument name="image" value="UpdatedImageDetails"/>
48+
</actionGroup>
49+
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeViewDetails"/>
50+
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedCategoryImage"/>
51+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
52+
<actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploaderToVerifyLink"/>
53+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
54+
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInCategories">
55+
<argument name="entityName" value="Categories"/>
56+
</actionGroup>
57+
<actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
58+
<argument name="categoryName" value="$$category.name$$"/>
59+
</actionGroup>
60+
</test>
61+
</tests>

‎app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<body>
1111
<referenceContainer htmlTag="div" htmlClass="media-gallery-category-container" name="content">
1212
<uiComponent name="media_gallery_category_listing"/>
13+
<block class="Magento\Backend\Block\Template" template="Magento_MediaGalleryCatalogUi::url_filter_applier.phtml" name="category_list_url_filter_applier"/>
1314
</referenceContainer>
1415
</body>
1516
</page>

‎app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/templates/url_filter_applier.phtml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
/** @var $block \Magento\Backend\Block\Template */
8+
/** @var \Magento\Framework\Escaper $escaper */
9+
?>
10+
<script type="text/x-magento-init">
11+
{
12+
"*": {
13+
"Magento_Ui/js/grid/url-filter-applier": {
14+
"listingNamespace": "media_gallery_category_listing"
15+
}
16+
}
17+
}
18+
</script>

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup">
12+
<annotations>
13+
<description>Clicks one Used In section entity</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="entityName" type="string"/>
17+
</arguments>
18+
19+
<click selector="{{AdminEnhancedMediaGalleryViewDetailsSection.usedInLink(entityName)}}" stepKey="openContextMenu"/>
20+
<waitForPageLoad stepKey="waitForPageLoad"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
<element name="confirmDelete" type="button" selector=".action-accept"/>
2121
<element name="addImage" type="button" selector=".add-image-action"/>
2222
<element name="cancel" type="button" selector="#image-details-action-cancel"/>
23+
<element name="usedInLink" type="button" parameterized="true" selector="//div[@class='attribute']/span[contains(text(), 'Used In')]/following-sibling::div/a[contains(text(), '{{entityName}}')]"/>
2324
</section>
2425
</sections>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</actionGroup>
4343
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
4444
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImage"/>
45-
<deleteData createDataKey="category" stepKey="deleteCategory"/>
45+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
4646
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
4747
</after>
4848

@@ -64,14 +64,14 @@
6464
<actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
6565
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
6666
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryGridPage"/>
67-
67+
6868
<actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
6969
<actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
7070
<argument name="filterName" value="Asset"/>
7171
<argument name="optionName" value="{{ImageMetadata.title}}"/>
7272
</actionGroup>
7373
<actionGroup ref="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup" stepKey="applyFilters"/>
74-
74+
7575
<actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
7676
<argument name="categoryName" value="$$category.name$$"/>
7777
</actionGroup>

‎app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,13 @@ define([
291291
return false;
292292
},
293293

294+
/**
295+
* Return empty options html
296+
*/
297+
getEmptyOptionsUnsanitizedHtml: function () {
298+
return this.emptyOptionsHtml;
299+
},
300+
294301
/**
295302
* Check options length and set to cache
296303
* if some options is added
@@ -748,11 +755,6 @@ define([
748755
return this.value() ? !!this.value().length : false;
749756
},
750757

751-
/**
752-
* @deprecated
753-
*/
754-
onMousemove: function () {},
755-
756758
/**
757759
* Handles hover on list items.
758760
*

‎app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,12 @@
141141
</div>
142142
<div ifnot="options().length"
143143
class="admin__action-multiselect-empty-area">
144-
<ul data-bind="html: emptyOptionsHtml"/>
144+
<ul data-bind="html: getEmptyOptionsUnsanitizedHtml"/>
145145
</div>
146146
<!-- /ko -->
147147
<ul class="admin__action-multiselect-menu-inner _root"
148148
data-bind="
149149
event: {
150-
mousemove: function(data, event){onMousemove($data, $index(), event)},
151150
scroll: function(data, event){onScrollDown(data, event)}
152151
}
153152
">

0 commit comments

Comments
 (0)