Skip to content

Commit d1bdaf5

Browse files
dvoskoboinikovdvoskoboinikov
authored
Merge pull request #170 from magento-cia/2.4.5-develop-2.4-develop-sync-05312022
Sync of 2.4.5-develop with 2.4-develop
2 parents 4ae6590 + 5a91ea0 commit d1bdaf5

File tree

57 files changed

+4189
-710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+4189
-710
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragExistingColumnToExistingColumnLineActionGroup.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="dragExistingColumnToExistingColumnLine">
11+
<arguments>
12+
<argument name="containerColumnGroupIndex" defaultValue="1" type="string"/>
13+
<argument name="containerColumnLineIndex" defaultValue="1" type="string"/>
14+
<argument name="columnIndexInNewLine" defaultValue="1" type="string"/>
15+
<argument name="columnIndex" defaultValue="1" type="string"/>
16+
<argument name="x" defaultValue="null" type="string"/>
17+
<argument name="y" defaultValue="null" type="string"/>
18+
</arguments>
19+
<waitForElementVisible time="20" selector="{{PageBuilderStage.contentTypeInStageByIndex('column', columnIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
20+
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex('column', columnIndex)}}" x="{{x}}" y="{{y}}" stepKey="onMouseOverContentTypeStage"/>
21+
<waitForPageLoad time="30" stepKey="waitForMouseOverAnimation"/>
22+
<waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex('column', columnIndex)}}" stepKey="waitForOptions"/>
23+
<waitForElementVisible selector="{{ColumnOnBackend.columnMoveByIndex(columnIndex)}}" stepKey="waitForMoveHandle"/>
24+
<dragAndDrop selector1="{{ColumnOnBackend.columnMoveByIndex(columnIndex)}}" selector2="{{PageBuilderStage.contentTypeInStageByIndex('column-group', containerColumnGroupIndex)}}{{PageBuilderStage.childContentTypeInStageByIndex('column-line', containerColumnLineIndex)}}{{PageBuilderStage.childContentTypeInStageByIndex('column', columnIndexInNewLine)}}" stepKey="moveContentTypeIntoContainer"/>
25+
<waitForPageLoad stepKey="waitForDragOperation"/>
26+
</actionGroup>
27+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragExistingColumnToNewColumnLineActionGroup.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="dragExistingColumnToNewColumnLine">
11+
<arguments>
12+
<argument name="newColumnLineIndexExpected" defaultValue="1" type="string"/>
13+
<argument name="targetColumnLineSelector" type="string"/>
14+
<argument name="columnIndex" defaultValue="1" type="string"/>
15+
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
16+
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
17+
<!-- When adding column line to the top, advised to use y offset of 10 -->
18+
</arguments>
19+
<waitForElementVisible time="20" selector="{{PageBuilderStage.contentTypeInStageByIndex('column', columnIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
20+
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex('column', columnIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
21+
<waitForPageLoad time="30" stepKey="waitForMouseOverAnimation"/>
22+
<waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex('column', columnIndex)}}" stepKey="waitForOptions"/>
23+
<waitForElementVisible selector="{{ColumnOnBackend.columnMoveByIndex(columnIndex)}}" stepKey="waitForMoveHandle"/>
24+
<dragAndDrop selector1="{{ColumnOnBackend.columnMoveByIndex(columnIndex)}}" selector2="{{targetColumnLineSelector}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropPageBuilderColumnGroupContentTypeIntoStage"/>
25+
<waitForPageLoad stepKey="waitForAnimationasdads" time="30"/>
26+
<dontSeeJsError stepKey="doNotSeeJSErrorInConsole"/>
27+
<waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex('column-line', newColumnLineIndexExpected)}}" stepKey="waitForPageBuilderColumnLineContentTypeInStage"/>
28+
<waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/>
29+
</actionGroup>
30+
</actionGroups>
31+

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragNewColumnToNewColumnLineActionGroup.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="dragNewColumnToNewColumnLine">
11+
<arguments>
12+
<argument name="contentTypeIndex" defaultValue="1" type="string"/>
13+
<argument name="targetColumnLineSelector" type="string"/>
14+
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
15+
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
16+
<argument name="pageBuilderArea" defaultValue="" type="string"/>
17+
</arguments>
18+
<click selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="lostFocus"/>
19+
<waitForElementVisible time="30" selector="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel(PageBuilderColumnGroupContentType.name)}}" stepKey="waitForPageBuilderColumnGroupContentTypeInPanel"/>
20+
<dragAndDrop selector1="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel(PageBuilderColumnGroupContentType.name)}}" selector2="{{targetColumnLineSelector}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropagainPageBuilderColumnGroupContentTypeIntoStage"/>
21+
<waitForPageLoad stepKey="waitForAnimationasdads" time="30"/>
22+
<dontSeeJsError stepKey="doNotSeeJSErrorInConsole"/>
23+
<waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex('column-line', contentTypeIndex)}}" stepKey="waitForPageBuilderColumnLineContentTypeInStage"/>
24+
<waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/>
25+
</actionGroup>
26+
</actionGroups>
27+

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@
4444
<data key="value">75</data>
4545
<data key="style">min-height: 75px</data>
4646
</entity>
47+
<entity name="PageBuilderMinHeightProperty_150" type="pagebuilder_min_height_property">
48+
<data key="name">Minimum Height</data>
49+
<data key="section">appearance_fieldset</data>
50+
<data key="fieldName">min_height</data>
51+
<data key="value">150</data>
52+
<data key="style">min-height: 150px</data>
53+
</entity>
4754
<entity name="PageBuilderMinHeightProperty_500" type="pagebuilder_min_height_property">
4855
<data key="name">Minimum Height</data>
4956
<data key="section">appearance_fieldset</data>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
<data key="role">column-group</data>
3030
<data key="pageNamePrefix">columns</data>
3131
</entity>
32+
<entity name="PageBuilderColumnLineContentType" type="pagebuilder_content_type">
33+
<data key="name">Column Line</data>
34+
<data key="section">Layout</data>
35+
<data key="role">column-line</data>
36+
<data key="pageNamePrefix">column-line</data>
37+
</entity>
3238
<entity name="PageBuilderColumnContentType" type="pagebuilder_content_type">
3339
<data key="name">Column</data>
3440
<data key="section">Layout</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnLineSection/ColumnLineOnBackendSection.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
9+
<section name="ColumnLineOnBackend">
10+
<element name="base" type="button" selector="(//div[@data-content-type=&quot;column-line&quot;])[{{arg1}}]" parameterized="true"/>
11+
<element name="bottomDropPlaceHolder" type="button" selector="(//div[@data-content-type=&quot;column-line&quot;])[{{arg1}}]/div[contains(@class,&quot;bottom-dropper&quot;)]" parameterized="true"/>
12+
<element name="topDropPlaceHolder" type="button" selector="(//div[@data-content-type=&quot;column-line&quot;])[{{arg1}}]/div[contains(@class,&quot;top-dropper&quot;)]" parameterized="true"/>
13+
<element name="childColumnDisplayLabel" type="button" selector="(//div[@data-content-type=&quot;column-line&quot;])[{{arg1}}]//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(' ', @class, ' '), ' pagebuilder-column ')][{{arg2}}]/descendant::div[contains(@class, &quot;pagebuilder-display-label&quot;)][contains(text(), &quot;{{arg3}}&quot;)]" parameterized="true"/>
14+
</section>
15+
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnBackendSection.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<element name="baseCSS" type="text" selector="[data-content-type=column][data-element=main]"/>
1313
<element name="elementChildren" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]/div[contains(@class,&quot;pagebuilder-column-inner&quot;)]/div[contains(@class,&quot;element-children&quot;)]" parameterized="true"/>
1414
<element name="columnConfigurationPath" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
15-
<element name="columnChildrenConfigurationPath" type="text" selector="(//div[contains(@class, &quot;pagebuilder-column-group&quot;)])[{{arg1}}]/descendant::div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(@class, &quot;pagebuilder-column&quot;)][{{arg2}}]//div[contains(@class, &quot;element-children&quot;)]" parameterized="true"/>
15+
<element name="columnChildrenConfigurationPath" type="text" selector="(//div[contains(@class, &quot;pagebuilder-column-group&quot;)])[{{arg1}}]/descendant::div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(&quot; &quot;, @class, &quot; &quot;), &quot; pagebuilder-column &quot;)][{{arg2}}]//div[contains(@class, &quot;element-children&quot;)]" parameterized="true"/>
1616
<element name="allColumns" type="text" selector="//div[contains(@class, 'pagebuilder-content-type') and contains(concat(' ', @class, ' '), ' pagebuilder-column ')]"/>
1717
<element name="default" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-column')])[{{arg1}}][@style='border: {{arg2}}; border-radius: {{arg3}}px; margin: {{arg4}}px; padding: {{arg5}}px; width: {{arg6}}; background-size: {{arg7}}; background-repeat: {{arg8}}; background-attachment: {{arg9}}; align-self: {{arg10}};']" parameterized="true" deprecated="Styles are not inline"/>
1818
<element name="empty" type="button" selector="(//div[contains(@class,'empty-container')]//div[contains(@class,'element-children') and contains(@class,'column-container')])[{{arg1}}]" parameterized="true"/>
@@ -25,6 +25,7 @@
2525
<element name="columnGroupColumns" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(concat(' ', @class, ' '), ' pagebuilder-column ')]" parameterized="true"/>
2626
<element name="column" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(concat(' ', @class, ' '), ' pagebuilder-column ')][1]"/>
2727
<element name="columnX" type="text" selector=".pagebuilder-content-type.pagebuilder-column:nth-child({{arg1}})" parameterized="true"/>
28+
<element name="columnXInColumnLineY" type="text" selector=".pagebuilder-content-type.pagebuilder-column-line:nth-child({{arg1}}) .pagebuilder-content-type.pagebuilder-column:nth-child({{arg2}})" parameterized="true"/>
2829
<element name="columnResizeHandle" type="block" selector=".pagebuilder-column-resize-handle"/>
2930
<element name="columnResizeGridLine" type="block" selector=".resize-grid .grid-line:nth-child({{arg}})" parameterized="true"/>
3031
<element name="columnStyle" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(concat(' ', @class, ' '), ' pagebuilder-column ')][{{arg1}}][contains(@style, '{{arg2}}')]" parameterized="true" deprecated="Styles are not inline"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<element name="contentTypeLabelByText" type="button" selector="//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(' ', @class, ' '), ' pagebuilder-{{arg1}} ')]//div[contains(@class, &quot;pagebuilder-display-label&quot;) and contains(., &quot;{{labelText}}&quot;)]" parameterized="true"/>
4141
<element name="contentTypeAffordanceLabelByText" type="button" selector="//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(@class, &quot;pagebuilder-affordance-{{contentType}}&quot;)]//div[contains(@class, &quot;pagebuilder-display-label&quot;) and contains(., &quot;{{labelText}}&quot;)]" parameterized="true"/>
4242
<element name="contentTypeInStageByIndex" type="button" selector="(//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(' ', @class, ' '), &quot; pagebuilder-{{arg1}} &quot;)])[{{arg2}}]" parameterized="true"/>
43+
<element name="childContentTypeInStageByIndex" type="button" selector="//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(' ', @class, ' '), &quot; pagebuilder-{{arg1}} &quot;)][{{arg2}}]" parameterized="true"/>
4344
<element name="contentTypeContainer" type="button" selector="(//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(' ', @class, ' '), ' pagebuilder-{{arg1}} ')])[{{arg2}}]/descendant::div[contains(@class, &quot;element-children&quot;)]" parameterized="true"/>
4445
<element name="contentTypeInsideContainerStage" type="button" selector="(//div[contains(@class, &quot;{{arg1}}-container&quot;)])[{{arg2}}]//div[contains(@class,&quot;pagebuilder-content-type-wrapper&quot;)][{{arg3}}]//div[contains(@class,&quot;pagebuilder-{{arg4}}&quot;)][{{arg5}}]" parameterized="true"/>
4546
<element name="contentTypePreviewInStage" type="button" selector="div.pagebuilder-{{arg1}}.pagebuilder-content-type" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnFullHeightAppearanceThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
<comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
124124
<actionGroup ref="validateColumnAppearanceFullHeight" stepKey="validateColumn1AppearanceCMSBlockStage">
125125
<argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
126+
<argument name="acceptableOffset" value="3"/>
126127
</actionGroup>
127128
<actionGroup ref="ValidateAllBackgroundAttributesActionGroup" stepKey="validateBackgroundCMSBlockStage">
128129
<argument name="section" value="ColumnOnBackend"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonBeforeButtonWithLongTextTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-buttons"/>
2121
<group value="pagebuilder-moveButtons"/>
22-
<skip>
23-
<issueId value="MQE-2288" />
24-
</skip>
2522
<group value="pr_exclude"/>
2623
</annotations>
2724
<before>
@@ -81,7 +78,7 @@
8178
<actionGroup ref="moveButton" stepKey="moveButton">
8279
<argument name="buttonIndexToMove" value="2"/>
8380
<argument name="buttonIndexToMoveTo" value="1"/>
84-
<argument name="y" value="-1000"/>
81+
<argument name="y" value="0"/>
8582
</actionGroup>
8683
<!-- Stage: Validate Changed Button Order -->
8784
<comment userInput="Stage: Validate Changed Button Order" stepKey="commentValidateStage2"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupEditSettingsAndVerifyTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<argument name="property" value="PageBuilderColumnAppearanceProperty_Bottom"/>
5050
</actionGroup>
5151
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="editMinHeightPropertyColumn1">
52-
<argument name="property" value="PageBuilderMinHeightProperty_100"/>
52+
<argument name="property" value="PageBuilderMinHeightProperty_150"/>
5353
</actionGroup>
5454
<actionGroup ref="chooseVisualSelectOption" stepKey="editVerticalAlignmentPropertyColumn1">
5555
<argument name="property" value="PageBuilderVerticalAlignmentPropertyBottom"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsFrontendTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<!-- Verify Column One -->
6262
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeColumnOneMinHeightApplied">
6363
<argument name="selector" value="{{ColumnOnFrontend.advancedConfigurationPath('1')}}"/>
64-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_100.value}}"/>
64+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_150.value}}"/>
6565
<argument name="cssProperty" value="minHeight"/>
6666
</actionGroup>
6767
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeColumnOneColumnAppearanceApplied">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
118118
</actionGroup>
119119
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightPropertyColumn1">
120-
<argument name="property" value="PageBuilderMinHeightProperty_100"/>
120+
<argument name="property" value="PageBuilderMinHeightProperty_150"/>
121121
</actionGroup>
122122
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmentTopPropertyColumn1">
123123
<argument name="property" value="PageBuilderVerticalAlignmentPropertyTop"/>
@@ -287,7 +287,7 @@
287287
<argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
288288
</actionGroup>
289289
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeColumnOneMinHeightProperty_100">
290-
<argument name="property" value="PageBuilderMinHeightProperty_100"/>
290+
<argument name="property" value="PageBuilderMinHeightProperty_150"/>
291291
</actionGroup>
292292
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="seeColumnOneVerticalAlignmentProperty">
293293
<argument name="property" value="PageBuilderVerticalAlignmentPropertyTop"/>

0 commit comments

Comments
 (0)