Skip to content

Commit 32835c6

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

File tree

7 files changed

+162
-87
lines changed

7 files changed

+162
-87
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,16 @@
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">
115+
<arguments>
116+
<argument name="property"/>
117+
</arguments>
118+
<waitForPageLoad stepKey="waitForPageLoad"/>
119+
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
120+
<see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
121+
<fillField selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" userInput="{{property.value}}" stepKey="fillPropertyField"/>
122+
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
123+
</actionGroup>
114124
<actionGroup name="fillSlideOutPanelMultiSelectField">
115125
<arguments>
116126
<argument name="property"/>
@@ -209,7 +219,6 @@
209219
</arguments>
210220
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
211221
<click selector="{{EditPanelForm.panelFieldControlSwitch(property.fieldName)}}" stepKey="clickProperty"/>
212-
<waitForElementVisible selector="{{EditPanelForm.panelSectionChangedIcon(property.section)}}" stepKey="waitForSectionUpdated"/>
213222
</actionGroup>
214223
<actionGroup name="clickSlideOutPanelFieldOpenInNewTab">
215224
<arguments>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -851,13 +851,13 @@
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>
854+
<data key="name">Show Controls</data>
855855
<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>
860+
<data key="name">Show Controls</data>
861861
<data key="section">general</data>
862862
<data key="fieldName">show_controls</data>
863863
<data key="value">false</data>

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,30 @@
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>
6981
<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>
7593
<data key="section">general</data>
@@ -82,6 +100,45 @@
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>
85142
<!-- Background Color -->
86143
<entity name="PageBuilderTabBackgroundColorPink" type="pagebuilder_row_background_color_property">
87144
<data key="name">Background Color</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>

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,10 +1683,10 @@
16831683
<argument name="property" value="PageBuilderBackgroundRepeat_Enabled"/>
16841684
</actionGroup>
16851685
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setMinHeightTab1">
1686-
<argument name="property" value="PageBuilderMinHeightProperty_200"/>
1686+
<argument name="property" value="PageBuilderTabMinimumHeight200Property"/>
16871687
</actionGroup>
16881688
<actionGroup ref="chooseVisualSelectOption" stepKey="setVerticalAlignmentTab1">
1689-
<argument name="property" value="PageBuilderVerticalAlignmentPropertyCenter"/>
1689+
<argument name="property" value="PageBuilderTabVerticalAlignmentPropertyCenter"/>
16901690
</actionGroup>
16911691
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsTab1"/>
16921692
<!-- Add Divider To Tab 1 -->
@@ -1709,7 +1709,7 @@
17091709
<argument name="property" value="PageBuilderBackgroundColor_RGB_Blue"/>
17101710
</actionGroup>
17111711
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="setMinHeightTab2">
1712-
<argument name="property" value="PageBuilderMinHeightProperty_Empty"/>
1712+
<argument name="property" value="PageBuilderTabMinimumHeightEmptyProperty"/>
17131713
</actionGroup>
17141714
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsTab2"/>
17151715
<actionGroup ref="saveCMSBlock" stepKey="saveCMSBlock"/>
@@ -1751,12 +1751,12 @@
17511751
<actionGroup ref="validateLayoutStylesWithAllUpdated" stepKey="validateTab1LayoutCMSBlockStage">
17521752
<argument name="page" value="TabOnStage"/>
17531753
<argument name="index" value="1"/>
1754-
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
1755-
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
1754+
<argument name="minHeight" value="PageBuilderTabMinimumHeight200Property"/>
1755+
<argument name="verticalAlignContainer" value="PageBuilderTabVerticalAlignmentPropertyCenter"/>
17561756
</actionGroup>
17571757
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateTab1MinHeightCMSBlockStage">
17581758
<argument name="content" value="{{TabOnStage.tabContentCSS}}"/>
1759-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
1759+
<argument name="height" value="PageBuilderTabMinimumHeight200Property"/>
17601760
<argument name="padding" value="PageBuilderPaddingProperty40"/>
17611761
<argument name="border" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
17621762
<argument name="index" value="1"/>
@@ -1798,7 +1798,7 @@
17981798
<seeElement selector="{{TabOnStorefront.backgroundColor('2', PageBuilderBackgroundColor_RGB_Blue.rgb)}}" stepKey="seeTab2BackgroundColorCMSPageStage"/>
17991799
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateTab2MinHeightCMSPageStage">
18001800
<argument name="content" value="{{TabOnStorefront.tabContentCSS}}"/>
1801-
<argument name="height" value="PageBuilderMinHeightProperty_0"/>
1801+
<argument name="height" value="PageBuilderTabMinHeight0Property"/>
18021802
<argument name="padding" value="PageBuilderPaddingProperty40"/>
18031803
<argument name="index" value="2"/>
18041804
</actionGroup>
@@ -1849,12 +1849,12 @@
18491849
<actionGroup ref="validateLayoutStylesWithAllUpdated" stepKey="validateTab1LayoutCMSPageStorefront">
18501850
<argument name="page" value="TabOnStorefront"/>
18511851
<argument name="index" value="1"/>
1852-
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
1853-
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
1852+
<argument name="minHeight" value="PageBuilderTabMinimumHeight200Property"/>
1853+
<argument name="verticalAlignContainer" value="PageBuilderTabVerticalAlignmentPropertyCenter"/>
18541854
</actionGroup>
18551855
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateTab1MinHeightCMSPageStorefront">
18561856
<argument name="content" value="{{TabOnStorefront.tabContentCSS}}"/>
1857-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
1857+
<argument name="height" value="PageBuilderTabMinimumHeight200Property"/>
18581858
<argument name="index" value="1"/>
18591859
</actionGroup>
18601860
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStorefront">
@@ -1887,7 +1887,7 @@
18871887
</actionGroup>
18881888
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSPageStorefrontMobile">
18891889
<argument name="content" value="{{TabOnStorefront.baseCSS}}"/>
1890-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
1890+
<argument name="height" value="PageBuilderTabMinimumHeight200Property"/>
18911891
<argument name="index" value="1"/>
18921892
</actionGroup>
18931893
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSPageStorefrontMobile">
@@ -1952,12 +1952,12 @@
19521952
<actionGroup ref="validateLayoutStylesWithAllUpdated" stepKey="validateTab1LayoutCMSPageStage2">
19531953
<argument name="page" value="TabOnStorefront"/>
19541954
<argument name="index" value="1"/>
1955-
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
1956-
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
1955+
<argument name="minHeight" value="PageBuilderTabMinimumHeight200Property"/>
1956+
<argument name="verticalAlignContainer" value="PageBuilderTabVerticalAlignmentPropertyCenter"/>
19571957
</actionGroup>
19581958
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateTab1MinHeightCMSPageStage2">
19591959
<argument name="content" value="{{TabOnStorefront.tabContentCSS}}"/>
1960-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
1960+
<argument name="height" value="PageBuilderTabMinimumHeight200Property"/>
19611961
<argument name="index" value="1"/>
19621962
</actionGroup>
19631963
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStage2">

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,18 +120,18 @@
120120
</actionGroup>
121121
<!-- Enter Height: NonNumeric -->
122122
<comment userInput="Enter Height: NonNumeric" stepKey="commentEnterHeightNonNumeric"/>
123-
<actionGroup ref="fillSlideOutPanelFieldAndExpectToSeeErrorInFieldset" stepKey="enterMinHeightPropertyFirstRowNonNumeric">
123+
<actionGroup ref="fillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetGeneral" stepKey="enterMinHeightPropertyFirstRowNonNumeric">
124124
<argument name="property" value="PageBuilderMinHeightProperty_NonNumeric"/>
125125
</actionGroup>
126-
<actionGroup ref="saveEditPanelAndValidateFieldError" stepKey="validateErrorNonNumeric">
126+
<actionGroup ref="saveEditPanelAndValidateFieldErrorGeneralSection" stepKey="validateErrorNonNumeric">
127127
<argument name="property" value="PageBuilderMinHeightProperty_NonNumeric"/>
128128
</actionGroup>
129129
<!-- Enter Height: Negative -->
130130
<comment userInput="Enter Height: Negative" stepKey="commentEnterHeightNegative"/>
131-
<actionGroup ref="fillSlideOutPanelFieldAndExpectToSeeErrorInFieldset" stepKey="enterMinHeightPropertyFirstRowNegative">
131+
<actionGroup ref="fillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetGeneral" stepKey="enterMinHeightPropertyFirstRowNegative">
132132
<argument name="property" value="PageBuilderMinHeightProperty_Negative1"/>
133133
</actionGroup>
134-
<actionGroup ref="saveEditPanelAndValidateFieldError" stepKey="validateErrorNegative">
134+
<actionGroup ref="saveEditPanelAndValidateFieldErrorGeneralSection" stepKey="validateErrorNegative">
135135
<argument name="property" value="PageBuilderMinHeightProperty_Negative1"/>
136136
</actionGroup>
137137
<!-- Enter Height: Valid After Invalid -->

0 commit comments

Comments
 (0)