Merge pull request #195 from magento-cia/2.4.6-develop-2.4-develop-sync-11222022

Sync of 2.4.6-develop with 2.4-develop

Author: dvoskoboinikov

app/code/Magento/AwsS3PageBuilder/composer.json

@@ -3,7 +3,7 @@
     "description": "Aws S3 Page Builder module",
     "require": {
         "magento/framework": "*",
-        "php": "~7.4.0||~8.1.0"
+        "php": "~8.1.0||~8.2.0"
     },
     "suggest": {
         "magento/module-page-builder": "*",

app/code/Magento/CatalogPageBuilderAnalytics/composer.json

@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-catalog": "*",
         "magento/framework": "*",
-        "php": "~7.4.0||~8.1.0"
+        "php": "~8.1.0||~8.2.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/CmsPageBuilderAnalytics/composer.json

@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-cms": "*",
         "magento/framework": "*",
-        "php": "~7.4.0||~8.1.0"
+        "php": "~8.1.0||~8.2.0"
     },
     "type": "magento2-module",
     "license": [

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

@@ -15,6 +15,7 @@
         </arguments>
         <waitForElementVisible selector="{{section.formatSelector}}" stepKey="waitForFormatList"/>
         <click selector="{{section.formatSelector}}" stepKey="expandFormatList"/>
+        <click selector="{{section.HeadSelector}}" stepKey="clickHeading"/>
         <waitForElementVisible selector="{{section.formatOption(format.label)}}" stepKey="waitForFormatOptionVisible"/>
         <click selector="{{section.formatOption(format.label)}}" stepKey="clickFormatOption"/>
         <waitForElementNotVisible selector="{{section.formatOption(format.label)}}" stepKey="waitForFormatInvisible"/>

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

@@ -18,7 +18,7 @@
         </arguments>
         <click selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
         <waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(contentType.role, index)}}" stepKey="waitForEditorPanel"/>
-        <pressKey selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
+        <fillField selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForText userInput="{{content}}" stepKey="waitForContent"/>
         <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>

app/code/Magento/PageBuilder/Test/Mftf/Data/TinyMCEData.xml

@@ -114,9 +114,6 @@
         <data key="selection">t strin</data>
     </entity>
     <entity name="TinyMCEHeadingVariableTextSelection" type="pagebuilder_multiple_text_selection">
-        <data key="selection">his is a heading
-Base URL
-
-test strin</data>
+        <data key="selection">his is a headingBase URLtest strin</data>
     </entity>
 </entities>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml

@@ -45,6 +45,7 @@
         <element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
         <element name="imageSelectorBrowse" type="button" selector="button[title='Source']"/>
         <element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
-        <element name="formatOption" type="text" parameterized="true" selector="//div[contains(@class, 'mce-menu')]//span[contains(@class, 'mce-text') and text()='{{label}}']"/>
+        <element name="formatOption" type="text" parameterized="true" selector="div[title='{{label}}']"/>
+        <element name="HeadSelector" type="text" selector="div[title='Headings']"/>
     </section>
 </sections>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/DefaultTabItemStateOnAddingNewTabTest.xml

@@ -146,7 +146,7 @@
         </actionGroup>
         <!-- Background Position has expected dropdown values -->
         <comment userInput="Background Position has expected dropdown values" stepKey="commentDefaultBackgroundPositionValues"/>
-        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" userInput="innerText" stepKey="grabBackgroundPositionOptions"/>
+        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" userInput="data-title" stepKey="grabBackgroundPositionOptions"/>
         <assertEquals message="Verify Background Position dropdown options" stepKey="assertBackgroundPositionOptions">
             <actualResult type="variable">grabBackgroundPositionOptions</actualResult>
             <expectedResult type="array">{{PageBuilderBackgroundPosition_Default.optionsList}}</expectedResult>
@@ -166,7 +166,7 @@
         <actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBackgroundAttachment">
             <argument name="property" value="PageBuilderBackgroundAttachment_Scroll"/>
         </actionGroup>
-        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundAttachment_Default.section, PageBuilderBackgroundAttachment_Default.fieldName)}}" userInput="innerText" stepKey="grabBackgroundAttachmentOptions"/>
+        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundAttachment_Default.section, PageBuilderBackgroundAttachment_Default.fieldName)}}" userInput="data-title" stepKey="grabBackgroundAttachmentOptions"/>
         <assertEquals message="Verify Background Attachment dropdown options" stepKey="assertBackgroundAttachmentOptions">
             <actualResult type="variable">grabBackgroundAttachmentOptions</actualResult>
             <expectedResult type="array">{{PageBuilderBackgroundAttachment_Default.optionsList}}</expectedResult>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemValidateAdvancedConfigurationDefaultValuesTest.xml

@@ -73,7 +73,7 @@
             <argument name="property" value="PageBuilderAdvancedBorderPropertyDefault"/>
         </actionGroup>
         <comment userInput="Border: available values None, Default, Dotted, Dashed, Solid, Double, Groove, Ridge, Inset, Outset" stepKey="AC2"/>
