Skip to content

Commit 24e5126

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into fixed-returning-from-method-that-doesnt-return
2 parents fb1286e + adfb174 commit 24e5126

File tree

21 files changed

+304
-183
lines changed

21 files changed

+304
-183
lines changed

app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
4+
* Copyright 2024 Adobe All rights reserved.
55
* See COPYING.txt for license details.
66
*/
77
-->

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageWithoutImageUploadedSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
4+
* Copyright 2024 Adobe All rights reserved.
55
* See COPYING.txt for license details.
66
*/
77
-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
4+
* Copyright 2024 Adobe All rights reserved.
55
* See COPYING.txt for license details.
66
*/
77
-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
4+
* Copyright 2024 Adobe All rights reserved.
55
* See COPYING.txt for license details.
66
*/
77
-->

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright 2020 Adobe
5-
* All Rights Reserved.
4+
* Copyright 2024 Adobe
5+
* All rights reserved.
6+
* See COPYING.txt for license details.
67
*/
78
-->
89
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright 2020 Adobe
4+
* Copyright 2025 Adobe
55
* All Rights Reserved.
66
*/
77
-->
@@ -13,11 +13,13 @@
1313
<element name="notCss" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline)"/>
1414
<element name="undo" type="button" selector=".tox-tinymce-inline button[aria-label='Undo']"/>
1515
<element name="redo" type="button" selector=".tox-tinymce-inline button[aria-label='Redo']"/>
16-
<element name="formatSelector" type="button" selector=".tox-tinymce-inline button[aria-label='Formats']"/>
17-
<element name="fontSize" type="button" selector=".tox-tinymce-inline button[aria-label='Font sizes']"/>
16+
<element name="formatSelector" type="button" selector=".tox-tinymce-inline button[aria-label='Format Paragraph']"/>
17+
<element name="fontSize" type="button" selector=".tox-tinymce-inline button[aria-label*='font size']:nth-of-type(1)"/>
18+
<element name="fontSizeMinus" type="button" selector=".tox-tinymce-inline button[aria-label*='font size']:nth-of-type(1)"/>
19+
<element name="fontSizePlus" type="button" selector=".tox-tinymce-inline button[aria-label*='font size']:nth-of-type(2)"/>
1820
<element name="lineHeight" type="button" selector=".tox-tinymce-inline button[aria-label='Line height']"/>
19-
<element name="textColor" type="button" selector=".tox-tinymce-inline div[aria-label='Text color']"/>
20-
<element name="backgroundColor" type="button" selector=".tox-tinymce-inline div[aria-label='Background color']"/>
21+
<element name="textColor" type="button" selector=".tox-tinymce-inline div[aria-label='Text color Black']"/>
22+
<element name="backgroundColor" type="button" selector=".tox-tinymce-inline div[aria-label='Background color Black']"/>
2123
<element name="bold" type="button" selector=".tox-tinymce-inline button[aria-label='Bold']"/>
2224
<element name="italic" type="button" selector=".tox-tinymce-inline button[aria-label='Italic']"/>
2325
<element name="underline" type="button" selector=".tox-tinymce-inline button[aria-label='Underline']"/>
@@ -31,6 +33,7 @@
3133
<element name="table" type="button" selector=".tox-tinymce-inline button[aria-label='Table']"/>
3234
<element name="tableMenuFirstItem" type="text" selector="div[title='Table']"/>
3335
<element name="tableGrid" type="text" parameterized="true" selector="//div[@class='tox-insert-table-picker']//div[{{size}}]"/>
36+
<element name="fontSizeValue" type="text" parameterized="true" selector="//*[@data-mce-style and contains(@style, '{{size}}')]"/>
3437
<element name="tableToolbar" type="text" selector=".tox-pop .tox-pop__dialog .tox-toolbar"/>
3538
<element name="tableProperties" type="button" selector="button[aria-label='Table properties']"/>
3639
<element name="deleteTable" type="button" selector="button[aria-label='Delete table']"/>
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
8+
89
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
910
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1011
<section name="WYSIWYGOnPageBuilder">
1112
<element name="undo" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Undo']"/>
1213
<element name="redo" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Redo']"/>
13-
<element name="fontSize" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Font sizes']"/>
14+
<element name="fontSize" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label*='font size']:nth-of-type(1)"/>
1415
<element name="lineHeight" type="button" selector=".mce-tinymce:not(.mce-tinymce-inline) div[aria-label='Line Height']"/>
15-
<element name="textColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Text color']"/>
16-
<element name="backgroundColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Background color']"/>
16+
<element name="textColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Text color Black']"/>
17+
<element name="backgroundColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Background color Black']"/>
1718
<element name="formatSelector" type="button" selector="//div[contains(@class, 'tox-tinymce') and not(contains(@class, 'tox-tinymce-inline'))]//span[text()='Paragraph']"/>
1819
</section>
1920
</sections>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
8+
89
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
910
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1011
<test name="TextAddTextWithCustomTinyMCETest">
@@ -18,7 +19,6 @@
1819
<testCaseId value="MC-1333"/>
1920
<group value="pagebuilder"/>
2021
<group value="pagebuilder-text"/>
21-
<group value="pr_exclude"/>
2222
</annotations>
2323
<before>
2424
<createData entity="_defaultCmsPage" stepKey="createCMSPage"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
8+
89
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
910
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1011
<test name="TextVerifySelectionInlineWYSIWYG">
@@ -18,7 +19,6 @@
1819
<testCaseId value="MC-29450"/>
1920
<group value="pagebuilder"/>
2021
<group value="pagebuilder-text"/>
21-
<group value="pr_exclude"/>
2222
</annotations>
2323
<before>
2424
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

0 commit comments

Comments
 (0)