Merge remote-tracking branch 'upstream/develop' into fixed-returning-from-method-that-doesnt-return

hostep · hostep · commit 24e512685e8a · 2025-02-26T07:52:21.000+01:00
diff --git a/app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php b/app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2024 Adobe
+ * All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
+  * Copyright 2024 Adobe All rights reserved.
   * See COPYING.txt for license details.
   */
 -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageWithoutImageUploadedSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageWithoutImageUploadedSection.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
+  * Copyright 2024 Adobe All rights reserved.
   * See COPYING.txt for license details.
   */
 -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
+  * Copyright 2024 Adobe All rights reserved.
   * See COPYING.txt for license details.
   */
 -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
+  * Copyright 2024 Adobe All rights reserved.
   * See COPYING.txt for license details.
   */
 -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright 2020 Adobe
-  * All Rights Reserved.
+  * Copyright 2024 Adobe
+  * All rights reserved.
+  * See COPYING.txt for license details.
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright 2020 Adobe
+  * Copyright 2025 Adobe
   * All Rights Reserved.
   */
 -->
@@ -13,11 +13,13 @@
         <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='Formats']"/>
-        <element name="fontSize" type="button" selector=".tox-tinymce-inline button[aria-label='Font sizes']"/>
+        <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']"/>
-        <element name="backgroundColor" type="button" selector=".tox-tinymce-inline div[aria-label='Background color']"/>
+        <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']"/>
@@ -31,6 +33,7 @@
         <element name="table" type="button" selector=".tox-tinymce-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}}')]"/>
         <element name="tableToolbar" type="text" selector=".tox-pop .tox-pop__dialog .tox-toolbar"/>
         <element name="tableProperties" type="button" selector="button[aria-label='Table properties']"/>
         <element name="deleteTable" type="button" selector="button[aria-label='Delete table']"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderSection.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
   */
 -->
+
 <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 sizes']"/>
+        <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']"/>
-        <element name="backgroundColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Background color']"/>
+        <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']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithCustomTinyMCETest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithCustomTinyMCETest.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
   */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextAddTextWithCustomTinyMCETest">
@@ -18,7 +19,6 @@
             <testCaseId value="MC-1333"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifySelectionInlineWYSIWYG.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifySelectionInlineWYSIWYG.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
   */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextVerifySelectionInlineWYSIWYG">
@@ -18,7 +19,6 @@
             <testCaseId value="MC-29450"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCEToolbarOnPageBuilderStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCEToolbarOnPageBuilderStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextVerifyTinyMCEToolbarOnPageBuilderStageTest">
@@ -17,7 +17,6 @@
             <testCaseId value="MC-3463"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
@@ -52,51 +51,31 @@
         <seeElement selector="{{WYSIWYGOnPageBuilderInline.textColor}}" stepKey="seeTextColor"/>
         <seeElement selector="{{WYSIWYGOnPageBuilderInline.backgroundColor}}" stepKey="seeBackgroundColor"/>
         <!--Verify FontSize-->
