Skip to content

Commit 12f0201

Browse files
anthoulaanthoula
committed
Merge branch 'MAGETWO-92149-column-vertical-align' into cms-team-1-delivery
2 parents 70e70b9 + 4a04c27 commit 12f0201

File tree

22 files changed

+542
-94
lines changed

22 files changed

+542
-94
lines changed

‎app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ private function convertDataMapping(\DOMElement $childNode): array
204204
$elementData = [];
205205
foreach ($childNode->getElementsByTagName('element') as $elementNode) {
206206
$elementName = $elementNode->attributes->getNamedItem('name')->nodeValue;
207-
$elementPath = $elementNode->attributes->getNamedItem('path')->nodeValue;
207+
$elementPath = ($elementNode->attributes->getNamedItem('path')
208+
? $elementNode->attributes->getNamedItem('path')->nodeValue : '');
208209
$elementData[$elementName] = [
209210
'path' => $elementPath,
210211
'style' => $this->convertProperties($elementNode),

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,17 @@
368368
<waitForElementNotVisible time="30" selector="{{PageBuilderActionsSection.modalOk}}" stepKey="waitForModalHide"/>
369369
<waitForElementVisible time="30" selector="{{RowOnStage.base('1')}}" stepKey="waitForPageBuilderRow"/>
370370
</actionGroup>
371+
<actionGroup name="validateVerticalAlignmentVisualSelects">
372+
<arguments>
373+
<argument name="property1" defaultValue=""/>
374+
<argument name="property2" defaultValue=""/>
375+
<argument name="property3" defaultValue=""/>
376+
</arguments>
377+
<waitForElement selector="{{PageBuilderActionsSection.panelFieldControl(property1.section, property1.fieldName)}}" stepKey="waitForElementVisible" />
378+
<seeElement selector="{{VisualSelectComponent.firstSelection(property1.value)}}" stepKey="seeFirstSelection"/>
379+
<seeElement selector="{{VisualSelectComponent.firstSelection(property2.value)}}" stepKey="seeSecondSelection"/>
380+
<seeElement selector="{{VisualSelectComponent.firstSelection(property3.value)}}" stepKey="seeThirdSelection"/>
381+
</actionGroup>
371382
<actionGroup name="validateSlideOutPanelField">
372383
<arguments>
373384
<argument name="property"/>

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,44 @@
2929
<data key="value">stretch</data>
3030
</entity>
3131
<!-- Appearance -->
32-
<entity name="PageBuilderBackgroundAppearanceProperty" type="pagebuilder_column_appearance_property">
32+
<entity name="PageBuilderColumnAppearanceProperty_Bottom" type="pagebuilder_column_appearance_property">
3333
<data key="name">Appearance</data>
3434
<data key="section">appearance_fieldset</data>
3535
<data key="fieldName">appearance</data>
3636
<data key="value">align-bottom</data>
3737
</entity>
38-
<entity name="PageBuilderBackgroundAppearancePropertyCentered" type="pagebuilder_column_appearance_property">
38+
<entity name="PageBuilderColumnAppearanceProperty_Center" type="pagebuilder_column_appearance_property">
3939
<data key="name">Appearance</data>
4040
<data key="section">appearance_fieldset</data>
4141
<data key="fieldName">appearance</data>
4242
<data key="value">align-center</data>
4343
</entity>
44+
<entity name="PageBuilderColumnAppearanceProperty_Top" type="pagebuilder_column_appearance_property">
45+
<data key="name">Appearance</data>
46+
<data key="section">appearance_fieldset</data>
47+
<data key="fieldName">appearance</data>
48+
<data key="value">align-top</data>
49+
</entity>
4450
<!-- Minimum Height -->
4551
<entity name="PageBuilderEmptyColumnHeightProperty" type="pagebuilder_column_min_height_property">
4652
<data key="value">190</data>
4753
<data key="valueWithPadding">210</data>
4854
</entity>
4955
<entity name="PageBuilderAppearanceMinHeightProperty" type="pagebuilder_column_min_height_property">
5056
<data key="name">Minimum Height</data>
51-
<data key="section">appearance_fieldset</data>
57+
<data key="section">layout</data>
5258
<data key="fieldName">min_height</data>
5359
<data key="value">500</data>
5460
</entity>
5561
<entity name="PageBuilderAppearanceMinHeightProperty_300" type="pagebuilder_column_min_height_property">
5662
<data key="name">Minimum Height</data>
57-
<data key="section">appearance_fieldset</data>
63+
<data key="section">layout</data>
5864
<data key="fieldName">min_height</data>
5965
<data key="value">300</data>
6066
</entity>
6167
<entity name="PageBuilderAppearanceMinHeightProperty_200" type="pagebuilder_column_min_height_property">
6268
<data key="name">Minimum Height</data>
63-
<data key="section">appearance_fieldset</data>
69+
<data key="section">layout</data>
6470
<data key="fieldName">min_height</data>
6571
<data key="value">200</data>
6672
</entity>
@@ -164,6 +170,9 @@
164170
<data key="minHeight300">min-height: 300px</data>
165171
<data key="padding">padding: 5px</data>
166172
<data key="textAlignment">text-align: center</data>
173+
<data key="verticalAlignmentBottom">justify-content: flex-end</data>
174+
<data key="verticalAlignmentCenter">justify-content: center</data>
175+
<data key="verticalAlignmentTop">justify-content: flex-start</data>
167176
<data key="widthOneSixth">width: 16.6667%</data>
168177
<data key="widthOneThird">width: 33.3333%</data>
169178
<data key="widthHalf">width: 50%</data>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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+
9+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11+
<!-- Vertical Alignment -->
12+
<entity name="PageBuilderVerticalAlignmentPropertyTop" type="pagebuilder_vertical_alignment_property">
13+
<data key="name">Vertical alignment</data>
14+
<data key="section">layout</data>
15+
<data key="fieldName">justify_content</data>
16+
<data key="value">flex-start</data>
17+
<data key="optionsList">[Top, Center, Bottom]</data>
18+
</entity>
19+
<entity name="PageBuilderVerticalAlignmentPropertyCenter" type="pagebuilder_vertical_alignment_property">
20+
<data key="name">Vertical alignment</data>
21+
<data key="section">layout</data>
22+
<data key="fieldName">justify_content</data>
23+
<data key="value">center</data>
24+
<data key="optionsList">[Top, Center, Bottom]</data>
25+
</entity>
26+
<entity name="PageBuilderVerticalAlignmentPropertyBottom" type="pagebuilder_vertical_alignment_property">
27+
<data key="name">Vertical alignment</data>
28+
<data key="section">layout</data>
29+
<data key="fieldName">justify_content</data>
30+
<data key="value">flex-end</data>
31+
<data key="optionsList">[Top, Center, Bottom]</data>
32+
</entity>
33+
</entities>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<element name="columnResizeHandle" type="block" selector=".pagebuilder-column-resize-handle"/>
2020
<element name="columnResizeGridLine" type="block" selector=".resize-grid .grid-line:nth-child({{arg}})" parameterized="true"/>
2121
<element name="columnStyle" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')][{{arg1}}][contains(@style, '{{arg2}}')]" parameterized="true"/>
22+
<element name="columnChildrenStyle" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')][{{arg2}}]//div[contains(@class, 'element-children')][contains(@style, '{{arg3}}')]" parameterized="true"/>
2223
<element name="allColumns" type="text" selector="//div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')]"/>
2324
<element name="addRow" type="button" selector='//*[@class="pagebuilder-stage"]/div[3]/button'/>
2425
<element name="draggableColumnInPanel" type="button" selector='//*[text()="Column"]/ancestor::*[contains(@class, "ui-draggable")]'/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@
8686
</actionGroup>
8787
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
8888
<comment userInput="Validate Column Height On Stage With Custom Min Height Matches Expected" stepKey="commentValidateColumnHeight"/>
89-
<actionGroup ref="validateContentTypeHeightOnStageWithoutPadding" stepKey="assertInitialColumnHeightMatchesExpected">
89+
<actionGroup ref="validateContentTypeHeightOnStage" stepKey="assertInitialColumnHeightMatchesExpected">
9090
<argument name="contentType" value="PageBuilderColumnContentType"/>
9191
<argument name="index" value="1"/>
9292
<argument name="containerDefaultHeight" value="PageBuilderAppearanceMinHeightProperty"/>
93+
<argument name="expectedPaddingTop" value="PageBuilderPaddingProperty10"/>
94+
<argument name="expectedPaddingBottom" value="PageBuilderPaddingProperty10"/>
9395
</actionGroup>
9496
<executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(PageBuilderColumnContentType.role,'1')}}" stepKey="actualStageInitialColumnHeight"/>
9597
<comment userInput="Validate Row Height adjusts to Column Height" stepKey="commentValidateRowHeightAdjustToColumn"/>
@@ -152,7 +154,7 @@
152154
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
153155
<comment userInput="Validate Column Height On Stage With Custom Min Height Matches Expected" stepKey="commentValidateColumnHeight"/>
154156
<executeJS function="{{PageBuilderActionsSection.computedHeightOnStage(PageBuilderColumnContentType.role,'1')}}" stepKey="actualStageContentTypeHeight"/>
155-
<executeJS function="return Math.round({{PageBuilderAppearanceMinHeightProperty_200.value}} + {{PageBuilderAdvancedMarginsAndPaddingPropertyDefault.paddingTop}} + {{PageBuilderAdvancedMarginsAndPaddingPropertyDefault.paddingBottom}})" stepKey="expectedColumnHeight"/>
157+
<executeJS function="return Math.round({{PageBuilderAppearanceMinHeightProperty_200.value}} + {{PageBuilderPaddingProperty10.paddingTop}} + {{PageBuilderPaddingProperty10.paddingBottom}})" stepKey="expectedColumnHeight"/>
156158
<assertEquals stepKey="assertHeightOnStageMatchesExpected">
157159
<expectedResult type="variable">actualStageContentTypeHeight</expectedResult>
158160
<actualResult type="variable">expectedColumnHeight</actualResult>

0 commit comments

Comments
 (0)