Merge branch 'develop' into PB-364-sync-release-to-develop

Author: davemacaulay

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml

@@ -148,6 +148,7 @@
         <element name="widgetPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg}}]//*[contains(@class, 'magento-placeholder') and contains(@class, 'magento-widget')]" parameterized="true"/>
         <element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
         <element name="tinymceInFocus" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg') and contains(@class, 'mce-edit-focus')]" parameterized="true"/>
+        <element name="slideOverflowPropertyJS" type="button" selector="return window.getComputedStyle(document.querySelectorAll('[data-content-type=slide] div.mce-tinymce-inline')[{{slideIndex}}]).overflow" parameterized="true"/>
         <!-- Appearance Configuration -->
         <element name="appearance" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
         <element name="slideName" type="button" selector="(//div[@data-content-type='slide'])[{{arg1}}][@data-slide-name='{{arg2}}']" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest.xml

@@ -2004,4 +2004,61 @@
             <actualResult type="variable">grabIfFrontendAnchorInContentBoolean</actualResult>
         </assertFalse>
     </test>
+    <test name="SlideItemOverflowNotHiddenAfterDuplicatingParent">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Slider"/>
+            <title value="Slide item overflow is not hidden after duplicating parent"/>
+            <description value="Slide item overflow is not hidden after duplicating parent container."/>
+            <severity value="AVERAGE"/>
+            <useCaseId value="PB-50"/>
+            <testCaseId value="MC-30386"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-slide"/>
+            <group value="pagebuilder-slideItemCommon"/>
+        </annotations>
+        <before>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
+            <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+        <!-- Add Column to Stage -->
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
+            <argument name="contentType" value="PageBuilderColumnContentType"/>
+        </actionGroup>
+        <!-- Add Slider to Column -->
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionElements">
+            <argument name="contentType" value="PageBuilderSliderContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToContainer" stepKey="dragSliderToColumn">
+            <argument name="contentType" value="PageBuilderSliderContentType"/>
+            <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
+            <argument name="containerTargetIndex" value="1"/>
+        </actionGroup>
+        <!-- Duplicate column 1 -->
+        <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusSlide"/>
+        <actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
+            <argument name="contentType" value="PageBuilderColumnContentType"/>
+            <argument name="targetIndex" value="1"/>
+            <argument name="contentTypeXCoordinate" value="10"/>
+            <argument name="contentTypeYCoordinate" value="0"/>
+        </actionGroup>
+        <seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="3" stepKey="seeDuplicatedColumn"/>
+        <!-- Invoke inline editing of slide -->
+        <actionGroup ref="focusOnInlineTinyMCEEditor" stepKey="focusOnInlineTinyMCEEditor">
+            <argument name="section" value="SlideOnBackend"/>
+        </actionGroup>
+        <!-- Assert slide overflow is not hidden -->
+        <executeJS function="{{SlideOnBackend.slideOverflowPropertyJS('0')}}" stepKey="slideOverflowProperty"/>
+        <assertEquals stepKey="assertSlideOverflowVisible">
+            <expectedResult type="string">visible</expectedResult>
+            <actualResult type="variable">$slideOverflowProperty</actualResult>
+        </assertEquals>
+        <actionGroup ref="addVariableToTinyMCEInline" stepKey="verifySlideInsertVariableButtonIsVisible">
+            <argument name="variable" value="TinyMCEVariableBaseURL"/>
+        </actionGroup>
+    </test>
 </tests>

app/code/Magento/PageBuilder/etc/di.xml

@@ -251,4 +251,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Filter\Template">
+        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
+    </type>
 </config>

app/code/Magento/PageBuilder/etc/frontend/di.xml

@@ -9,9 +9,6 @@
     <type name="Magento\Framework\View\Result\Page">
         <plugin name="pageLayoutDefaultClass" type="Magento\PageBuilder\Plugin\Result\Page"/>
     </type>
-    <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
-    </type>
     <type name="Magento\Email\Model\Template\Filter">
         <plugin name="escapeCustomVarDirectives" type="Magento\PageBuilder\Plugin\Filter\CustomVarTemplate"/>
     </type>