Skip to content

Commit 4af523c

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-37213' into 2.4-develop-pr104
2 parents 226b08d + 07062f4 commit 4af523c

File tree

8 files changed

+93
-7
lines changed

8 files changed

+93
-7
lines changed

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<description>Runs bin/magento command to disable WYSIWYG</description>
1414
</annotations>
1515

16-
<magentoCLI stepKey="disableWYSIWYG" command="config:set cms/wysiwyg/enabled disabled"/>
16+
<magentoCLI command="config:set {{WysiwygDisabledByDefault.path}} {{WysiwygDisabledByDefault.value}}" stepKey="disableWYSIWYG"/>
1717
</actionGroup>
1818
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
<description>Runs bin/magento command to enable WYSIWYG</description>
1414
</annotations>
1515

16-
<magentoCLI stepKey="enableWYSIWYG" command="config:set cms/wysiwyg/enabled enabled"/>
16+
<magentoCLI command="config:set {{WysiwygEnabledByDefault.path}} {{WysiwygEnabledByDefault.value}}" stepKey="enableWYSIWYG"/>
1717
</actionGroup>
1818
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<entity name="WysiwygDisabledByDefault">
1717
<data key="path">cms/wysiwyg/enabled</data>
1818
<data key="scope_id">0</data>
19-
<data key="value">hidden</data>
19+
<data key="value">disabled</data>
2020
</entity>
2121
<entity name="WysiwygTinyMCE3Enable" deprecated="Use WysiwygTinyMCE4Enable instead">
2222
<data key="path">cms/wysiwyg/editor</data>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
<argument name="filterPlaceholder" type="string"/>
1616
</arguments>
1717

18+
<waitForPageLoad stepKey="waitVisibleFilter"/>
19+
<waitForElementVisible selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="waitForRequest"/>
1820
<see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{filterPlaceholder}}" stepKey="seeFilter"/>
1921
</actionGroup>
2022
</actionGroups>

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

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
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="AdminMediaGalleryCatalogUiUsedInProductFilterOnTest">
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 the product entity the asset is associated"/>
15+
<description value="User filters assets used in products"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4523889"/>
18+
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
19+
<group value="media_gallery_ui"/>
20+
</annotations>
21+
22+
<before>
23+
<magentoCLI command="config:set {{WysiwygEnabledByDefault.path}} {{WysiwygEnabledByDefault.value}}" stepKey="enableWYSIWYG"/>
24+
<createData entity="SimpleProduct2" stepKey="createProduct"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26+
</before>
27+
28+
<after>
29+
<magentoCLI command="config:set {{WysiwygDisabledByDefault.path}} {{WysiwygDisabledByDefault.value}}" stepKey="disableWYSIWYG"/>
30+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
31+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
32+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters"/>
33+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToAssertEmptyUsedIn"/>
34+
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
35+
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
36+
37+
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
38+
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
39+
<argument name="imageName" value="{{ImageMetadata.title}}"/>
40+
</actionGroup>
41+
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
42+
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
43+
44+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersAfterDeleteImages"/>
45+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
46+
</after>
47+
48+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
49+
<argument name="productId" value="$createProduct.id$"/>
50+
</actionGroup>
51+
<actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
52+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
53+
<argument name="image" value="ImageUpload3"/>
54+
</actionGroup>
55+
<actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectContentImageInGrid">
56+
<argument name="imageName" value="{{ImageMetadata.title}}"/>
57+
</actionGroup>
58+
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
59+
<actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
60+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
61+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
62+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
63+
<actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
64+
<actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
65+
<argument name="filterName" value="Used in Products"/>
66+
<argument name="optionName" value="$createProduct.name$"/>
67+
</actionGroup>
68+
<actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
69+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
70+
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInProducts">
71+
<argument name="entityName" value="Products"/>
72+
</actionGroup>
73+
<actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
74+
<argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
75+
</actionGroup>
76+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersOnProductGrid"/>
77+
78+
</test>
79+
</tests>

‎app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.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="AdminMediaGalleryCatalogUiUsedInProductFilterTest">
10+
<test name="AdminMediaGalleryCatalogUiUsedInProductFilterTest" deprecated="Use AdminMediaGalleryCatalogUiUsedInProductFilterOnTest instead">
1111
<annotations>
1212
<features value="AdminMediaGalleryUsedInProductsFilter"/>
1313
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
14-
<title value="User can open product entity the asset is associated"/>
14+
<title value="Deprecated. User can open product entity the asset is associated"/>
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 filters assets used in products"/>
1818
<severity value="CRITICAL"/>
1919
<group value="media_gallery_ui"/>
20+
<skip>
21+
<issueId value="DEPRECATED">Use AdminMediaGalleryCatalogUiUsedInProductFilterOnTest instead</issueId>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<section name="AdminEnhancedMediaGalleryImageActionsSection">
1111
<element name="openContextMenu" type="button" selector=".three-dots"/>
1212
<element name="contextMenuItem" type="block" selector="//div[@class='media-gallery-image']//ul[@class='action-menu _active']//li//a[@class='action-menu-item']"/>
13-
<element name="viewDetails" type="button" selector="[data-ui-id='action-image-details']"/>
13+
<element name="viewDetails" type="button" selector="//ul[@class='action-menu _active']//a[text()='View Details']"/>
1414
<element name="delete" type="button" selector="[data-ui-id='action-delete']"/>
1515
<element name="edit" type="button" selector="[data-ui-id='action-edit']"/>
1616
<element name="imageInGrid" type="button" selector="//li[@data-ui-id='title'and text()='{{imageTitle}}']/parent::*/parent::*/parent::div//img[@class='media-gallery-image-column']" parameterized="true"/>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ define([
1818
loadedOption: [],
1919
validationLoading: true,
2020
imports: {
21+
applied: '${ $.filterChipsProvider }:applied',
2122
activeIndex: '${ $.bookmarkProvider }:activeIndex'
2223
},
2324
modules: {
2425
filterChips: '${ $.filterChipsProvider }'
2526
},
2627
listens: {
27-
activeIndex: 'validateInitialValue'
28+
activeIndex: 'validateInitialValue',
29+
applied: 'validateInitialValue'
2830
}
2931

3032
},

0 commit comments

Comments
 (0)