Merge branch 'develop' into ACQE-3442-test-fix

Author: magento-devops-queue-mgr-svc

app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php

@@ -31,6 +31,12 @@ class Collection extends TemplateCollection implements SearchResultInterface
      */
     private $aggregations;
 
+    /** @var string */
+    private $model;
+
+    /** @var string */
+    private $resourceModel;
+
     /**
      * @param EntityFactoryInterface $entityFactory
      * @param LoggerInterface $logger
@@ -58,6 +64,8 @@ public function __construct(
         $connection = null,
         AbstractDb $resource = null
     ) {
+        $this->resourceModel = $resourceModel;
+        $this->model = $model;
         parent::__construct(
             $entityFactory,
             $logger,
@@ -68,10 +76,19 @@ public function __construct(
         );
         $this->_eventPrefix = $eventPrefix;
         $this->_eventObject = $eventObject;
-        $this->_init($model, $resourceModel);
+        $this->_init($this->model, $this->resourceModel);
         $this->setMainTable($mainTable);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_init($this->model, $this->resourceModel);
+    }
+
     /**
      * Get aggregations
      *

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnConfigurationSection.xml

@@ -19,6 +19,7 @@
         <element name="tinyMCEWidgetBtn" type="text" selector="#pagebuilder_text_form_content_magentowidget"/>
         <!-- WYSIWYG Disabled -->
         <element name="textArea" type="text" selector="#pagebuilder_text_form_content"/>
+        <element name="textAreaError" type="text" selector="//*[@id='pagebuilder_text_form_content']//ancestor::*[contains(@class,'admin__field-wide')]/*[contains(@class,'admin__field-error')]"/>
         <element name="textAreaId" type="text" selector="pagebuilder_text_form_content"/>
         <element name="insertWidgetButton" type="text" selector="//button[contains(@class,'action-add-widget')][.='Insert Widget...']"/>
         <element name="insertImageButton" type="text" selector="//button[contains(@class,'action-add-image')][.='Insert Image...']" timeout="10"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml

@@ -26,6 +26,7 @@
         <element name="widgetPlaceholderJS" type="text" selector="(document.querySelectorAll('div.pagebuilder-text')[{{indexOfText}} - 1]).querySelector('.magento-placeholder.magento-widget')" parameterized="true"/>
         <element name="placeholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
         <element name="textArea" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//textarea[contains(@class,'inline-wysiwyg-textarea')]" parameterized="true"/>
+        <element name="textAreaForExecuteJS" type="text" selector="(//div[contains(@class,&quot;pagebuilder-text&quot;)])[{{arg}}]//textarea[contains(@class,&quot;inline-wysiwyg-textarea&quot;)]" parameterized="true"/>
         <element name="textareaPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//textarea[contains(@class, 'inline-wysiwyg-textarea') and contains(@placeholder,'Edit Text')]" parameterized="true"/>
         <element name="textPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
         <element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageContentValidationTest.xml

@@ -79,6 +79,17 @@
             <argument name="text" value="\u{1F600}"/>
         </actionGroup>
 
+        <click selector="{{EditPanelForm.editFormSave}}" stepKey="savePageBuilderTextContentType"/>
+        <waitForElementVisible selector="{{TextOnConfiguration.textAreaError}}" stepKey="waitForPageBuilderTextContentTypeError"/>
+        <grabTextFrom selector="{{TextOnConfiguration.textAreaError}}" stepKey="grabTextFromPageBuilderTextContentTypeError"/>
+        <assertStringContainsString stepKey="assertErrorMessageForPageBuilderTextContentType">
+            <expectedResult type="string">Please remove invalid characters</expectedResult>
+            <actualResult type="variable">grabTextFromPageBuilderTextContentTypeError</actualResult>
+        </assertStringContainsString>
+        <actionGroup ref="removeTextFromHtmlCodeWYSIWYGActionGroup" stepKey="removeTheInvalidCharacterFromPageBuilderTextContentType">
+            <argument name="selector" value="//textarea[@id=&quot;{{TextOnConfiguration.textAreaId}}&quot;][1]"/>
+            <argument name="text" value="\u{1F600}"/>
+        </actionGroup>
         <actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveTextEditPanelSettings"/>
 
         <!-- Validate Stage -->
@@ -90,6 +101,16 @@
             <expectedResult type="string">{{PageBuilderHtmlPropertyButton.value}}</expectedResult>
             <actualResult type="variable">actualTextFromHtmlCode</actualResult>
         </assertStringContainsString>
+
+        <!-- Add the invalid character in the text element on stage -->
+        <click selector="{{TextOnStage.textareaPlaceholder('1')}}" stepKey="focusOnEditorArea"/>
+        <actionGroup ref="addTextToHtmlCodeWYSIWYGActionGroup" stepKey="enterWrongTextContentOnStage">
+            <argument name="selector" value="{{TextOnStage.textAreaForExecuteJS('1')}}"/>
+            <argument name="text" value="\u{1F600}"/>
+        </actionGroup>
+        <!-- Trigger keyup to dispatch changes -->
+        <pressKey selector="{{TextOnStage.textareaPlaceholder('1')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::END]" stepKey="pressEndKey"/>
+        <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromTextarea"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
 
         <!-- Cannot save invalid text-->

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

@@ -641,9 +641,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
-    </type>
     <type name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav">
         <plugin name="pagebuilder_product_form_eav" type="Magento\PageBuilder\Plugin\Catalog\Ui\DataProvider\Product\Form\Modifier\EavPlugin" sortOrder="20"/>
     </type>

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

@@ -316,6 +316,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Filter\Template">
+        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
+    </type>
     <type name="Magento\PageBuilder\Model\UpgradableEntitiesPool">
         <arguments>
             <argument name="entities" xsi:type="array">

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

@@ -12,7 +12,4 @@
     <type name="Magento\Email\Model\Template\Filter">
         <plugin name="escapeCustomVarDirectives" type="Magento\PageBuilder\Plugin\Filter\CustomVarTemplate"/>
     </type>
-    <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
-    </type>
 </config>

app/code/Magento/PageBuilder/etc/crontab/di.xml renamed to app/code/Magento/PageBuilder/etc/graphql/di.xml

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
+        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin" disabled="true"/>
     </type>
 </config>