Skip to content

Commit d179d0c

Browse files
author
joiecaquicla
committed
Merge branch '637-form-field-functional-tests' of github.com:yolouiese/magento2-page-builder into 637-form-field-functional-tests
2 parents 381d1e3 + 4d8b9b7 commit d179d0c

File tree

3 files changed

+349
-17
lines changed

3 files changed

+349
-17
lines changed

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,56 +63,79 @@
6363
<data key="section">general</data>
6464
<data key="fieldName">min_height</data>
6565
<data key="value">300</data>
66+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
6667
</entity>
6768
<entity name="PageBuilderTabMinimumHeightEmptyProperty" type="pagebuilder_tab_property">
6869
<data key="name">Minimum Height</data>
6970
<data key="section">general</data>
7071
<data key="fieldName">min_height</data>
7172
<data key="value"/>
73+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
74+
</entity>
75+
<entity name="PageBuilderTabMinimumHeightEmptyContainerProperty" type="pagebuilder_tab_property">
76+
<data key="name">Minimum Height</data>
77+
<data key="section">general</data>
78+
<data key="fieldName">min_height</data>
79+
<data key="value">220</data>
80+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
7281
</entity>
7382
<entity name="PageBuilderTabMinHeight0Property" type="pagebuilder_tab_property">
7483
<data key="name">Minimum Height</data>
7584
<data key="section">general</data>
7685
<data key="fieldName">min_height</data>
7786
<data key="value">0</data>
87+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
7888
</entity>
7989
<entity name="PageBuilderTabMinimumHeight200Property" type="pagebuilder_tab_property">
8090
<data key="name">Minimum Height</data>
8191
<data key="section">general</data>
8292
<data key="fieldName">min_height</data>
8393
<data key="value">200</data>
94+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
8495
</entity>
8596
<entity name="PageBuilderTabMinimumHeight300Property" type="pagebuilder_tab_property">
8697
<data key="name">Minimum Height</data>
8798
<data key="section">general</data>
8899
<data key="fieldName">min_height</data>
89100
<data key="value">300</data>
101+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
102+
</entity>
103+
<entity name="PageBuilderTabMinimumHeight500Property" 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">500</data>
108+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
90109
</entity>
91110
<entity name="PageBuilderTabMinimumHeight600Property" type="pagebuilder_tab_property">
92111
<data key="name">Minimum Height</data>
93112
<data key="section">general</data>
94113
<data key="fieldName">min_height</data>
95114
<data key="value">600</data>
115+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
96116
</entity>
97117
<entity name="PageBuilderTabMinimumHeight1000Property" type="pagebuilder_tab_property">
98118
<data key="name">Minimum Height</data>
99119
<data key="section">general</data>
100120
<data key="fieldName">min_height</data>
101121
<data key="value">1000</data>
122+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
102123
</entity>
103124
<entity name="PageBuilderTabMinimumHeightProperty_NonNumeric" type="pagebuilder_tab_property">
104125
<data key="name">Minimum Height</data>
105126
<data key="section">general</data>
106127
<data key="fieldName">min_height</data>
107128
<data key="value">a</data>
108129
<data key="errorMessage">Please enter a valid number in this field.</data>
130+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
109131
</entity>
110132
<entity name="PageBuilderTabMinHeightProperty_Negative1" type="pagebuilder_tab_property">
111133
<data key="name">Minimum Height</data>
112134
<data key="section">general</data>
113135
<data key="fieldName">min_height</data>
114136
<data key="value">-1</data>
115137
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
138+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
116139
</entity>
117140
<!-- Vertical Alignment -->
118141
<entity name="PageBuilderTabVerticalAlignmentPropertyTop" type="pagebuilder_tab_property">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabGroupMinHeightTest.xml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,37 @@
2727
<actionGroup ref="dragContentTypeToStage" after="expandPageBuilderPanelMenuSection" stepKey="dragContentTypeIntoStage">
2828
<argument name="contentType" value="PageBuilderTabsContentType"/>
2929
</actionGroup>
30-
<click selector="{{TabsOnStage.tabsContainer}}" after="dragContentTypeIntoStage" stepKey="focusContentTypeElement1"/>
31-
<actionGroup ref="openPageBuilderEditPanelByIndex" after="focusContentTypeElement1" stepKey="openEditPanelTabGroup">
32-
<argument name="contentType" value="PageBuilderTabsContentType"/>
30+
31+
<!-- Edit Tab Item -->
32+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" after="dragContentTypeIntoStage" stepKey="openEditPanelTabItem">
33+
<argument name="section" value="TabOnStage"/>
3334
<argument name="index" value="1"/>
3435
</actionGroup>
35-
<actionGroup ref="selectSlideOutPanelField" after="openEditPanelTabGroup" stepKey="enterBorderNone1">
36+
<actionGroup ref="selectSlideOutPanelField" after="openEditPanelTabItem" stepKey="enterBorderNone2">
3637
<argument name="property" value="PageBuilderAdvancedBorderPropertyNone"/>
3738
</actionGroup>
38-
<actionGroup ref="saveEditPanelSettings" after="enterBorderNone1" stepKey="saveEditPanelSettingsTabGroup"/>
39-
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" after="saveEditPanelSettingsTabGroup" stepKey="openEditPanelTabItem">
40-
<argument name="section" value="TabOnStage"/>
39+
<actionGroup ref="saveEditPanelSettings" after="enterBorderNone2" stepKey="saveEditPanelSettingsTabItem"/>
40+
41+
<!-- Edit Tab Group -->
42+
<actionGroup ref="openPageBuilderEditPanelByIndex" after="saveEditPanelSettingsTabItem" stepKey="openEditPanelTabGroup">
43+
<argument name="contentType" value="PageBuilderTabsContentType"/>
44+
<argument name="index" value="1"/>
4145
</actionGroup>
42-
<actionGroup ref="selectSlideOutPanelField" after="openEditPanelTabItem" stepKey="enterBorderNone2">
46+
<actionGroup ref="selectSlideOutPanelField" after="openEditPanelTabGroup" stepKey="enterBorderNone1">
4347
<argument name="property" value="PageBuilderAdvancedBorderPropertyNone"/>
4448
</actionGroup>
45-
<actionGroup ref="saveEditPanelSettings" after="enterBorderNone2" stepKey="saveEditPanelSettingsTabItem"/>
46-
<click selector="{{TabsOnStage.tabsContainer}}" after="saveEditPanelSettingsTabItem" stepKey="focusContentTypeElement2"/>
49+
<actionGroup ref="saveEditPanelSettings" after="enterBorderNone1" stepKey="saveEditPanelSettingsTabGroup"/>
4750