-        <comment userInput="Verify FontSize" stepKey="commentVerifyFontSize"/>
-        <click selector="{{WYSIWYGOnPageBuilderInline.fontSize}}" stepKey="clickOnFontSize"/>
-        <see userInput="10px" stepKey="see10px"/>
-        <see userInput="12px" stepKey="see12px"/>
-        <see userInput="14px" stepKey="see14px"/>
-        <see userInput="16px" stepKey="see16px"/>
-        <see userInput="18px" stepKey="see18px"/>
-        <see userInput="20px" stepKey="see20px"/>
-        <see userInput="24px" stepKey="see24px"/>
-        <see userInput="26px" stepKey="see26px"/>
-        <see userInput="28px" stepKey="see28px"/>
-        <see userInput="32px" stepKey="see32px"/>
-        <see userInput="34px" stepKey="see34px"/>
-        <see userInput="36px" stepKey="see36px"/>
-        <see userInput="38px" stepKey="see38px"/>
-        <see userInput="40px" stepKey="see40px"/>
-        <see userInput="42px" stepKey="see42px"/>
-        <see userInput="48px" stepKey="see48px"/>
-        <see userInput="52px" stepKey="see52px"/>
-        <see userInput="56px" stepKey="see56px"/>
-        <see userInput="64px" stepKey="see64px"/>
-        <see userInput="72px" stepKey="see72px"/>
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizeMinus}}" stepKey="clickOnFontSizeMinus"/>
+        <waitForElementVisible stepKey="see13px"  selector="{{WYSIWYGOnPageBuilderInline.fontSizeValue('font-size: 13px')}}"/>
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizeMinus}}" stepKey="clickOnFontSizeMinusAgain"/>
+        <waitForElementVisible stepKey="see12px" selector="//*[@data-mce-style and contains(@style, 'font-size: 12px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlus"/>
+        <waitForElementVisible stepKey="see13pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 13px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlusOne"/>
+        <waitForElementVisible stepKey="see14pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 14px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlusTwo"/>
+        <waitForElementVisible stepKey="see15pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 15px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlusThree"/>
+        <waitForElementVisible stepKey="see16pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 16px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlusFour"/>
+        <waitForElementVisible stepKey="see17pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 17px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlusFive"/>
+        <waitForElementVisible stepKey="see18pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 18px')]" />
         <!--Verify LineHeight-->
         <comment userInput="Verify LineHeight" stepKey="commentVerifyLineHeight"/>
         <click selector="{{WYSIWYGOnPageBuilderInline.lineHeight}}" stepKey="clickOnLineHeight"/>
-        <see userInput="10px" stepKey="seeLineHeight10px"/>
-        <see userInput="12px" stepKey="seeLineHeight12px"/>
-        <see userInput="14px" stepKey="seeLineHeight14px"/>
-        <see userInput="16px" stepKey="seeLineHeight16px"/>
-        <see userInput="18px" stepKey="seeLineHeight18px"/>
-        <see userInput="20px" stepKey="seeLineHeight20px"/>
-        <see userInput="24px" stepKey="seeLineHeight24px"/>
-        <see userInput="26px" stepKey="seeLineHeight26px"/>
-        <see userInput="28px" stepKey="seeLineHeight28px"/>
-        <see userInput="32px" stepKey="seeLineHeight32px"/>
-        <see userInput="34px" stepKey="seeLineHeight34px"/>
-        <see userInput="36px" stepKey="seeLineHeight36px"/>
-        <see userInput="38px" stepKey="seeLineHeight38px"/>
-        <see userInput="40px" stepKey="seeLineHeight40px"/>
-        <see userInput="42px" stepKey="seeLineHeight42px"/>
-        <see userInput="48px" stepKey="seeLineHeight48px"/>
-        <see userInput="52px" stepKey="seeLineHeight52px"/>
-        <see userInput="56px" stepKey="seeLineHeight56px"/>
-        <see userInput="64px" stepKey="seeLineHeight64px"/>
-        <see userInput="72px" stepKey="seeLineHeight72px"/>
+        <waitForText userInput="1.1" stepKey="seeValue1"/>
+        <waitForText userInput="1.2" stepKey="seeValue2"/>
+        <waitForText userInput="1.3" stepKey="seeValue3"/>
+        <waitForText userInput="1.4" stepKey="seeValue4"/>
+        <waitForText userInput="1.5" stepKey="seeValue5"/>
+        <waitForText userInput="2" stepKey="seeValue6"/>
         <!--Verify FontStyle on preview-->
         <comment userInput="Verify FontStyle on preview" stepKey="commentVerifyFontsizeOnPreview"/>
         <clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/Filter/TemplateTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/Filter/TemplateTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2024 Adobe
+ * All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/Session/RandomKeyTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/Session/RandomKeyTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2024 Adobe
+ * All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/WidgetInitializerConfigTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/WidgetInitializerConfigTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2024 Adobe
+ * All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Plugin/ClearEditorConfigCacheTest.php b/app/code/Magento/PageBuilder/Test/Unit/Plugin/ClearEditorConfigCacheTest.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2024 Adobe
+ * All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/template-manager.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/template-manager.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview/image.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview/image.html
@@ -1,6 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
+ * Copyright 2024 Adobe
+   All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/template-manager.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/template-manager.ts
diff --git a/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php b/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Product/ViewTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Product/ViewTest.php
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php
