Skip to content

Commit 849b6f0

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #29711: [MFTF] Used In information is not displayed after the entity was deleted (by @Nazar65) - #29411: 1523: Switching between Views does not change the selected folder. [Media Gallery] (by @joweecaquicla) - #29210: Static font name for loading fonts (by @woutk88) Fixed GitHub Issues: - #1774: Deleting products from admin grid (reported by @ajzele) has been fixed in #29711 by @Nazar65 in 2.4-develop branch Related commits: 1. a7a20f8 2. d6de4c4 3. 8793d83 4. 66cc2b1 5. f5ef67e 6. 9be9f04 7. 0d51e07 8. 7ca91d1 9. 8340535 10. 7138093 11. 62a4eac - #29515: [Issue] Static font name for loading fonts (reported by @m2-assistant[bot]) has been fixed in #29210 by @woutk88 in 2.4-develop branch Related commits: 1. 82d60a3 2. f1758db 3. 5270c3a
2 parents d1bf3a3 + 4c40ad6 commit 849b6f0

23 files changed

+535
-204
lines changed

‎app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function execute(array $paths): void
7878
if (!empty($failedPaths)) {
7979
throw new CouldNotSaveException(
8080
__(
81-
'Could not save directories: %paths',
81+
'Could not create directories: %paths',
8282
[
8383
'paths' => implode(' ,', $failedPaths)
8484
]

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup">
11+
<annotations>
12+
<description>Assert asset filter placeholder value</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="filterPlaceholder" type="string"/>
16+
</arguments>
17+
18+
<see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{filterPlaceholder}}" stepKey="seeFilter"/>
19+
</actionGroup>
20+
</actionGroups>

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

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,30 @@
1010
<test name="AdminMediaGalleryCatalogUiUsedInProductFilterTest">
1111
<annotations>
1212
<features value="AdminMediaGalleryUsedInProductsFilter"/>
13-
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
14-
<title value="Used in products filter"/>
13+
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
14+
<title value="User can open product entity the asset is associated"/>
1515
<stories value="Story 58: User sees entities where asset is used in" />
16-
<testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951848"/>
16+
<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"/>
2020
</annotations>
2121
<before>
2222
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
23-
<createData entity="SimpleSubCategory" stepKey="category"/>
24-
<createData entity="SimpleProduct" stepKey="product">
25-
<requiredEntity createDataKey="category"/>
26-
</createData>
23+
<createData entity="SimpleProduct2" stepKey="product"/>
2724
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2825
</before>
2926
<after>
3027
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
3128
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
32-
<deleteData createDataKey="product" stepKey="deleteProduct"/>
33-
<deleteData createDataKey="category" stepKey="deleteCategory"/>
3429
</after>
3530
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProduct">
3631
<argument name="product" value="$$product$$"/>
3732
</actionGroup>
3833
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
3934
<argument name="product" value="$$product$$"/>
4035
</actionGroup>
41-
<click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/>
42-
<waitForElementVisible selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
43-
<click selector="{{CatalogWYSIWYGSection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
44-
<waitForPageLoad stepKey="waitForPageLoad" />
45-
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
36+
<actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
4637
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
4738
<argument name="image" value="ImageUpload3"/>
4839
</actionGroup>
@@ -59,17 +50,22 @@
5950
<argument name="optionName" value="$$product.name$$"/>
6051
</actionGroup>
6152
<actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
62-
<actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
63-
<argument name="title" value="ImageMetadata.title"/>
53+
54+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
55+
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInProducts">
56+
<argument name="entityName" value="Products"/>
6457
</actionGroup>
6558

66-
<wait time="10" stepKey="waitForBookmarkToSaveView"/>
67-
<reloadPage stepKey="reloadPage"/>
68-
<waitForPageLoad stepKey="waitForGridReloaded"/>
69-
<actionGroup ref="AdminAssertMediaGalleryFilterPlaceholderActionGroup" stepKey="assertFilterApplied">
59+
<actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
7060
<argument name="filterPlaceholder" value="$$product.name$$"/>
7161
</actionGroup>
7262

63+
<deleteData createDataKey="product" stepKey="deleteProduct"/>
64+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
65+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToAssertEmptyUsedIn"/>
66+
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
67+
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
68+
7369
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
7470
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
7571
<argument name="imageName" value="{{ImageMetadata.title}}"/>

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,12 @@
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
</before>
2525
<after>
26-
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
2726
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
2827
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
2928
<argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
3029
</actionGroup>
3130
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
3231
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
33-
<deleteData createDataKey="category" stepKey="deleteCategory"/>
3432
</after>
3533

3634
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
@@ -60,8 +58,7 @@
6058
<actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
6159
<argument name="categoryName" value="$$category.name$$"/>
6260
</actionGroup>
63-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters"/>
64-
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPageToVerifyIfFilterCanBeApplied"/>
61+
6562
<actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
6663
<actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setAssetFilter">
6764
<argument name="filterName" value="Asset"/>
@@ -71,5 +68,12 @@
7168
<actionGroup ref="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterAppliedAfterUrlFilterApplier">
7269
<argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
7370
</actionGroup>
71+
72+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
73+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
74+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
75+
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
76+
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
77+
7478
</test>
7579
</tests>

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
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="AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest">
11+
<annotations>
12+
<features value="AdminMediaGalleryUsedInProductsFilter"/>
13+
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
14+
<title value="Used in products filter"/>
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/1320712/scenarios/4951848"/>
17+
<description value="User filters assets used in products"/>
18+
<severity value="CRITICAL"/>
19+
<group value="media_gallery_ui"/>
20+
</annotations>
21+
<before>
22+
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
23+
<createData entity="SimpleSubCategory" stepKey="category"/>
24+
<createData entity="SimpleProduct" stepKey="product">
25+
<requiredEntity createDataKey="category"/>
26+
</createData>
27+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
28+
</before>
29+
<after>
30+
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
31+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
32+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
33+
</after>
34+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProduct">
35+
<argument name="product" value="$$product$$"/>
36+
</actionGroup>
37+
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
38+
<argument name="product" value="$$product$$"/>
39+
</actionGroup>
40+
<click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/>
41+
<waitForElementVisible selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
42+
<click selector="{{CatalogWYSIWYGSection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
43+
<waitForPageLoad stepKey="waitForPageLoad" />
44+
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
45+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
46+
<argument name="image" value="ImageUpload3"/>
47+
</actionGroup>
48+
<actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectContentImageInGrid">
49+
<argument name="imageName" value="{{ImageMetadata.title}}"/>
50+
</actionGroup>
51+
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
52+
<actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
53+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
54+
55+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
56+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
57+
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInProducts">
58+
<argument name="entityName" value="Products"/>
59+
</actionGroup>
60+
<actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
61+
<argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
62+
</actionGroup>
63+
64+
<deleteData createDataKey="product" stepKey="deleteProduct"/>
65+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
66+
67+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
68+
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
69+
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
70+
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
71+
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
72+
<argument name="imageName" value="{{ImageMetadata.title}}"/>
73+
</actionGroup>
74+
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
75+
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
76+
77+
</test>
78+
</tests>

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
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="AdminMediaGalleryAssertUsedInLinkBlocksGridTest">
11+
<annotations>
12+
<features value="AdminMediaGalleryUsedInBlocksFilter"/>
13+
<useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
14+
<title value="Used in blocks link"/>
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/1320712/scenarios/4951848"/>
17+
<description value="User filters assets used in blocks"/>
18+
<severity value="CRITICAL"/>
19+
<group value="media_gallery_ui"/>
20+
</annotations>
21+
<before>
22+
<createData entity="_defaultBlock" stepKey="block" />
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
24+
</before>
25+
<after>
26+
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
27+
</after>
28+
29+
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
30+
<argument name="CMSBlockPage" value="$$block$$"/>
31+
</actionGroup>
32+
<click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImageIcon" />
33+
<waitForPageLoad stepKey="waitForPageLoad" />
34+
<actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
35+
<argument name="image" value="ImageUpload3"/>
36+
</actionGroup>
37+
<actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectContentImageInGrid">
38+
<argument name="imageName" value="{{ImageMetadata.title}}"/>
39+
</actionGroup>
40+
<actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
41+
<click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="saveBlock"/>
42+
43+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
44+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
45+
<actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInPages">
46+
<argument name="entityName" value="Blocks"/>
47+
</actionGroup>
48+
<actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
49+
<argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
50+
</actionGroup>
51+
52+
<deleteData createDataKey="block" stepKey="deleteBlock"/>
53+
54+
<actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
55+
<actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
56+
<actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
57+
<actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
58+
59+
<actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
60+
<actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
61+
<argument name="imageName" value="{{ImageMetadata.title}}"/>
62+
</actionGroup>
63+
<actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
64+
<actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
65+
</test>
66+
</tests>

0 commit comments

Comments
 (0)