Merge branch 'develop' into PB-1145

Author: eug123

app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php

@@ -7,6 +7,9 @@
 
 namespace Magento\PageBuilder\Plugin\Filter;
 
+use Magento\PageBuilder\Model\Filter\Template as TemplateFilter;
+use Magento\Framework\Filter\Template as FrameworkTemplateFilter;
+
 /**
  * Plugin to the template filter to process any background images added by Page Builder
  */
@@ -17,30 +20,30 @@ class TemplatePlugin
     const HTML_CONTENT_TYPE_PATTERN = '/data-content-type="html"/si';
 
     /**
-     * @var \Magento\PageBuilder\Model\Filter\Template
+     * @var TemplateFilter
      */
     private $templateFilter;
 
     /**
-     * @param \Magento\PageBuilder\Model\Filter\Template $templateFilter
+     * @param TemplateFilter $templateFilter
      */
     public function __construct(
-        \Magento\PageBuilder\Model\Filter\Template $templateFilter
+        TemplateFilter $templateFilter
     ) {
         $this->templateFilter = $templateFilter;
     }
 
     /**
      * After filter of template data apply transformations
      *
-     * @param \Magento\Framework\Filter\Template $subject
+     * @param FrameworkTemplateFilter $subject
      * @param string $result
      *
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterFilter(\Magento\Framework\Filter\Template $subject, string $result) : string
+    public function afterFilter(FrameworkTemplateFilter $subject, $result)
     {
-        return $this->templateFilter->filter($result);
+        return $this->templateFilter->filter((string) $result);
     }
 }

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminValidateContentTextInTinyMCEIFrameActionGroup.xml

@@ -0,0 +1,20 @@
+<?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="AdminValidateContentTextInTinyMCEIFrameActionGroup">
+        <arguments>
+            <argument name="text" type="string" defaultValue="{{PageBuilderSlideItemContent_Slide1.value}}"/>
+        </arguments>
+        <waitForElementVisible selector="{{SlideOnConfigurationPanel.contentTinyMCEIFrame}}" stepKey="waitForIFrame"/>
+        <executeJS function="jQuery('{{ContentManagementSection.configurationPopupContent}}').scrollTop(jQuery('{{SlideOnConfigurationPanel.contentTinyMCEIFrame}}').offset().top)" stepKey="expectedColumnSizeRatio"/>
+        <switchToIFrame selector="{{SlideOnConfigurationPanel.contentTinyMCEIFrame}}" stepKey="switchToIFrame"/>
+        <see selector="body" userInput="{{text}}" stepKey="seeText"/>
+        <switchToIFrame stepKey="exitIFrame"/>
+    </actionGroup>
+</actionGroups>

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

@@ -12,5 +12,6 @@
         <element name="tinyMCEIFrame" type="text" selector="pagebuilder_slide_form_content_ifr"/>
         <element name="tinyMCEIFrameMobile" type="text" selector="pagebuilder_slide_mobile_form_content_ifr"/>
         <element name="textInIFrame" type="text" selector="//body//p[.='{{text}}']" parameterized="true"/>
+        <element name="contentTinyMCEIFrame" type="text" selector="#pagebuilder_slide_form_content_ifr"/>
     </section>
 </sections>

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

@@ -36,5 +36,6 @@
         <element name="ColumnGridMaxHelperText" type="text" selector="#row_cms_pagebuilder_column_grid_max .value .note span"/>
         <element name="UseSystem" type="input" selector="[name='groups[pagebuilder][fields][{{arg1}}][inherit]']" parameterized="true"/>
         <element name="UseSystemChecked" type="input" selector="[name='groups[pagebuilder][fields][{{arg1}}][inherit]']:checked" parameterized="true"/>
+        <element name="configurationPopupContent" type="text" selector=".pagebuilder_modal_form_pagebuilder_modal_form_modal .modal-inner-wrap"/>
     </section>
 </sections>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml

@@ -87,10 +87,7 @@
         <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage">
             <argument name="section" value="SlideOnBackend"/>
         </actionGroup>
-        <actionGroup ref="validateTextInTinyMCE" stepKey="seeMessageText">
-            <argument name="property" value="PageBuilderSlideItemContent_Slide1"/>
-            <argument name="section" value="SlideOnConfigurationPanel"/>
-        </actionGroup>
+        <actionGroup ref="AdminValidateContentTextInTinyMCEIFrameActionGroup" stepKey="seeMessageText"/>
         <actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>

app/code/Magento/PageBuilder/Test/Unit/Plugin/Filter/TemplatePluginTest.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Test\Unit\Plugin\Filter;
+
+use Magento\PageBuilder\Model\Filter\Template as TemplateFilter;
+use Magento\Framework\Filter\Template as FrameworkTemplateFilter;
+use Magento\PageBuilder\Plugin\Filter\TemplatePlugin;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for page builder template filter plugin
+ */
+class TemplatePluginTest extends TestCase
+{
+    /**
+     * @var FrameworkTemplateFilter|MockObject
+     */
+    private $frameworkTemplateFilter;
+
+    /**
+     * @var TemplateFilter|MockObject
+     */
+    private $templateFilter;
+
+    /**
+     * @var TemplatePlugin
+     */
+    private $templatePlugin;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->frameworkTemplateFilter = $this->createMock(FrameworkTemplateFilter::class);
+        $this->templateFilter = $this->createMock(TemplateFilter::class);
+        $this->templatePlugin = new TemplatePlugin($this->templateFilter);
+    }
+
+    public function testAfterFilter(): void
+    {
+        $result = null;
+        $this->templateFilter->expects($this->once())
+            ->method('filter')
+            ->with('')
+            ->willReturn('');
+        $this->assertSame('', $this->templatePlugin->afterFilter($this->frameworkTemplateFilter, $result));
+    }
+}