Skip to content

Commit 1d5ef09

Browse files
dvoskoboinikovdvoskoboinikov
authored
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
2 parents c113689 + a106f61 commit 1d5ef09

File tree

13 files changed

+36
-33
lines changed

13 files changed

+36
-33
lines changed

‎app/code/Magento/AwsS3PageBuilder/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Aws S3 Page Builder module",
44
"require": {
55
"magento/framework": "*",
6-
"php": "~7.4.0||~8.1.0"
6+
"php": "~8.1.0||~8.2.0"
77
},
88
"suggest": {
99
"magento/module-page-builder": "*",

‎app/code/Magento/CatalogPageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-catalog": "*",
1010
"magento/framework": "*",
11-
"php": "~7.4.0||~8.1.0"
11+
"php": "~8.1.0||~8.2.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

‎app/code/Magento/CmsPageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-cms": "*",
1010
"magento/framework": "*",
11-
"php": "~7.4.0||~8.1.0"
11+
"php": "~8.1.0||~8.2.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</arguments>
1616
<waitForElementVisible selector="{{section.formatSelector}}" stepKey="waitForFormatList"/>
1717
<click selector="{{section.formatSelector}}" stepKey="expandFormatList"/>
18+
<click selector="{{section.HeadSelector}}" stepKey="clickHeading"/>
1819
<waitForElementVisible selector="{{section.formatOption(format.label)}}" stepKey="waitForFormatOptionVisible"/>
1920
<click selector="{{section.formatOption(format.label)}}" stepKey="clickFormatOption"/>
2021
<waitForElementNotVisible selector="{{section.formatOption(format.label)}}" stepKey="waitForFormatInvisible"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</arguments>
1919
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
2020
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(contentType.role, index)}}" stepKey="waitForEditorPanel"/>
21-
<pressKey selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
21+
<fillField selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
2222
<waitForPageLoad stepKey="waitForPageLoad"/>
2323
<waitForText userInput="{{content}}" stepKey="waitForContent"/>
2424
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@
114114
<data key="selection">t strin</data>
115115
</entity>
116116
<entity name="TinyMCEHeadingVariableTextSelection" type="pagebuilder_multiple_text_selection">
117-
<data key="selection">his is a heading
118-
Base URL
119-
120-
test strin</data>
117+
<data key="selection">his is a headingBase URLtest strin</data>
121118
</entity>
122119
</entities>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
4646
<element name="imageSelectorBrowse" type="button" selector="button[title='Source']"/>
4747
<element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
48-
<element name="formatOption" type="text" parameterized="true" selector="//div[contains(@class, 'mce-menu')]//span[contains(@class, 'mce-text') and text()='{{label}}']"/>
48+
<element name="formatOption" type="text" parameterized="true" selector="div[title='{{label}}']"/>
49+
<element name="HeadSelector" type="text" selector="div[title='Headings']"/>
4950
</section>
5051
</sections>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
</actionGroup>
147147
<!-- Background Position has expected dropdown values -->
148148
<comment userInput="Background Position has expected dropdown values" stepKey="commentDefaultBackgroundPositionValues"/>
149-
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" userInput="innerText" stepKey="grabBackgroundPositionOptions"/>
149+
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" userInput="data-title" stepKey="grabBackgroundPositionOptions"/>
150150
<assertEquals message="Verify Background Position dropdown options" stepKey="assertBackgroundPositionOptions">
151151
<actualResult type="variable">grabBackgroundPositionOptions</actualResult>
152152
<expectedResult type="array">{{PageBuilderBackgroundPosition_Default.optionsList}}</expectedResult>
@@ -166,7 +166,7 @@
166166
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBackgroundAttachment">
167167
<argument name="property" value="PageBuilderBackgroundAttachment_Scroll"/>
168168
</actionGroup>
169-
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundAttachment_Default.section, PageBuilderBackgroundAttachment_Default.fieldName)}}" userInput="innerText" stepKey="grabBackgroundAttachmentOptions"/>
169+
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundAttachment_Default.section, PageBuilderBackgroundAttachment_Default.fieldName)}}" userInput="data-title" stepKey="grabBackgroundAttachmentOptions"/>
170170
<assertEquals message="Verify Background Attachment dropdown options" stepKey="assertBackgroundAttachmentOptions">
171171
<actualResult type="variable">grabBackgroundAttachmentOptions</actualResult>
172172
<expectedResult type="array">{{PageBuilderBackgroundAttachment_Default.optionsList}}</expectedResult>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<argument name="property" value="PageBuilderAdvancedBorderPropertyDefault"/>
7474
</actionGroup>
7575
<comment userInput="Border: available values None, Default, Dotted, Dashed, Solid, Double, Groove, Ridge, Inset, Outset" stepKey="AC2"/>
76-
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderAdvancedBorderPropertyDefault.section, PageBuilderAdvancedBorderPropertyDefault.fieldName)}}" userInput="innerText" stepKey="grabBorderOptions"/>
76+
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderAdvancedBorderPropertyDefault.section, PageBuilderAdvancedBorderPropertyDefault.fieldName)}}" userInput="data-title" stepKey="grabBorderOptions"/>
7777
<assertEquals message="Verify Border dropdown options" stepKey="assertBorderOptions2">
7878
<actualResult type="variable">grabBorderOptions</actualResult>
7979
<expectedResult type="array">{{PageBuilderAdvancedBorderDefaultSlideProperty.optionsList}}</expectedResult>

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

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@
1818
<testCaseId value="MC-29450"/>
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-text"/>
21-
<skip>
22-
<issueId value="MQE-2288" />
23-
<issueId value="MQE-3208" />
24-
</skip>
2521
<group value="pr_exclude"/>
2622
</annotations>
2723
<before>
28-
<createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
24+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
2925
<actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
3026
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3127
</before>
@@ -40,10 +36,12 @@
4036
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection1">
4137
<argument name="contentType" value="PageBuilderTextContentType"/>
4238
</actionGroup>
43-
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragTextIntoStage">
39+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
40+
<argument name="contentType" value="PageBuilderRowContentType"/>
41+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
42+
</actionGroup>
43+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage">
4444
<argument name="contentType" value="PageBuilderTextContentType"/>
45-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
46-
<argument name="dropZoneIndex" value="2"/>
4745
</actionGroup>
4846
<actionGroup ref="focusTinyMCE" stepKey="focusTinyMCE"/>
4947
<!-- Create new Heading 2 -->
@@ -79,14 +77,16 @@
7977
<argument name="endY">{{TinyMCEPartialHeadingSelection.endY}}</argument>
8078
</helper>
8179
<actionGroup ref="waitForTinyMCEInFocus" stepKey="waitForTinyMCEInFocus"/>
82-
<actionGroup ref="assertSelectedText" stepKey="assertSelection">
83-
<argument name="expectedSelectedText" value="TinyMCEPartialHeadingSelection"/>
84-
</actionGroup>
80+
<executeJS function="return jQuery('.inline-wysiwyg h2').text().substring(1, 11);" stepKey="selectionString"/>
81+
<assertEquals stepKey="assertSelection">
82+
<expectedResult type="string">{{TinyMCEPartialHeadingSelection.selection}}</expectedResult>
83+
<actualResult type="variable">selectionString</actualResult>
84+
</assertEquals>
8585
<reloadPage stepKey="reloadPage"/>
8686
<waitForPageLoad stepKey="waitForReload"/>
8787
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
8888
<actionGroup ref="scrollToTinyMCE" stepKey="scrollToTinyMCE2"/>
89-
<!-- Select portion of paragraph text "es stri" -->
89+
<!-- Select portion of paragraph text "t strin" -->
9090
<helper class="Magento\PageBuilder\Test\Mftf\Helper\SelectText" method="selectText" stepKey="selectTextInTinyMCE">
9191
<argument name="context">//div[contains(@class, 'inline-wysiwyg')]//p[2]</argument>
9292
<argument name="startX">{{TinyMCEPartialTextSelection.startX}}</argument>
@@ -95,9 +95,11 @@
9595
<argument name="endY">{{TinyMCEPartialTextSelection.endY}}</argument>
9696
</helper>
9797
<actionGroup ref="waitForTinyMCEInFocus" stepKey="waitForTinyMCEInFocus2"/>
98-
<actionGroup ref="assertSelectedText" stepKey="assertSelection2">
99-
<argument name="expectedSelectedText" value="TinyMCEPartialTextSelection"/>
100-
</actionGroup>
98+
<executeJS function="return jQuery('.inline-wysiwyg p:last-child').text().substring(3, 10);" stepKey="selectionString2"/>
99+
<assertEquals stepKey="assertSelection2">
100+
<expectedResult type="string">{{TinyMCEPartialTextSelection.selection}}</expectedResult>
101+
<actualResult type="variable">selectionString2</actualResult>
102+
</assertEquals>
101103
<reloadPage stepKey="reloadPage2"/>
102104
<waitForPageLoad stepKey="waitForReload2"/>
103105
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
@@ -113,8 +115,10 @@
113115
</helper>
114116