4851
<!-- Duplicate Tab Group -->
52+
<click selector="{{TabsOnStage.tabsContainer}}" after="saveEditPanelSettingsTabItem" stepKey="focusContentTypeElement2"/>
4953
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType1">
5054
<argument name="contentType" value="PageBuilderTabsContentType"/>
5155
</actionGroup>
5256
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType2">
5357
<argument name="contentType" value="PageBuilderTabsContentType"/>
5458
</actionGroup>
5559

56-
<!-- Row 1: Desktop Min Height = 500px -->
60+
<!-- Tab Group 1: Desktop Min Height = 500px -->
5761
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel1">
5862
<argument name="contentType" value="PageBuilderTabsContentType"/>
5963
<argument name="index" value="1"/>
@@ -64,7 +68,7 @@
6468
<actionGroup ref="ValidateMobileIconTooltipNotVisibleInEditFormActionGroup" stepKey="verifyNoMobileIconTooltip">
6569
<argument name="property" value="PageBuilderTabsMinHeightProperty_500"/>
6670
</actionGroup>
67-
<!-- Row 1: Mobile Empty Min Height -->
71+
<!-- Tab Group 1: Mobile Empty Min Height -->
6872
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel2">
6973
<argument name="contentType" value="PageBuilderTabsContentType"/>
7074
<argument name="index" value="1"/>
@@ -76,15 +80,15 @@
7680
<argument name="property" value="PageBuilderTabsMinHeightProperty_Empty"/>
7781
</actionGroup>
7882

79-
<!-- Row 2: Desktop Min Height = 500px -->
83+
<!-- Tab Group 2: Desktop Min Height = 500px -->
8084
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel3">
8185
<argument name="contentType" value="PageBuilderTabsContentType"/>
8286
<argument name="contentTypeIndex" value="2"/>
8387
</actionGroup>
8488
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeight500px2">
8589
<argument name="property" value="PageBuilderTabsMinHeightProperty_500"/>
8690
</actionGroup>
87-
<!-- Row 2: Mobile Min Height = 200px -->
91+
<!-- Tab Group 2: Mobile Min Height = 200px -->
8892
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel4">
8993
<argument name="contentType" value="PageBuilderTabsContentType"/>
9094
<argument name="contentTypeIndex" value="2"/>
@@ -93,15 +97,15 @@
9397
<argument name="property" value="PageBuilderTabsMinHeightProperty_200"/>
9498
</actionGroup>
9599

96-
<!-- Row 3: Desktop Empty Min Height -->
100+
<!-- Tab Group 3: Desktop Empty Min Height -->
97101
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel5">
98102
<argument name="contentType" value="PageBuilderTabsContentType"/>
99103
<argument name="contentTypeIndex" value="3"/>
100104
</actionGroup>
101105
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="validateEmptyHeightField2">
102106
<argument name="property" value="PageBuilderTabsMinHeightProperty_Empty"/>
103107
</actionGroup>
104-
<!-- Row 3: Mobile Min Height = 200px -->
108+
<!-- Tab Group 3: Mobile Min Height = 200px -->
105109
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel6">
106110
<argument name="contentType" value="PageBuilderTabsContentType"/>
107111
<argument name="contentTypeIndex" value="3"/>
@@ -277,7 +281,7 @@
277281
<argument name="expectedProperty" value="{{PageBuilderTabsMinHeightProperty_500.value}}"/>
278282
<argument name="cssProperty" value="minHeight"/>
279283
</actionGroup>
280-
<executeJS function="return document.evaluate('{{TabOnStorefront.base('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefrontMobile"/>
284+
<executeJS function="return document.evaluate('{{TabsOnStorefront.base('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefrontMobile"/>
281285
<assertEquals stepKey="assertFirstMinHeightStorefrontMobile">
282286
<actualResult type="variable">firstMinHeightStorefrontMobile</actualResult>
283287
<expectedResult type="string">{{PageBuilderTabsMinHeightProperty_500.value}}</expectedResult>

0 commit comments

Comments
 (0)