Merge pull request #447 from magento-cia/cia-pre-release-develop-sync-07102025

Cia pre release develop sync 07102025

Author: mrprabhu92

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

@@ -64,4 +64,7 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="AssertCategoryConfigSavedMessage">
+      <data key="value">You saved the category.</data>
+    </entity>
 </entities>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml

@@ -39,8 +39,8 @@
         <element name="panelFieldTooltipWithUploaderId" type="button" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@upload-area-id='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::a[contains(@class,'admin__field-tooltip-action')]"/>
         <element name="panelFieldTooltipContent" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-tooltip-content')]"/>
         <element name="panelFieldTooltipContentWithUploaderId" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@upload-area-id='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-tooltip-content')]"/>
-        <element name="panelFieldValidationError" type="input" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}' and contains(@class,'_error')]//div[contains(@class,'')]//*[@name='{{arg2}}' or contains(@class,'tox-tinymce')][last()]" parameterized="true"/>
-        <element name="panelFieldValidationErrorMessage" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//*[@name='{{arg2}}' or contains(@class,'tox-tinymce')][last()]//..//..//..//label[.='{{arg3}}']" parameterized="true"/>
+        <element name="panelFieldValidationError" type="input" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}' and contains(@class,'_error')]//div[contains(@class,'')]//*[@name='{{arg2}}' or contains(@class,'tox-hugerte')][last()]" parameterized="true"/>
+        <element name="panelFieldValidationErrorMessage" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//*[@name='{{arg2}}' or contains(@class,'tox-hugerte')][last()]//..//..//..//label[.='{{arg3}}']" parameterized="true"/>
         <element name="panelMultiSelectFieldControl" type="input" selector="aside [data-index='{{arg1}}'] [data-index='{{arg2}}'] [data-role='advanced-select']" parameterized="true"/>
         <element name="panelMultiSelectFieldControlInput" type="input" selector="aside [data-index='{{arg1}}'] [data-index='{{arg2}}'] .admin__action-multiselect-search" parameterized="true"/>
         <element name="panelMultiSelectFieldControlResult" type="input" selector="//aside//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}']//div[contains(@class,'action-menu-item')]//span[.='{{arg3}}']" parameterized="true"/>

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

@@ -52,7 +52,7 @@
         <element name="onHoverUploadImageButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//label[text()='Upload Image']" parameterized="true"/>
         <element name="onHoverSelectFromGalleryButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']" parameterized="true"/>
         <element name="inlineWYSIWYGEditor" type="text" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'inline-wysiwyg')]|(//div[@data-content-type='{{arg1}}' and contains(@class,'inline-wysiwyg')])[{{arg2}}]" parameterized="true"/>
-        <element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'tox-tinymce-inline')]|(//div[@data-content-type='{{arg1}}'])[{{arg2}}][following-sibling::div[contains(@class,'tox-tinymce-inline')]]" parameterized="true"/>
+        <element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'tox-hugerte-inline')]|(//div[@data-content-type='{{arg1}}'])[{{arg2}}][following-sibling::div[contains(@class,'tox-hugerte-inline')]]" parameterized="true"/>
         <element name="inlineTextAreaEditor" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//textarea[@class='inline-wysiwyg-textarea']" parameterized="true"/>
         <element name="rootContainer" type="text" selector="(//div[contains(@class,&quot;pagebuilder-content-type&quot;) and contains(@class,&quot;pagebuilder-root-container&quot;)])[{{index}}]" parameterized="true"/>
         <element name="rootContainerPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-root-container')])[{{index}}][contains(@class,'empty-container')]//div[contains(@class,'empty-placeholder')]" parameterized="true"/>

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

@@ -38,8 +38,8 @@
         <element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
         <element name="wysiwyg" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]" parameterized="true"/>
         <element name="contentJS" type="text" selector="document.querySelectorAll('div[data-content-type=text] .inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
-        <element name="headingsList" type="text" selector="div[title='Headings']"/>
-        <element name="heading1Style" type="text" selector="div[title='Heading 1']"/>
+        <element name="headingsList" type="text" selector="//div[contains(@aria-label,'Headings')]"/>
+        <element name="heading1Style" type="text" selector="//div[contains(@aria-label,'Heading 1')]"/>
         <element name="emptyTextInHeading1Style" selector="(//div[contains(@class,'pagebuilder-text')])[1]//h1" type="text" />
         <!-- Advanced Configuration -->
         <element name="advancedConfigurationPath" type="text" parameterized="true" selector="(//div[contains(@class,&quot;pagebuilder-text&quot;)])[{{arg1}}]/div[@data-pb-style]"/>

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

