Skip to content

Commit b57541f

Browse files
committed
MC-3880: Minimum Height & Vertical Alignment Is In Inconsistent Sections On Edit Panel for Each Content Type
- update existing tests
1 parent 5c5a934 commit b57541f

11 files changed

+50
-48
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
</arguments>
226226
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
227227
<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"/>
228+
<click selector='//div[@data-index="{{property.section}}"]//li[@name="{{property.value}}"]' stepKey="chooseVisualSelectOption"/>
229229
</actionGroup>
230230
<actionGroup name="scrollToSlideOutPanelField">
231231
<arguments>

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

Lines changed: 11 additions & 11 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">appearance_fieldset</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">appearance_fieldset</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">appearance_fieldset</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">appearance_fieldset</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">appearance_fieldset</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">appearance_fieldset</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">
854854
<data key="name"> Show Controls</data>
855-
<data key="section">map_settings</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">
860860
<data key="name"> Show Controls</data>
861-
<data key="section">map_settings</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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,78 +11,78 @@
1111
<!-- AutoPlay -->
1212
<entity name="PageBuilderSliderAutoPlay_Disabled" type="pagebuilder_slider_autoplay_property">
1313
<data key="name">Autoplay</data>
14-
<data key="section">slider_settings</data>
14+
<data key="section">settings</data>
1515
<data key="fieldName">autoplay</data>
1616
<data key="value">false</data>
1717
</entity>
1818
<entity name="PageBuilderSliderAutoPlay_Enabled" type="pagebuilder_slider_autoplay_property">
1919
<data key="name">Autoplay</data>
20-
<data key="section">slider_settings</data>
20+
<data key="section">settings</data>
2121
<data key="fieldName">autoplay</data>
2222
<data key="value">true</data>
2323
</entity>
2424
<!-- AutoPlay Speed -->
2525
<entity name="PageBuilderSliderAutoPlaySpeed_Default" type="pagebuilder_slider_autoplay_speed_property">
2626
<data key="name">Autoplay Speed</data>
27-
<data key="section">slider_settings</data>
27+
<data key="section">settings</data>
2828
<data key="fieldName">autoplay_speed</data>
2929
<data key="value">4000</data>
3030
</entity>
3131
<entity name="PageBuilderSliderAutoPlaySpeed_50000" type="pagebuilder_slider_autoplay_speed_property">
3232
<data key="name">Autoplay Speed</data>
33-
<data key="section">slider_settings</data>
33+
<data key="section">settings</data>
3434
<data key="fieldName">autoplay_speed</data>
3535
<data key="value">50000</data>
3636
</entity>
3737
<!-- Fade -->
3838
<entity name="PageBuilderSliderFade_Enabled" type="pagebuilder_slider_fade_property">
3939
<data key="name">Fade</data>
40-
<data key="section">slider_settings</data>
40+
<data key="section">settings</data>
4141
<data key="fieldName">fade</data>
4242
<data key="value">true</data>
4343
</entity>
4444
<entity name="PageBuilderSliderFade_Disabled" type="pagebuilder_slider_fade_property">
4545
<data key="name">Fade</data>
46-
<data key="section">slider_settings</data>
46+
<data key="section">settings</data>
4747
<data key="fieldName">fade</data>
4848
<data key="value">false</data>
4949
</entity>
5050
<!-- Infinite Loop -->
5151
<entity name="PageBuilderSliderInfiniteLoop_Enabled" type="pagebuilder_slider_infinite_loop_property">
5252
<data key="name">Is Infinite</data>
53-
<data key="section">slider_settings</data>
53+
<data key="section">settings</data>
5454
<data key="fieldName">is_infinite</data>
5555
<data key="value">true</data>
5656
</entity>
5757
<entity name="PageBuilderSliderInfiniteLoop_Disabled" type="pagebuilder_slider_infinite_loop_property">
5858
<data key="name">Is Infinite</data>
59-
<data key="section">slider_settings</data>
59+
<data key="section">settings</data>
6060
<data key="fieldName">is_infinite</data>
6161
<data key="value">false</data>
6262
</entity>
6363
<!-- Show Arrows -->
6464
<entity name="PageBuilderSliderShowArrows_Enabled" type="pagebuilder_slider_show_arrows_property">
6565
<data key="name">Show Arrows</data>
66-
<data key="section">slider_settings</data>
66+
<data key="section">settings</data>
6767
<data key="fieldName">show_arrows</data>
6868
<data key="value">true</data>
6969
</entity>
7070
<entity name="PageBuilderSliderShowArrows_Disabled" type="pagebuilder_slider_show_arrows_property">
7171
<data key="name">Show Arrows</data>
72-
<data key="section">slider_settings</data>
72+
<data key="section">settings</data>
7373
<data key="fieldName">show_arrows</data>
7474
<data key="value">false</data>
7575
</entity>
7676
<!-- Show Dots -->
7777
<entity name="PageBuilderSliderShowDots_Disabled" type="pagebuilder_slider_show_dots_property">
7878
<data key="name">Show dots</data>
79-
<data key="section">slider_settings</data>
79+
<data key="section">settings</data>
8080
<data key="fieldName">show_dots</data>
8181
<data key="value">false</data>
8282
</entity>
8383
<entity name="PageBuilderSliderShowDots_Enabled" type="pagebuilder_slider_show_dots_property">
8484
<data key="name">Show dots</data>
85-
<data key="section">slider_settings</data>
85+
<data key="section">settings</data>
8686
<data key="fieldName">show_dots</data>
8787
<data key="value">true</data>
8888
</entity>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,29 @@
6060
<!-- Minimum Height -->
6161
<entity name="PageBuilderTabMinimumHeightDefaultProperty" type="pagebuilder_tab_property">
6262
<data key="name">Minimum Height</data>
63-
<data key="section">appearance_fieldset</data>
63+
<data key="section">general</data>
6464
<data key="fieldName">min_height</data>
6565
<data key="value">300</data>
6666
</entity>
6767
<entity name="PageBuilderTabMinimumHeight200Property" type="pagebuilder_tab_property">
6868
<data key="name">Minimum Height</data>
69-
<data key="section">appearance_fieldset</data>
69+
<data key="section">general</data>
7070
<data key="fieldName">min_height</data>
7171
<data key="value">200</data>
7272
</entity>
7373
<entity name="PageBuilderTabMinimumHeight600Property" type="pagebuilder_tab_property">
7474
<data key="name">Minimum Height</data>
75-
<data key="section">appearance_fieldset</data>
75+
<data key="section">general</data>
7676
<data key="fieldName">min_height</data>
7777
<data key="value">600</data>
7878
</entity>
7979
<entity name="PageBuilderTabMinimumHeight1000Property" type="pagebuilder_tab_property">
8080
<data key="name">Minimum Height</data>
81-
<data key="section">appearance_fieldset</data>
81+
<data key="section">general</data>
8282
<data key="fieldName">min_height</data>
8383
<data key="value">1000</data>
8484
</entity>
85+
<!-- Background Color -->
8586
<entity name="PageBuilderTabBackgroundColorPink" type="pagebuilder_row_background_color_property">
8687
<data key="name">Background Color</data>
8788
<data key="section">background</data>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
<element name="commentElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p" parameterized="true"/>
3131
<element name="phoneNumberElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p" parameterized="true"/>
3232
<element name="addressCityStateZipCountryElement" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//span" parameterized="true"/>
33-
<!-- Map Settings Configuration -->
3433
<element name="height" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@data-bind,'renderMap') and contains(@style,'height: {{arg2}}px;')]" parameterized="true"/>
3534
<element name="noHeight" type="button" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@data-bind,'renderMap') and not(contains(@style,'height:'))]" parameterized="true"/>
3635
<element name="showControls" type="text" selector="(//div[contains(@class,'pagebuilder-map')])[{{arg1}}]//div[contains(@data-bind,'renderMap') and @data-show-controls='{{arg2}}']" parameterized="true"/>
@@ -79,7 +78,6 @@
7978
<element name="commentElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p" parameterized="true"/>
8079
<element name="phoneNumberElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//p" parameterized="true"/>
8180
<element name="addressCityStateZipCountryElement" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}]//div[contains(concat(' ', normalize-space(@class), ' '), ' gm-style-iw ')]//span" parameterized="true"/>
82-
<!-- Map Settings Configuration -->
8381
<element name="height" type="button" selector="(//div[@data-content-type='map'])[{{arg1}}][contains(@style,'height: {{arg2}}px;')]" parameterized="true"/>
8482
<element name="noHeight" type="button" selector="(//div[@data-content-type='map'])[{{arg1}}][not(contains(@style,'height:'))]" parameterized="true"/>
8583
<element name="showControls" type="text" selector="(//div[@data-content-type='map'])[{{arg1}}][@data-show-controls='{{arg2}}']" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTests.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
3939
<argument name="contentType" value="PageBuilderRowContentType"/>
4040
</actionGroup>
41-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty">
41+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
4242
<argument name="property" value="PageBuilderMinHeightProperty_500"/>
4343
</actionGroup>
4444
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmentBottomProperty">
@@ -360,7 +360,7 @@
360360
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterParallaxBackgroundSpeed">
361361
<argument name="property" value="PageBuilderRowParallaxSpeed_2"/>
362362
</actionGroup>
363-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty">
363+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
364364
<argument name="property" value="PageBuilderMinHeightProperty_500"/>
365365
</actionGroup>
366366
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmentCenterProperty">
@@ -1103,7 +1103,7 @@
11031103
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="setBackgroundRepeatColumn1">
11041104
<argument name="property" value="PageBuilderBackgroundRepeat_Enabled"/>
11051105
</actionGroup>
1106-
<actionGroup ref="fillSlideOutPanelField" stepKey="setMinHeightColumn1">
1106+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setMinHeightColumn1">
11071107
<argument name="property" value="PageBuilderMinHeightProperty_200"/>
11081108
</actionGroup>
11091109
<actionGroup ref="chooseVisualSelectOption" stepKey="setVerticalAlignmentColumn1">
@@ -1119,7 +1119,7 @@
11191119
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setBackgroundColorColumn2">
11201120
<argument name="property" value="PageBuilderBackgroundColor_RGB_Blue"/>
11211121
</actionGroup>
1122-
<actionGroup ref="fillSlideOutPanelField" stepKey="setMinHeightColumn2">
1122+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setMinHeightColumn2">
11231123
<argument name="property" value="PageBuilderMinHeightProperty_500"/>
11241124
</actionGroup>
11251125
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsColumn2"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@
330330
<argument name="contentType" value="PageBuilderColumnContentType"/>
331331
<argument name="contentTypeIndex" value="1"/>
332332
</actionGroup>
333-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty">
333+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
334334
<argument name="property" value="PageBuilderMinHeightProperty_300"/>
335335
</actionGroup>
336336
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmentTopProperty">
@@ -436,7 +436,7 @@
436436
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceTopProperty">
437437
<argument name="property" value="PageBuilderColumnAppearanceProperty_Top"/>
438438
</actionGroup>
439-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty500">
439+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty500">
440440
<argument name="property" value="PageBuilderMinHeightProperty_500"/>
441441
</actionGroup>
442442
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmentTopProperty">
@@ -461,7 +461,7 @@
461461
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCenterProperty">
462462
<argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
463463
</actionGroup>
464-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty300">
464+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty300">
465465
<argument name="property" value="PageBuilderMinHeightProperty_300"/>
466466
</actionGroup>
467467
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmenCenterProperty">
@@ -483,7 +483,7 @@
483483
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCenterBottom">
484484
<argument name="property" value="PageBuilderColumnAppearanceProperty_Bottom"/>
485485
</actionGroup>
486-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty200">
486+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty200">
487487
<argument name="property" value="PageBuilderMinHeightProperty_200"/>
488488
</actionGroup>
489489
<actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmenBottomProperty">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,15 @@
180180
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterHeightPercentage">
181181
<argument name="property" value="PageBuilderMapHeight_Percentage"/>
182182
</actionGroup>
183-
<actionGroup ref="saveEditPanelAndValidateFieldError" stepKey="validateErrorPercentage">
183+
<actionGroup ref="saveEditPanelAndValidateFieldErrorGeneralSection" stepKey="validateErrorPercentage">
184184
<argument name="property" value="PageBuilderMapHeight_Percentage"/>
185185
</actionGroup>
186186
<!-- Enter Height: NonNumeric -->
187187
<comment userInput="Enter Height: NonNumeric" stepKey="commentEnterHeightNonNumeric"/>
188188
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterHeightNonNumeric">
189189
<argument name="property" value="PageBuilderMapHeight_NonNumeric"/>
190190
</actionGroup>
191-
<actionGroup ref="saveEditPanelAndValidateFieldError" stepKey="validateErrorNonNumeric">
191+
<actionGroup ref="saveEditPanelAndValidateFieldErrorGeneralSection" stepKey="validateErrorNonNumeric">
192192
<argument name="property" value="PageBuilderMapHeight_NonNumeric"/>
193193
</actionGroup>
194194
</test>

0 commit comments

Comments
 (0)