115117
<actionGroup ref="waitForTinyMCEInFocus" stepKey="waitForTinyMCEInFocus3"/>
116-
<actionGroup ref="assertSelectedText" stepKey="assertSelection3">
117-
<argument name="expectedSelectedText" value="TinyMCEHeadingVariableTextSelection"/>
118-
</actionGroup>
118+
<executeJS function="return jQuery('.inline-wysiwyg').text().substring(1, 35);" stepKey="selectionString3"/>
119+
<assertEquals stepKey="assertSelection3">
120+
<expectedResult type="string">{{TinyMCEHeadingVariableTextSelection.selection}}</expectedResult>
121+
<actualResult type="variable">selectionString3</actualResult>
122+
</assertEquals>
119123
</test>
120124
</tests>

‎app/code/Magento/PageBuilder/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"magento/module-wishlist": "*",
2222
"magento/module-require-js": "*",
2323
"magento/module-media-storage": "*",
24-
"php": "~7.4.0||~8.1.0",
24+
"php": "~8.1.0||~8.2.0",
2525
"phpgt/dom": "2.2.3"
2626
},
2727
"suggest": {

‎app/code/Magento/PageBuilderAdminAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"require": {
88
"magento/framework": "*",
9-
"php": "~7.4.0||~8.1.0"
9+
"php": "~8.1.0||~8.2.0"
1010
},
1111
"suggest": {
1212
"magento/module-admin-analytics": "*",

‎app/code/Magento/PageBuilderAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"magento/module-analytics": "*",
66
"magento/module-page-builder": "*",
77
"magento/framework": "*",
8-
"php": "~7.4.0||~8.1.0"
8+
"php": "~8.1.0||~8.2.0"
99
},
1010
"type": "magento2-module",
1111
"license": [

0 commit comments

Comments
 (0)