@@ -12,11 +12,11 @@
         <element name="title" type="input" selector="//div[@aria-label='Insert link']//div[contains(@id,'-title') and .='Insert link']"/>
         <element name="xButton" type="button" selector="[aria-label='Insert link'] button.mce-close"/>
         <element name="urlInput" type="input" selector="//div[@class='tox-dialog']//label[text()='URL']/..//input"/>
-        <element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@title='Browse links']"/>
+        <element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@aria-label='Browse links']"/>
         <element name="textToDisplayInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Text to display']/..//input"/>
         <element name="titleInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Title']/..//input"/>
         <element name="targetInput" type="input" selector="button[title='Open link in...']"/>
-        <element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@title='Save']"/>
+        <element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@aria-label='Save']"/>
         <element name="cancelButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Cancel']"/>
     </section>
 </sections>

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

@@ -8,29 +8,29 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="WYSIWYGOnPageBuilderInline">
-        <element name="toolbar" type="button" selector=".tox-tinymce.tox-tinymce-inline"/>
-        <element name="inlineCss" type="button" selector=".tox-tinymce.tox-tinymce-inline"/>
-        <element name="notCss" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline)"/>
-        <element name="undo" type="button" selector=".tox-tinymce-inline button[aria-label='Undo']"/>
-        <element name="redo" type="button" selector=".tox-tinymce-inline button[aria-label='Redo']"/>
-        <element name="formatSelector" type="button" selector=".tox-tinymce-inline button[aria-label='Format Paragraph']"/>
-        <element name="fontSize" type="button" selector=".tox-tinymce-inline button[aria-label*='font size']:nth-of-type(1)"/>
-        <element name="fontSizeMinus" type="button" selector=".tox-tinymce-inline button[aria-label*='font size']:nth-of-type(1)"/>
-        <element name="fontSizePlus" type="button" selector=".tox-tinymce-inline button[aria-label*='font size']:nth-of-type(2)"/>
-        <element name="lineHeight" type="button" selector=".tox-tinymce-inline button[aria-label='Line height']"/>
-        <element name="textColor" type="button" selector=".tox-tinymce-inline div[aria-label='Text color Black']"/>
-        <element name="backgroundColor" type="button" selector=".tox-tinymce-inline div[aria-label='Background color Black']"/>
-        <element name="bold" type="button" selector=".tox-tinymce-inline button[aria-label='Bold']"/>
-        <element name="italic" type="button" selector=".tox-tinymce-inline button[aria-label='Italic']"/>
-        <element name="underline" type="button" selector=".tox-tinymce-inline button[aria-label='Underline']"/>
-        <element name="alignLeft" type="button" selector=".tox-tinymce-inline button[aria-label='Align left']"/>
-        <element name="alignCenter" type="button" selector=".tox-tinymce-inline button[aria-label='Align center']"/>
-        <element name="alignRight" type="button" selector=".tox-tinymce-inline button[aria-label='Align right']"/>
-        <element name="numberedList" type="button" selector=".tox-tinymce-inline div[aria-label='Numbered list']"/>
-        <element name="bulletList" type="button" selector=".tox-tinymce-inline div[aria-label='Bullet list']"/>
-        <element name="insertLink" type="button" selector=".tox-tinymce-inline button[aria-label='Insert/edit link']"/>
-        <element name="imageSelector" type="button" selector=".tox-tinymce-inline button[aria-label='Insert/edit image']"/>
-        <element name="table" type="button" selector=".tox-tinymce-inline button[aria-label='Table']"/>
+        <element name="toolbar" type="button" selector=".tox-hugerte.tox-hugerte-inline"/>
+        <element name="inlineCss" type="button" selector=".tox-hugerte.tox-hugerte-inline"/>
+        <element name="notCss" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline)"/>
+        <element name="undo" type="button" selector=".tox-hugerte-inline button[aria-label='Undo']"/>
+        <element name="redo" type="button" selector=".tox-hugerte-inline button[aria-label='Redo']"/>
+        <element name="formatSelector" type="button" selector=".tox-hugerte-inline button[aria-label='Format Paragraph']"/>
+        <element name="fontSize" type="button" selector=".tox-hugerte-inline button[aria-label*='font size']:nth-of-type(1)"/>
+        <element name="fontSizeMinus" type="button" selector=".tox-hugerte-inline button[aria-label*='font size']:nth-of-type(1)"/>
+        <element name="fontSizePlus" type="button" selector=".tox-hugerte-inline button[aria-label*='font size']:nth-of-type(2)"/>
+        <element name="lineHeight" type="button" selector=".tox-hugerte-inline button[aria-label='Line height']"/>
+        <element name="textColor" type="button" selector=".tox-hugerte-inline div[aria-label='Text color Black']"/>
+        <element name="backgroundColor" type="button" selector=".tox-hugerte-inline div[aria-label='Background color Black']"/>
+        <element name="bold" type="button" selector=".tox-hugerte-inline button[aria-label='Bold']"/>
+        <element name="italic" type="button" selector=".tox-hugerte-inline button[aria-label='Italic']"/>
+        <element name="underline" type="button" selector=".tox-hugerte-inline button[aria-label='Underline']"/>
+        <element name="alignLeft" type="button" selector=".tox-hugerte-inline button[aria-label='Align left']"/>
+        <element name="alignCenter" type="button" selector=".tox-hugerte-inline button[aria-label='Align center']"/>
+        <element name="alignRight" type="button" selector=".tox-hugerte-inline button[aria-label='Align right']"/>
+        <element name="numberedList" type="button" selector=".tox-hugerte-inline div[aria-label='Numbered list']"/>
+        <element name="bulletList" type="button" selector=".tox-hugerte-inline div[aria-label='Bullet list']"/>
+        <element name="insertLink" type="button" selector=".tox-hugerte-inline button[aria-label='Insert/edit link']"/>
+        <element name="imageSelector" type="button" selector=".tox-hugerte-inline button[aria-label='Insert/edit image']"/>
+        <element name="table" type="button" selector=".tox-hugerte-inline button[aria-label='Table']"/>
         <element name="tableMenuFirstItem" type="text" selector="div[title='Table']"/>
         <element name="tableGrid" type="text" parameterized="true" selector="//div[@class='tox-insert-table-picker']//div[{{size}}]"/>
         <element name="fontSizeValue" type="text" parameterized="true" selector="//*[@data-mce-style and contains(@style, '{{size}}')]"/>
