Skip to content

Commit 4458633

Browse files
omiroshnichenkoomiroshnichenko
committed
Merge branch '637-form-field-viewport-scope' of github.com:magento/magento2-page-builder into PR-bundle
2 parents efb6885 + 797cbc0 commit 4458633

14 files changed

+2102
-0
lines changed

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateMobileIconTooltipInContentTypeEditFormActionGroup">
11+
<annotations>
12+
<description>Verifies that the mobile icon and tooltip appear for the specified Edit Form field</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="property" defaultValue="PageBuilderMinHeightProperty_Empty"/>
16+
</arguments>
17+
<waitForElementVisible selector="{{PageBuilderViewportFormSection.mobileIconField(property.section, property.fieldName)}}" stepKey="waitForTooltip"/>
18+
<moveMouseOver selector="{{PageBuilderViewportFormSection.mobileFieldTooltip(property.section, property.fieldName)}}" stepKey="mouseOverTooltip"/>
19+
<waitForElementVisible selector="{{PageBuilderViewportFormSection.mobileFieldTooltipContent(property.section, property.fieldName)}}" stepKey="waitForTooltipContentVisible"/>
20+
<waitForText userInput="{{property.tooltipText}}" selector="{{PageBuilderViewportFormSection.mobileFieldTooltipContent(property.section, property.fieldName))}}" stepKey="seeTooltipContent"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ValidateMobileIconTooltipNotVisibleInEditFormActionGroup">
11+
<annotations>
12+
<description>Verifies that the mobile icon and tooltip do not exist for the specified Edit Form field</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="property" defaultValue="PageBuilderMinHeightProperty_Empty"/>
16+
</arguments>
17+
<dontSeeElementInDOM selector="{{PageBuilderViewportFormSection.mobileIconField(property.section, property.fieldName)}}" stepKey="verifyMobileIconIsNotVisible"/>
18+
<dontSeeElementInDOM selector="{{PageBuilderViewportFormSection.mobileFieldTooltipContent(property.section, property.fieldName)}}" stepKey="verifyTooltipIsNotVisible"/>
19+
</actionGroup>
20+
</actionGroups>

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@
1313
<data key="fieldName">min_height</data>
1414
<data key="value"/>
1515
<data key="helperText">Minimum height can be a single number with any valid CSS unit (50px, 50%, 50em, 50vh) or a calculation (50% + 50px).</data>
16+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
1617
</entity>
1718
<entity name="PageBuilderMinHeightProperty_0" type="pagebuilder_min_height_property">
1819
<data key="name">Minimum Height</data>
1920
<data key="section">appearance_fieldset</data>
2021
<data key="fieldName">min_height</data>
2122
<data key="value">0</data>
2223
<data key="style">min-height: 0px</data>
24+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
2325
</entity>
2426
<entity name="PageBuilderMinHeightProperty_60" type="pagebuilder_min_height_property">
2527
<data key="name">Minimum Height</data>
@@ -41,6 +43,7 @@
4143
<data key="fieldName">min_height</data>
4244
<data key="value">500</data>
4345
<data key="style">min-height: 500px</data>
46+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
4447
</entity>
4548
<entity name="PageBuilderMinHeightProperty_500px" type="pagebuilder_min_height_property">
4649
<data key="name">Minimum Height</data>
@@ -49,13 +52,15 @@
4952
<data key="value">500px</data>
5053
<data key="intValue">500</data>
5154
<data key="style">min-height: 500px</data>
55+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
5256
</entity>
5357
<entity name="PageBuilderMinHeightProperty_300" type="pagebuilder_min_height_property">
5458
<data key="name">Minimum Height</data>
5559
<data key="section">appearance_fieldset</data>
5660
<data key="fieldName">min_height</data>
5761
<data key="value">300</data>
5862
<data key="style">min-height: 300px</data>
63+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
5964
</entity>
6065
<entity name="PageBuilderMinHeightProperty_300px" type="pagebuilder_min_height_property">
6166
<data key="name">Minimum Height</data>
@@ -64,13 +69,15 @@
6469
<data key="value">300px</data>
6570
<data key="intValue">300</data>
6671
<data key="style">min-height: 300px</data>
72+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
6773
</entity>
6874
<entity name="PageBuilderMinHeightProperty_200" type="pagebuilder_min_height_property">
6975
<data key="name">Minimum Height</data>
7076
<data key="section">appearance_fieldset</data>
7177
<data key="fieldName">min_height</data>
7278
<data key="value">200</data>
7379
<data key="style">min-height: 200px</data>
80+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
7481
</entity>
7582
<entity name="PageBuilderMinHeightProperty_200px" type="pagebuilder_min_height_property">
7683
<data key="name">Minimum Height</data>
@@ -79,6 +86,7 @@
7986
<data key="value">200px</data>
8087
<data key="intValue">200</data>
8188
<data key="style">min-height: 200px</data>
89+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
8290
</entity>
8391
<entity name="PageBuilderMinHeightProperty_100px" type="pagebuilder_min_height_property">
8492
<data key="name">Minimum Height</data>
@@ -87,48 +95,55 @@
8795
<data key="value">100px</data>
8896
<data key="intValue">100</data>
8997
<data key="style">min-height: 100px</data>
98+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
9099
</entity>
91100
<entity name="PageBuilderMinHeightProperty_100vh" type="pagebuilder_min_height_property">
92101
<data key="name">Minimum Height</data>
93102
<data key="section">appearance_fieldset</data>
94103
<data key="fieldName">min_height</data>
95104
<data key="value">100vh</data>
96105
<data key="style">min-height: 100vh</data>
106+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
97107
</entity>
98108
<entity name="PageBuilderMinHeightProperty_300vh" type="pagebuilder_min_height_property">
99109
<data key="name">Minimum Height</data>
100110
<data key="section">appearance_fieldset</data>
101111
<data key="fieldName">min_height</data>
102112
<data key="value">300vh</data>
103113
<data key="style">min-height: 300vh</data>
114+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
104115
</entity>
105116
<entity name="PageBuilderMinHeightProperty_100vh_Minus_200px" type="pagebuilder_min_height_property">
106117
<data key="name">Minimum Height</data>
107118
<data key="section">appearance_fieldset</data>
108119
<data key="fieldName">min_height</data>
109120
<data key="value">calc(100vh - 200px)</data>
110121
<data key="style">min-height: calc(100vh - 200px)</data>
122+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
111123
</entity>
112124
<entity name="PageBuilderMinHeightProperty_Auto" type="pagebuilder_min_height_property">
113125
<data key="name">Minimum Height</data>
114126
<data key="section">appearance_fieldset</data>
115127
<data key="fieldName">min_height</data>
116128
<data key="value">auto</data>
117129
<data key="style">min-height: auto</data>
130+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
118131
</entity>
119132
<entity name="PageBuilderMinHeightProperty_NonNumeric" type="pagebuilder_min_height_property">
120133
<data key="name">Minimum Height</data>
121134
<data key="section">appearance_fieldset</data>
122135
<data key="fieldName">min_height</data>
123136
<data key="value">a</data>
124137
<data key="errorMessage">Please enter a valid number or calculation: Valid numbers must have an extension (px, %, pt, vh). Calculations must have white space around the + and - operators and cannot divide by zero.</data>
138+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
125139
</entity>
126140
<entity name="PageBuilderMinHeightProperty_Negative1" type="pagebuilder_min_height_property">
127141
<data key="name">Minimum Height</data>
128142
<data key="section">appearance_fieldset</data>
129143
<data key="fieldName">min_height</data>
130144
<data key="value">-1</data>
131145
<data key="errorMessage">Please enter a valid number or calculation: Valid numbers must have an extension (px, %, pt, vh). Calculations must have white space around the + and - operators and cannot divide by zero.</data>
146+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
132147
</entity>
133148
<!-- Vertical Alignment -->
134149
<entity name="PageBuilderVerticalAlignmentPropertyTop" type="pagebuilder_vertical_alignment_property">

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,56 +61,79 @@
6161
<data key="section">general</data>
6262
<data key="fieldName">min_height</data>
6363
<data key="value">300</data>
64+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
6465
</entity>
6566
<entity name="PageBuilderTabMinimumHeightEmptyProperty" type="pagebuilder_tab_property">
6667
<data key="name">Minimum Height</data>
6768
<data key="section">general</data>
6869
<data key="fieldName">min_height</data>
6970
<data key="value"/>
71+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
72+
</entity>
73+
<entity name="PageBuilderTabMinimumHeightEmptyContainerProperty" 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">220</data>
78+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
7079
</entity>
7180
<entity name="PageBuilderTabMinHeight0Property" type="pagebuilder_tab_property">
7281
<data key="name">Minimum Height</data>
7382
<data key="section">general</data>
7483
<data key="fieldName">min_height</data>
7584
<data key="value">0</data>
85+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
7686
</entity>
7787
<entity name="PageBuilderTabMinimumHeight200Property" type="pagebuilder_tab_property">
7888
<data key="name">Minimum Height</data>
7989
<data key="section">general</data>
8090
<data key="fieldName">min_height</data>
8191
<data key="value">200</data>
92+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
8293
</entity>
8394
<entity name="PageBuilderTabMinimumHeight300Property" type="pagebuilder_tab_property">
8495
<data key="name">Minimum Height</data>
8596
<data key="section">general</data>
8697
<data key="fieldName">min_height</data>
8798
<data key="value">300</data>
99+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
100+
</entity>
101+
<entity name="PageBuilderTabMinimumHeight500Property" type="pagebuilder_tab_property">
102+
<data key="name">Minimum Height</data>
103+
<data key="section">general</data>
104+
<data key="fieldName">min_height</data>
105+
<data key="value">500</data>
106+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
88107
</entity>
89108
<entity name="PageBuilderTabMinimumHeight600Property" type="pagebuilder_tab_property">
90109
<data key="name">Minimum Height</data>
91110
<data key="section">general</data>
92111
<data key="fieldName">min_height</data>
93112
<data key="value">600</data>
113+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
94114
</entity>
95115
<entity name="PageBuilderTabMinimumHeight1000Property" type="pagebuilder_tab_property">
96116
<data key="name">Minimum Height</data>
97117
<data key="section">general</data>
98118
<data key="fieldName">min_height</data>
99119
<data key="value">1000</data>
120+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
100121
</entity>
101122
<entity name="PageBuilderTabMinimumHeightProperty_NonNumeric" type="pagebuilder_tab_property">
102123
<data key="name">Minimum Height</data>
103124
<data key="section">general</data>
104125
<data key="fieldName">min_height</data>
105126
<data key="value">a</data>
106127
<data key="errorMessage">Please enter a valid number in this field.</data>
128+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
107129
</entity>
108130
<entity name="PageBuilderTabMinHeightProperty_Negative1" type="pagebuilder_tab_property">
109131
<data key="name">Minimum Height</data>
110132
<data key="section">general</data>
111133
<data key="fieldName">min_height</data>
112134
<data key="value">-1</data>
113135
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
136+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
114137
</entity>
115138
<!-- Vertical Alignment -->
116139
<entity name="PageBuilderTabVerticalAlignmentPropertyTop" type="pagebuilder_tab_property">

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,54 @@
2828
<data key="value">Tab 2</data>
2929
</entity>
3030
<!-- Minimum Height -->
31+
<entity name="PageBuilderTabsMinHeightProperty_Empty" type="pagebuilder_tabs_property">
32+
<data key="name">Minimum Height</data>
33+
<data key="section">general</data>
34+
<data key="fieldName">min_height</data>
35+
<data key="value"/>
36+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
37+
</entity>
38+
<entity name="PageBuilderTabsMinHeightProperty_0" type="pagebuilder_tabs_property">
39+
<data key="name">Minimum Height</data>
40+
<data key="section">general</data>
41+
<data key="fieldName">min_height</data>
42+
<data key="value">0</data>
43+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
44+
</entity>
45+
<entity name="PageBuilderTabsMinHeightProperty_80" 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">80</data>
50+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
51+
</entity>
52+
<entity name="PageBuilderTabsMinHeightProperty_200" type="pagebuilder_tabs_property">
53+
<data key="name">Minimum Height</data>
54+
<data key="section">general</data>
55+
<data key="fieldName">min_height</data>
56+
<data key="value">200</data>
57+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
58+
</entity>
3159
<entity name="PageBuilderTabsDefaultMinHeight" type="pagebuilder_tabs_property">
3260
<data key="name">Minimum Height</data>
3361
<data key="section">general</data>
3462
<data key="fieldName">min_height</data>
3563
<data key="value">300</data>
64+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
3665
</entity>
3766
<entity name="PageBuilderTabsDefinedMinHeight" type="pagebuilder_tabs_property">
3867
<data key="name">Minimum Height</data>
3968
<data key="section">general</data>
4069
<data key="fieldName">min_height</data>
4170
<data key="value">400</data>
71+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
4272
</entity>
4373
<entity name="PageBuilderTabsMinHeightProperty_500" type="pagebuilder_tabs_property">
4474
<data key="name">Minimum Height</data>
4575
<data key="section">general</data>
4676
<data key="fieldName">min_height</data>
4777
<data key="value">500</data>
78+
<data key="tooltipText">Style changes will only affect this breakpoint</data>
4879
</entity>
4980
<!-- Tab Navigation Alignment -->
5081
<entity name="PageBuilderTabsAlignmentDefault" type="pagebuilder_tabs_property">

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/PageBuilderViewportFormSection.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="PageBuilderViewportFormSection">
11+
<!-- Mobile Icon Tooltip Container -->
12+
<element name="mobileFieldTooltip" type="button" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::div[contains(@class,'admin__field-tooltip')]"/>
13+
<!-- Mobile Icon -->
14+
<element name="mobileIconField" type="button" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::a[contains(@class,'admin__field-tooltip-action')]"/>
15+
<!-- Mobile Icon Tooltip -->
16+
<element name="mobileFieldTooltipContent" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-tooltip-content')]"/>
17+
</section>
18+
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabsOnStageSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,6 @@
2828
<element name="addNewTabButton" type="button" selector="//button/span[contains(text(), 'Add New Tab')]"/>
2929
<element name="tabsAlignment" type="text" selector="//ul[@role='tablist' and contains(@style,'text-align: {{arg1}}')]" parameterized="true" deprecated="Styles are not inline"/>
3030
<element name="tabsContentPath" type="button" selector="(//div[contains(@class,&quot;pagebuilder-tabs&quot;)]//descendant::*[contains(@class,&quot;tabs-content&quot;)])"/>
31+
<element name="tabsContentContainerIndex" type="button" selector="(//div[@data-content-type=&quot;tabs&quot;]//div[contains(@class,&quot;tabs-content&quot;)]//*[@role=&quot;tabpanel&quot;])[{{index}}]" parameterized="true"/>
3132
</section>
3233
</sections>

0 commit comments

Comments
 (0)