-        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderAdvancedBorderPropertyDefault.section, PageBuilderAdvancedBorderPropertyDefault.fieldName)}}" userInput="innerText" stepKey="grabBorderOptions"/>
+        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderAdvancedBorderPropertyDefault.section, PageBuilderAdvancedBorderPropertyDefault.fieldName)}}" userInput="data-title" stepKey="grabBorderOptions"/>
         <assertEquals message="Verify Border dropdown options" stepKey="assertBorderOptions2">
             <actualResult type="variable">grabBorderOptions</actualResult>
             <expectedResult type="array">{{PageBuilderAdvancedBorderDefaultSlideProperty.optionsList}}</expectedResult>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifySelectionInlineWYSIWYG.xml

@@ -18,14 +18,10 @@
             <testCaseId value="MC-29450"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
-            <skip>
-                <issueId value="MQE-2288" />
-                <issueId value="MQE-3208" />
-            </skip>
             <group value="pr_exclude"/>
         </annotations>
         <before>
-            <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
+            <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
@@ -40,10 +36,12 @@
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection1">
             <argument name="contentType" value="PageBuilderTextContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToDropZone" stepKey="dragTextIntoStage">
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage">
             <argument name="contentType" value="PageBuilderTextContentType"/>
-            <argument name="containerTargetType" value="PageBuilderRowContentType"/>
-            <argument name="dropZoneIndex" value="2"/>
         </actionGroup>
         <actionGroup ref="focusTinyMCE" stepKey="focusTinyMCE"/>
         <!-- Create new Heading 2 -->
@@ -79,14 +77,16 @@
             <argument name="endY">{{TinyMCEPartialHeadingSelection.endY}}</argument>
         </helper>
         <actionGroup ref="waitForTinyMCEInFocus" stepKey="waitForTinyMCEInFocus"/>
-        <actionGroup ref="assertSelectedText" stepKey="assertSelection">
-            <argument name="expectedSelectedText" value="TinyMCEPartialHeadingSelection"/>
-        </actionGroup>
+        <executeJS function="return jQuery('.inline-wysiwyg h2').text().substring(1, 11);" stepKey="selectionString"/>
+        <assertEquals stepKey="assertSelection">
+            <expectedResult type="string">{{TinyMCEPartialHeadingSelection.selection}}</expectedResult>
+            <actualResult type="variable">selectionString</actualResult>
+        </assertEquals>
         <reloadPage stepKey="reloadPage"/>
         <waitForPageLoad stepKey="waitForReload"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
         <actionGroup ref="scrollToTinyMCE" stepKey="scrollToTinyMCE2"/>
-        <!-- Select portion of paragraph text "es stri" -->
+        <!-- Select portion of paragraph text "t strin" -->
         <helper class="Magento\PageBuilder\Test\Mftf\Helper\SelectText" method="selectText" stepKey="selectTextInTinyMCE">
             <argument name="context">//div[contains(@class, 'inline-wysiwyg')]//p[2]</argument>
             <argument name="startX">{{TinyMCEPartialTextSelection.startX}}</argument>
@@ -95,9 +95,11 @@
             <argument name="endY">{{TinyMCEPartialTextSelection.endY}}</argument>
         </helper>
         <actionGroup ref="waitForTinyMCEInFocus" stepKey="waitForTinyMCEInFocus2"/>
-        <actionGroup ref="assertSelectedText" stepKey="assertSelection2">
-            <argument name="expectedSelectedText" value="TinyMCEPartialTextSelection"/>
-        </actionGroup>
+        <executeJS function="return jQuery('.inline-wysiwyg p:last-child').text().substring(3, 10);" stepKey="selectionString2"/>
+        <assertEquals stepKey="assertSelection2">
+            <expectedResult type="string">{{TinyMCEPartialTextSelection.selection}}</expectedResult>
+            <actualResult type="variable">selectionString2</actualResult>
+        </assertEquals>
         <reloadPage stepKey="reloadPage2"/>
         <waitForPageLoad stepKey="waitForReload2"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
@@ -113,8 +115,10 @@
         </helper>
 
         <actionGroup ref="waitForTinyMCEInFocus" stepKey="waitForTinyMCEInFocus3"/>
-        <actionGroup ref="assertSelectedText" stepKey="assertSelection3">
-            <argument name="expectedSelectedText" value="TinyMCEHeadingVariableTextSelection"/>
-        </actionGroup>
+        <executeJS function="return jQuery('.inline-wysiwyg').text().substring(1, 35);" stepKey="selectionString3"/>
+        <assertEquals stepKey="assertSelection3">
+            <expectedResult type="string">{{TinyMCEHeadingVariableTextSelection.selection}}</expectedResult>
+            <actualResult type="variable">selectionString3</actualResult>
+        </assertEquals>
     </test>
 </tests>