@@ -43,12 +43,12 @@
         <element name="insertColumnBefore" type="button" selector="button[aria-label='Insert column before']"/>
         <element name="insertColumnAfter" type="button" selector="button[aria-label='Insert column after']"/>
         <element name="deleteColumn" type="button" selector="button[aria-label='Delete column']"/>
-        <element name="specialCharacter" type="button" selector=".tox-tinymce-inline button[aria-label='Special character']"/>
-        <element name="insertWidget" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Widget']"/>
-        <element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
-        <element name="imageSelectorBrowse" type="button" selector="button[title='Browse files']"/>
+        <element name="specialCharacter" type="button" selector=".tox-hugerte-inline button[aria-label='Special character']"/>
+        <element name="insertWidget" type="button" selector=".tox-hugerte-inline button[aria-label='Insert Widget']"/>
+        <element name="insertVariable" type="button" selector=".tox-hugerte-inline button[aria-label='Insert Variable']"/>
+        <element name="imageSelectorBrowse" type="button" selector="button[aria-label='Browse files']"/>
         <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[title='{{label}}']"/>
-        <element name="HeadSelector" type="text" selector="div[title='Headings']"/>
+        <element name="formatOption" type="text" parameterized="true" selector="//div[contains(@aria-label,'{{label}}')]"/>
+        <element name="HeadSelector" type="text" selector="//div[contains(@aria-label,'Headings')]"/>
     </section>
 </sections>

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

@@ -9,12 +9,12 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="WYSIWYGOnPageBuilder">
-        <element name="undo" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Undo']"/>
-        <element name="redo" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Redo']"/>
-        <element name="fontSize" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label*='font size']:nth-of-type(1)"/>
-        <element name="lineHeight" type="button" selector=".mce-tinymce:not(.mce-tinymce-inline) div[aria-label='Line Height']"/>
-        <element name="textColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Text color Black']"/>
-        <element name="backgroundColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Background color Black']"/>
-        <element name="formatSelector" type="button" selector="//div[contains(@class, 'tox-tinymce') and not(contains(@class, 'tox-tinymce-inline'))]//span[text()='Paragraph']"/>
+        <element name="undo" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) button[aria-label='Undo']"/>
+        <element name="redo" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) button[aria-label='Redo']"/>
+        <element name="fontSize" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) button[aria-label*='font size']:nth-of-type(1)"/>
+        <element name="lineHeight" type="button" selector=".mce-hugerte:not(.mce-hugerte-inline) div[aria-label='Line Height']"/>
+        <element name="textColor" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) div[aria-label='Text color Black']"/>
+        <element name="backgroundColor" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) div[aria-label='Background color Black']"/>
+        <element name="formatSelector" type="button" selector="//div[contains(@class, 'tox-hugerte') and not(contains(@class, 'tox-hugerte-inline'))]//span[text()='Paragraph']"/>
     </section>
 </sections>

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

@@ -8,6 +8,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="TinyMCESection">
-        <element name="Style" type="button" selector="button[title='Format Paragraph']"/>
+        <element name="Style" type="button" selector="button[aria-label='Format Paragraph']"/>
     </section>
 </sections>