Skip to content

Commit ebc610d

Browse files
anthoulaanthoula
committed
Merge branch '1.1-develop' of github.com:magento/magento2-page-builder into MC-14994
2 parents 3189cbd + a3e9e3a commit ebc610d

24 files changed

+292
-260
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@
111111
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
112112
<waitForElementVisible time="2" selector="{{EditPanelForm.panelSectionError(property.section)}}" stepKey="waitForSectionChangedIcon"/>
113113
</actionGroup>
114+
<actionGroup name="fillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetGeneral" extends="fillSlideOutPanelFieldAndExpectToSeeErrorInFieldset">
115+
<remove keyForRemoval="waitForSectionChangedIcon"/>
116+
</actionGroup>
114117
<actionGroup name="fillSlideOutPanelMultiSelectField">
115118
<arguments>
116119
<argument name="property"/>
@@ -209,7 +212,6 @@
209212
</arguments>
210213
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
211214
<click selector="{{EditPanelForm.panelFieldControlSwitch(property.fieldName)}}" stepKey="clickProperty"/>
212-
<waitForElementVisible selector="{{EditPanelForm.panelSectionChangedIcon(property.section)}}" stepKey="waitForSectionUpdated"/>
213215
</actionGroup>
214216
<actionGroup name="clickSlideOutPanelFieldOpenInNewTab">
215217
<arguments>
@@ -225,7 +227,7 @@
225227
</arguments>
226228
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
227229
<seeElement selector='//li[@name="{{property.value}}"]' stepKey="seeVisualSelect"/>
228-
<click selector='//div[@data-index="{{property.section}}" and contains(@class,"_show")]//li[@name="{{property.value}}"]' stepKey="chooseVisualSelectOption"/>
230+
<click selector='//div[@data-index="{{property.section}}"]//li[@name="{{property.value}}"]' stepKey="chooseVisualSelectOption"/>
229231
</actionGroup>
230232
<actionGroup name="scrollToSlideOutPanelField">
231233
<arguments>

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,72 +11,72 @@
1111
<!-- Min Height -->
1212
<entity name="PageBuilderMinHeightProperty_Empty" type="pagebuilder_min_height_property">
1313
<data key="name">Minimum Height</data>
14-
<data key="section">layout</data>
14+
<data key="section">appearance_fieldset</data>
1515
<data key="fieldName">min_height</data>
1616
<data key="value"/>
1717
</entity>
1818
<entity name="PageBuilderMinHeightProperty_0" type="pagebuilder_min_height_property">
1919
<data key="name">Minimum Height</data>
20-
<data key="section">layout</data>
20+
<data key="section">appearance_fieldset</data>
2121
<data key="fieldName">min_height</data>
2222
<data key="value">0</data>
2323
<data key="style">min-height: 0px</data>
2424
</entity>
2525
<entity name="PageBuilderMinHeightProperty_500" type="pagebuilder_min_height_property">
2626
<data key="name">Minimum Height</data>
27-
<data key="section">layout</data>
27+
<data key="section">appearance_fieldset</data>
2828
<data key="fieldName">min_height</data>
2929
<data key="value">500</data>
3030
<data key="style">min-height: 500px</data>
3131
</entity>
3232
<entity name="PageBuilderMinHeightProperty_300" type="pagebuilder_min_height_property">
3333
<data key="name">Minimum Height</data>
34-
<data key="section">layout</data>
34+
<data key="section">appearance_fieldset</data>
3535
<data key="fieldName">min_height</data>
3636
<data key="value">300</data>
3737
<data key="style">min-height: 300px</data>
3838
</entity>
3939
<entity name="PageBuilderMinHeightProperty_200" type="pagebuilder_min_height_property">
4040
<data key="name">Minimum Height</data>
41-
<data key="section">layout</data>
41+
<data key="section">appearance_fieldset</data>
4242
<data key="fieldName">min_height</data>
4343
<data key="value">200</data>
4444
<data key="style">min-height: 200px</data>
4545
</entity>
4646
<entity name="PageBuilderMinHeightProperty_NonNumeric" type="pagebuilder_min_height_property">
4747
<data key="name">Minimum Height</data>
48-
<data key="section">layout</data>
48+
<data key="section">appearance_fieldset</data>
4949
<data key="fieldName">min_height</data>
5050
<data key="value">a</data>
5151
<data key="errorMessage">Please enter a valid number in this field.</data>
5252
</entity>
5353
<entity name="PageBuilderMinHeightProperty_Negative1" type="pagebuilder_min_height_property">
5454
<data key="name">Minimum Height</data>
55-
<data key="section">layout</data>
55+
<data key="section">appearance_fieldset</data>
5656
<data key="fieldName">min_height</data>
5757
<data key="value">-1</data>
5858
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
5959
</entity>
6060
<!-- Vertical Alignment -->
6161
<entity name="PageBuilderVerticalAlignmentPropertyTop" type="pagebuilder_vertical_alignment_property">
6262
<data key="name">Vertical alignment</data>
63-
<data key="section">layout</data>
63+
<data key="section">appearance_fieldset</data>
6464
<data key="fieldName">justify_content</data>
6565
<data key="value">flex-start</data>
6666
<data key="optionsList">[Top, Center, Bottom]</data>
6767
<data key="style">justify-content: flex-start</data>
6868
</entity>
6969
<entity name="PageBuilderVerticalAlignmentPropertyCenter" type="pagebuilder_vertical_alignment_property">
7070
<data key="name">Vertical alignment</data>
71-
<data key="section">layout</data>
71+
<data key="section">appearance_fieldset</data>
7272
<data key="fieldName">justify_content</data>
7373
<data key="value">center</data>
7474
<data key="optionsList">[Top, Center, Bottom]</data>
7575
<data key="style">justify-content: center</data>
7676
</entity>
7777
<entity name="PageBuilderVerticalAlignmentPropertyBottom" type="pagebuilder_vertical_alignment_property">
7878
<data key="name">Vertical alignment</data>
79-
<data key="section">layout</data>
79+
<data key="section">appearance_fieldset</data>
8080
<data key="fieldName">justify_content</data>
8181
<data key="value">flex-end</data>
8282
<data key="optionsList">[Top, Center, Bottom]</data>

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -806,59 +806,59 @@
806806
</entity>
807807
<!-- Height -->
808808
<entity name="PageBuilderMapHeightDefaultProperty" type="pagebuilder_map_height_property">
809-
<data key="name">Map Height</data>
810-
<data key="section">map_settings</data>
809+
<data key="name">Height</data>
810+
<data key="section">general</data>
811811
<data key="fieldName">height</data>
812812
<data key="value">300</data>
813813
</entity>
814814
<entity name="PageBuilderMapHeight_Empty" type="pagebuilder_map_height_property">
815815
<data key="name">Height</data>
816-
<data key="section">map_settings</data>
816+
<data key="section">general</data>
817817
<data key="fieldName">height</data>
818818
<data key="value"/>
819819
</entity>
820820
<entity name="PageBuilderMapHeightProperty350" type="pagebuilder_map_height_property">
821821
<data key="name">Height</data>
822-
<data key="section">map_settings</data>
822+
<data key="section">general</data>
823823
<data key="fieldName">height</data>
824824
<data key="value">350</data>
825825
</entity>
826826
<entity name="PageBuilderMapHeightProperty500px" type="pagebuilder_map_height_property">
827827
<data key="name">Height</data>
828-
<data key="section">map_settings</data>
828+
<data key="section">general</data>
829829
<data key="fieldName">height</data>
830830
<data key="value">500</data>
831831
</entity>
832832
<entity name="PageBuilderMapHeight_Percentage" type="pagebuilder_map_height_property">
833833
<data key="name">Height</data>
834-
<data key="section">map_settings</data>
834+
<data key="section">general</data>
835835
<data key="fieldName">height</data>
836836
<data key="value">50%</data>
837837
<data key="errorMessage">Please enter a valid number in this field.</data>
838838
</entity>
839839
<entity name="PageBuilderMapHeight_NonNumeric" type="pagebuilder_map_height_property">
840840
<data key="name">Height</data>
841-
<data key="section">map_settings</data>
841+
<data key="section">general</data>
842842
<data key="fieldName">height</data>
843843
<data key="value">a</data>
844844
<data key="errorMessage">Please enter a valid number in this field.</data>
845845
</entity>
846846
<!-- Show Controls -->
847847
<entity name="PageBuilderMapShowControls_Default" type="pagebuilder_map_show_controls_property">
848-
<data key="name"> Show Controls</data>
849-
<data key="section">map_settings</data>
848+
<data key="name">Show Controls</data>
849+
<data key="section">general</data>
850850
<data key="fieldName">show_controls</data>
851851
<data key="value">true</data>
852852
</entity>
853853
<entity name="PageBuilderMapShowControls_True" type="pagebuilder_map_show_controls_property">
854-
<data key="name"> Show Controls</data>
855-
<data key="section">map_settings</data>
854+
<data key="name">Show Controls</data>
855+
<data key="section">general</data>
856856
<data key="fieldName">show_controls</data>
857857
<data key="value">true</data>
858858
</entity>
859859
<entity name="PageBuilderMapShowControls_False" type="pagebuilder_map_show_controls_property">
860-
<data key="name"> Show Controls</data>
861-
<data key="section">map_settings</data>
860+
<data key="name">Show Controls</data>
861+
<data key="section">general</data>
862862
<data key="fieldName">show_controls</data>
863863
<data key="value">false</data>
864864
</entity>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,19 @@
8989
<!-- Minimum Height -->
9090
<entity name="PageBuilderSliderMinHeight_500" type="pagebuilder_slider_min_height_property">
9191
<data key="name">Minimum Height</data>
92-
<data key="section">settings</data>
92+
<data key="section">appearance_fieldset</data>
9393
<data key="fieldName">min_height</data>
9494
<data key="value">500</data>
9595
</entity>
9696
<entity name="PageBuilderSliderMinHeight_Default" type="pagebuilder_slider_min_height_property">
9797
<data key="name">Minimum Height</data>
98-
<data key="section">settings</data>
98+
<data key="section">appearance_fieldset</data>
9999
<data key="fieldName">min_height</data>
100100
<data key="value">300</data>
101101
</entity>
102102
<entity name="PageBuilderSliderMinHeight_100" type="pagebuilder_slider_min_height_property">
103103
<data key="name">Minimum Height</data>
104-
<data key="section">settings</data>
104+
<data key="section">appearance_fieldset</data>
105105
<data key="fieldName">min_height</data>
106106
<data key="value">100</data>
107107
</entity>

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

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,86 @@
6060
<!-- Minimum Height -->
6161
<entity name="PageBuilderTabMinimumHeightDefaultProperty" type="pagebuilder_tab_property">
6262
<data key="name">Minimum Height</data>
63-
<data key="section">layout</data>
63+
<data key="section">general</data>
6464
<data key="fieldName">min_height</data>
6565
<data key="value">300</data>
6666
</entity>
67+
<entity name="PageBuilderTabMinimumHeightEmptyProperty" type="pagebuilder_tab_property">
68+
<data key="name">Minimum Height</data>
69+
<data key="section">general</data>
70+
<data key="fieldName">min_height</data>
71+
<data key="value"/>
72+
</entity>
73+
<entity name="PageBuilderTabMinHeight0Property" type="pagebuilder_tab_property">
74+
<data key="name">Minimum Height</data>
75+
<data key="section">general</data>
76+
<data key="fieldName">min_height</data>
77+
<data key="value">0</data>
78+
</entity>
6779
<entity name="PageBuilderTabMinimumHeight200Property" type="pagebuilder_tab_property">
6880
<data key="name">Minimum Height</data>
69-
<data key="section">layout</data>
81+
<data key="section">general</data>
7082
<data key="fieldName">min_height</data>
7183
<data key="value">200</data>
7284
</entity>
85+
<entity name="PageBuilderTabMinimumHeight300Property" type="pagebuilder_tab_property">
86+
<data key="name">Minimum Height</data>
87+
<data key="section">general</data>
88+
<data key="fieldName">min_height</data>
89+
<data key="value">300</data>
90+
</entity>
7391
<entity name="PageBuilderTabMinimumHeight600Property" type="pagebuilder_tab_property">
7492
<data key="name">Minimum Height</data>
75-
<data key="section">layout</data>
93+
<data key="section">general</data>
7694
<data key="fieldName">min_height</data>
7795
<data key="value">600</data>
7896
</entity>
7997
<entity name="PageBuilderTabMinimumHeight1000Property" type="pagebuilder_tab_property">
8098
<data key="name">Minimum Height</data>
81-
<data key="section">layout</data>
99+
<data key="section">general</data>
82100
<data key="fieldName">min_height</data>
83101
<data key="value">1000</data>
84102
</entity>
103+
<entity name="PageBuilderTabMinimumHeightProperty_NonNumeric" type="pagebuilder_tab_property">
104+
<data key="name">Minimum Height</data>
105+
<data key="section">general</data>
106+
<data key="fieldName">min_height</data>
107+
<data key="value">a</data>
108+
<data key="errorMessage">Please enter a valid number in this field.</data>
109+
</entity>
110+
<entity name="PageBuilderTabMinHeightProperty_Negative1" type="pagebuilder_tab_property">
111+
<data key="name">Minimum Height</data>
112+
<data key="section">general</data>
113+
<data key="fieldName">min_height</data>
114+
<data key="value">-1</data>
115+
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
116+
</entity>
117+
<!-- Vertical Alignment -->
118+
<entity name="PageBuilderTabVerticalAlignmentPropertyTop" type="pagebuilder_tab_property">
119+
<data key="name">Vertical alignment</data>
120+
<data key="section">general</data>
121+
<data key="fieldName">justify_content</data>
122+
<data key="value">flex-start</data>
123+
<data key="optionsList">[Top, Center, Bottom]</data>
124+
<data key="style">justify-content: flex-start</data>
125+
</entity>
126+
<entity name="PageBuilderTabVerticalAlignmentPropertyCenter" type="pagebuilder_tab_property">
127+
<data key="name">Vertical alignment</data>
128+
<data key="section">general</data>
129+
<data key="fieldName">justify_content</data>
130+
<data key="value">center</data>
131+
<data key="optionsList">[Top, Center, Bottom]</data>
132+
<data key="style">justify-content: center</data>
133+
</entity>
134+
<entity name="PageBuilderTabVerticalAlignmentPropertyBottom" type="pagebuilder_tab_property">
135+
<data key="name">Vertical alignment</data>
136+
<data key="section">general</data>
137+
<data key="fieldName">justify_content</data>
138+
<data key="value">flex-end</data>
139+
<data key="optionsList">[Top, Center, Bottom]</data>
140+
<data key="style">justify-content: flex-end</data>
141+
</entity>
142+
<!-- Background Color -->
85143
<entity name="PageBuilderTabBackgroundColorPink" type="pagebuilder_row_background_color_property">
86144
<data key="name">Background Color</data>
87145
<data key="section">background</data>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<data key="fieldName">min_height</data>
4343
<data key="value">400</data>
4444
</entity>
45+
<entity name="PageBuilderTabsMinHeightProperty_500" type="pagebuilder_tabs_property">
46+
<data key="name">Minimum Height</data>
47+
<data key="section">general</data>
48+
<data key="fieldName">min_height</data>
49+
<data key="value">500</data>
50+
</entity>
4551
<!-- Tab Navigation Alignment -->
4652
<entity name="PageBuilderTabsAlignmentDefault" type="pagebuilder_tabs_property">
4753
<data key="name">Tab Navigation Alignment</data>

0 commit comments

Comments
 (0)