Merge pull request #6451 from engcom-Foxtrot/MC-39756

MC-39756: An image added to the Content via Page Builder is not counted in "Used In" counter.
magento · Dec 16, 2020 · 7ea49be · 7ea49be
2 parents e6c4e28 + c93602e
commit 7ea49be
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/app/code/Magento/MediaGalleryRenditions/etc/media_content.xml b/app/code/Magento/MediaGalleryRenditions/etc/media_content.xml
@@ -9,7 +9,7 @@
     <search>
         <patterns>
             <pattern name="media_gallery_renditions">/{{media url=(?:"|&amp;quot;)(?:.renditions)?(.*?)(?:"|&amp;quot;)}}/</pattern>
-            <pattern name="media_gallery">/{{media url="?((?!.*.renditions).*?)"?}}/</pattern>
+            <pattern name="media_gallery">/{{media url="?(?:.*?\.renditions\/)(.*?)"?}}/</pattern>
             <pattern name="wysiwyg">/src=".*\/media\/(?:.renditions\/)*(.*?)"/</pattern>
             <pattern name="catalog_image">/^\/?media\/(?:.renditions\/)?(.*)/</pattern>
             <pattern name="catalog_image_with_pub">/^\/pub\/?media\/(?:.renditions\/)?(.*)/</pattern>

diff --git a/...est/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup.xml b/...est/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup">
+        <annotations>
+            <description>Assert used in section is displayed in view details.</description>
+        </annotations>
+
+        <seeElement selector="{{AdminEnhancedMediaGalleryViewDetailsSection.usedIn}}" stepKey="assertUsedInPresent"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/ResetAdminDataGridToDefaultViewActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/ResetAdminDataGridToDefaultViewActionGroup.xml
@@ -13,6 +13,7 @@
             <description>Resets an Admin Grid page to the 'Default View'.</description>
         </annotations>
 
+        <waitForElementVisible selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" stepKey="waitForViewBookmarks"/>
         <click selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" stepKey="openViewBookmarks"/>
         <click selector="{{AdminDataGridHeaderSection.bookmarkOption('Default View')}}" stepKey="selectDefaultGridView"/>
         <see selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>