MC-3880: Minimum Height & Vertical Alignment Is In Inconsistent Sections On Edit Panel for Each Content Type

anthoula · anthoula · commit c098e8bb5329 · 2019-07-17T16:31:20.000-05:00
- update mftf data sections
- clean up section comments
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml
@@ -11,72 +11,72 @@
     <!-- Min Height -->
     <entity name="PageBuilderMinHeightProperty_Empty" type="pagebuilder_min_height_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value"/>
     </entity>
     <entity name="PageBuilderMinHeightProperty_0" type="pagebuilder_min_height_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">0</data>
         <data key="style">min-height: 0px</data>
     </entity>
     <entity name="PageBuilderMinHeightProperty_500" type="pagebuilder_min_height_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">500</data>
         <data key="style">min-height: 500px</data>
     </entity>
     <entity name="PageBuilderMinHeightProperty_300" type="pagebuilder_min_height_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">300</data>
         <data key="style">min-height: 300px</data>
     </entity>
     <entity name="PageBuilderMinHeightProperty_200" type="pagebuilder_min_height_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">200</data>
         <data key="style">min-height: 200px</data>
     </entity>
     <entity name="PageBuilderMinHeightProperty_NonNumeric" type="pagebuilder_min_height_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">a</data>
         <data key="errorMessage">Please enter a valid number in this field.</data>
     </entity>
     <entity name="PageBuilderMinHeightProperty_Negative1" type="pagebuilder_min_height_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">-1</data>
         <data key="errorMessage">Please enter a value greater than or equal to 0.</data>
     </entity>
     <!-- Vertical Alignment -->
     <entity name="PageBuilderVerticalAlignmentPropertyTop" type="pagebuilder_vertical_alignment_property">
         <data key="name">Vertical alignment</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">justify_content</data>
         <data key="value">flex-start</data>
         <data key="optionsList">[Top, Center, Bottom]</data>
         <data key="style">justify-content: flex-start</data>
     </entity>
     <entity name="PageBuilderVerticalAlignmentPropertyCenter" type="pagebuilder_vertical_alignment_property">
         <data key="name">Vertical alignment</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">justify_content</data>
         <data key="value">center</data>
         <data key="optionsList">[Top, Center, Bottom]</data>
         <data key="style">justify-content: center</data>
     </entity>
     <entity name="PageBuilderVerticalAlignmentPropertyBottom" type="pagebuilder_vertical_alignment_property">
         <data key="name">Vertical alignment</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">justify_content</data>
         <data key="value">flex-end</data>
         <data key="optionsList">[Top, Center, Bottom]</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/MapData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/MapData.xml
@@ -807,38 +807,38 @@
     <!-- Height -->
     <entity name="PageBuilderMapHeightDefaultProperty" type="pagebuilder_map_height_property">
         <data key="name">Map Height</data>
-        <data key="section">map_settings</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">height</data>
         <data key="value">300</data>
     </entity>
     <entity name="PageBuilderMapHeight_Empty" type="pagebuilder_map_height_property">
         <data key="name">Height</data>
-        <data key="section">map_settings</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">height</data>
         <data key="value"/>
     </entity>
     <entity name="PageBuilderMapHeightProperty350" type="pagebuilder_map_height_property">
         <data key="name">Height</data>
-        <data key="section">map_settings</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">height</data>
         <data key="value">350</data>
     </entity>
     <entity name="PageBuilderMapHeightProperty500px" type="pagebuilder_map_height_property">
         <data key="name">Height</data>
-        <data key="section">map_settings</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">height</data>
         <data key="value">500</data>
     </entity>
     <entity name="PageBuilderMapHeight_Percentage" type="pagebuilder_map_height_property">
         <data key="name">Height</data>
-        <data key="section">map_settings</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">height</data>
         <data key="value">50%</data>
         <data key="errorMessage">Please enter a valid number in this field.</data>
     </entity>
     <entity name="PageBuilderMapHeight_NonNumeric" type="pagebuilder_map_height_property">
         <data key="name">Height</data>
-        <data key="section">map_settings</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">height</data>
         <data key="value">a</data>
         <data key="errorMessage">Please enter a valid number in this field.</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/SliderData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/SliderData.xml
@@ -11,97 +11,97 @@
     <!-- AutoPlay -->
     <entity name="PageBuilderSliderAutoPlay_Disabled" type="pagebuilder_slider_autoplay_property">
         <data key="name">Autoplay</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">autoplay</data>
         <data key="value">false</data>
     </entity>
     <entity name="PageBuilderSliderAutoPlay_Enabled" type="pagebuilder_slider_autoplay_property">
         <data key="name">Autoplay</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">autoplay</data>
         <data key="value">true</data>
     </entity>
     <!-- AutoPlay Speed -->
     <entity name="PageBuilderSliderAutoPlaySpeed_Default" type="pagebuilder_slider_autoplay_speed_property">
         <data key="name">Autoplay Speed</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">autoplay_speed</data>
         <data key="value">4000</data>
     </entity>
     <entity name="PageBuilderSliderAutoPlaySpeed_50000" type="pagebuilder_slider_autoplay_speed_property">
         <data key="name">Autoplay Speed</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">autoplay_speed</data>
         <data key="value">50000</data>
     </entity>
     <!-- Fade -->
     <entity name="PageBuilderSliderFade_Enabled" type="pagebuilder_slider_fade_property">
         <data key="name">Fade</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">fade</data>
         <data key="value">true</data>
     </entity>
     <entity name="PageBuilderSliderFade_Disabled" type="pagebuilder_slider_fade_property">
         <data key="name">Fade</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">fade</data>
         <data key="value">false</data>
     </entity>
     <!-- Infinite Loop -->
     <entity name="PageBuilderSliderInfiniteLoop_Enabled" type="pagebuilder_slider_infinite_loop_property">
         <data key="name">Is Infinite</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">is_infinite</data>
         <data key="value">true</data>
     </entity>
     <entity name="PageBuilderSliderInfiniteLoop_Disabled" type="pagebuilder_slider_infinite_loop_property">
         <data key="name">Is Infinite</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">is_infinite</data>
         <data key="value">false</data>
     </entity>
     <!-- Show Arrows -->
     <entity name="PageBuilderSliderShowArrows_Enabled" type="pagebuilder_slider_show_arrows_property">
         <data key="name">Show Arrows</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">show_arrows</data>
         <data key="value">true</data>
     </entity>
     <entity name="PageBuilderSliderShowArrows_Disabled" type="pagebuilder_slider_show_arrows_property">
         <data key="name">Show Arrows</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">show_arrows</data>
         <data key="value">false</data>
     </entity>
     <!-- Show Dots -->
     <entity name="PageBuilderSliderShowDots_Disabled" type="pagebuilder_slider_show_dots_property">
         <data key="name">Show dots</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">show_dots</data>
         <data key="value">false</data>
     </entity>
     <entity name="PageBuilderSliderShowDots_Enabled" type="pagebuilder_slider_show_dots_property">
         <data key="name">Show dots</data>
-        <data key="section">settings</data>
+        <data key="section">slider_settings</data>
         <data key="fieldName">show_dots</data>
         <data key="value">true</data>
     </entity>
     <!-- Minimum Height -->
     <entity name="PageBuilderSliderMinHeight_500" type="pagebuilder_slider_min_height_property">
         <data key="name">Minimum Height</data>
-        <data key="section">settings</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">500</data>
     </entity>
     <entity name="PageBuilderSliderMinHeight_Default" type="pagebuilder_slider_min_height_property">
         <data key="name">Minimum Height</data>
-        <data key="section">settings</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">300</data>
     </entity>
     <entity name="PageBuilderSliderMinHeight_100" type="pagebuilder_slider_min_height_property">
         <data key="name">Minimum Height</data>
-        <data key="section">settings</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">100</data>
     </entity>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/TabData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/TabData.xml
@@ -60,25 +60,25 @@
     <!-- Minimum Height -->
     <entity name="PageBuilderTabMinimumHeightDefaultProperty" type="pagebuilder_tab_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">300</data>
     </entity>
     <entity name="PageBuilderTabMinimumHeight200Property" type="pagebuilder_tab_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">200</data>
     </entity>
     <entity name="PageBuilderTabMinimumHeight600Property" type="pagebuilder_tab_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">600</data>
     </entity>
     <entity name="PageBuilderTabMinimumHeight1000Property" type="pagebuilder_tab_property">
         <data key="name">Minimum Height</data>
-        <data key="section">layout</data>
+        <data key="section">appearance_fieldset</data>
         <data key="fieldName">min_height</data>
         <data key="value">1000</data>
     </entity>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection.xml
@@ -34,6 +34,8 @@
         <element name="gridSizeTooltipWithMax" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'grid-panel-tooltip')][1]//span//p//span[text()='{{arg2}}']" parameterized="true"/>
         <element name="gridSizeError" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'admin__field-error') and contains(text(), '{{arg2}}')]" parameterized="true"/>
         <element name="appearance" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
+        <element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
+        <element name="verticalAlignContainer" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}]/div[contains(@class,'column-container')][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
         <!-- Background Configuration -->
         <element name="backgroundPosition" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
         <element name="backgroundSize" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
@@ -43,9 +45,6 @@
         <element name="noBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][not(contains(@style,'background-color:'))]" parameterized="true"/>
         <element name="backgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
         <element name="noBackgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][not(contains(@style,'background-image:'))]" parameterized="true"/>
-        <!-- Layout Configuration -->
-        <element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
-        <element name="verticalAlignContainer" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}]/div[contains(@class,'column-container')][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
         <!-- Advanced Configuration -->
         <element name="alignment" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'text-align: {{arg3}};')]" parameterized="true"/>
         <element name="border" type="button" selector="((//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')])[{{arg2}}][contains(@style, 'border-style: {{arg3}};')]" parameterized="true"/>
@@ -100,6 +99,8 @@
         <element name="columnPadding" type="button" selector="[data-content-type='column']:first-child[style*='padding: 5px;']"/>
         <element name="columnClass" type="button" selector="[data-content-type='column']:first-child.first-class.second-class.third-class"/>
         <element name="appearance" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
+        <element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
+        <element name="verticalAlignContainer" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
         <!-- Background Configuration -->
         <element name="backgroundPosition" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
         <element name="backgroundSize" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
@@ -110,8 +111,5 @@
         <element name="backgroundImage" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
         <element name="noBackgroundImage" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][not(contains(@style,'background-image:'))]" parameterized="true"/>
         <element name="backgroundMobileImage" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
-        <!-- Layout Configuration -->
-        <element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
-        <element name="verticalAlignContainer" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection.xml
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest.xml
