Skip to content

Commit 091278e

Browse files
hannahnidahannahnida
committed
#559: User sees no predefined gutters - Added Mftf fixes for Border Width
1 parent 79abace commit 091278e

File tree

26 files changed

+90
-76
lines changed

26 files changed

+90
-76
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationAllOptionsActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<argument name="alignment" defaultValue="PageBuilderAdvancedAlignmentPropertyDefault"/>
1616
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
1717
<argument name="borderColor" defaultValue=""/>
18-
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
19-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
18+
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
19+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusProperty0"/>
2020
<argument name="cssClasses" defaultValue=""/>
2121
<argument name="margin" defaultValue="PageBuilderMarginsProperty0"/>
2222
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithAllUpdatedNotVisibleActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<arguments>
1515
<argument name="page" defaultValue=""/>
1616
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
17-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
17+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusProperty0"/>
1818
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1919
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyStart"/>
2020
<argument name="defaultMargin" defaultValue="0" type="string"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingAdvancedConfigurationWithAllOptionsUpdatedActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
1919
<argument name="borderColor" defaultValue=""/>
2020
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
21-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
21+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusProperty0"/>
2222
<argument name="cssClasses" defaultValue=""/>
2323
<argument name="margin" defaultValue="PageBuilderMarginsProperty0"/>
2424
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingBaseAdvancedConfigurationNotVisibleActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<argument name="page" defaultValue=""/>
1616
<argument name="headingType" defaultValue="PageBuilderHeadingTypeDefaultProperty"/>
1717
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
18-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
18+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusProperty0"/>
1919
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
2020
<argument name="index" defaultValue="1" type="string"/>
2121
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyStart"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageAdvancedConfigurationWithNoAlignmentActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<argument name="defaultAlignment" defaultValue="PageBuilderAdvancedAlignmentPropertyLeft"/>
1717
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
1818
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
19-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
19+
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusProperty0"/>
2020
<argument name="margin" defaultValue="PageBuilderMarginsProperty0"/>
2121
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>
2222
</arguments>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionBottomActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<arguments>
1212
<argument name="page"/>
1313
<argument name="index" defaultValue="1" type="string"/>
14-
<argument name="padding" defaultValue="PageBuilderPaddingProperty40"/>
14+
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>
1515
</arguments>
1616
<!-- Validate bottom edge of overlay -->
1717
<comment userInput="Validate bottom edge of overlay" stepKey="commentValidateBottomEdgeOfOverlay"/>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,12 @@
207207
<data key="fieldName">border_width</data>
208208
<data key="value">0</data>
209209
</entity>
210+
<entity name="PageBuilderAdvancedBorderWidthProperty1" type="pagebuilder_advanced_border_width_property">
211+
<data key="name">Border Width</data>
212+
<data key="section">advanced</data>
213+
<data key="fieldName">border_width</data>
214+
<data key="value">1</data>
215+
</entity>
210216
<entity name="PageBuilderAdvancedBorderWidthProperty10" type="pagebuilder_advanced_border_width_property">
211217
<data key="name">Border Width</data>
212218
<data key="section">advanced</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationEditPanelVisualTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<argument name="property4" value="PageBuilderAdvancedAlignmentPropertyRight"/>
5050
</actionGroup>
5151
<actionGroup ref="validateSlideOutPanelField" stepKey="checkLabelBorder">
52-
<argument name="property" value="PageBuilderAdvancedBorderPropertyNone"/>
52+
<argument name="property" value="PageBuilderAdvancedBorderPropertyDefault"/>
5353
</actionGroup>
5454
<actionGroup ref="validateSlideOutPanelField" stepKey="checkLabelBorderColor">
5555
<argument name="property" value="PageBuilderAdvancedBorderColorDefaultProperty"/>
@@ -72,7 +72,7 @@
7272
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
7373
</actionGroup>
7474
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="checkRequiredBorder">
75-
<argument name="property" value="PageBuilderAdvancedBorderPropertyNone"/>
75+
<argument name="property" value="PageBuilderAdvancedBorderPropertyDefault"/>
7676
</actionGroup>
7777
<actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="checkRequiredBorderColor">
7878
<argument name="property" value="PageBuilderAdvancedBorderColorDefaultProperty"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorder2Test.xml

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@
7070
<actionGroup ref="addTextToTinyMCE" stepKey="enterText1">
7171
<argument name="property" value="PageBuilderTextProperty"/>
7272
</actionGroup>
73+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth1">
74+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty1"/>
75+
</actionGroup>
7376
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="selectBorder1">
7477
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
7578
</actionGroup>
@@ -84,6 +87,9 @@
8487
<actionGroup ref="addTextToTinyMCE" stepKey="enterText2">
8588
<argument name="property" value="PageBuilderTextProperty"/>
8689
</actionGroup>
90+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth2">
91+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty1"/>
92+
</actionGroup>
8793
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="selectBorder2">
8894
<argument name="property" value="PageBuilderAdvancedBorderPropertyGroove"/>
8995
</actionGroup>
@@ -98,6 +104,9 @@
98104
<actionGroup ref="addTextToTinyMCE" stepKey="enterText3">
99105
<argument name="property" value="PageBuilderTextProperty"/>
100106
</actionGroup>
107+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth3">
108+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty1"/>
109+
</actionGroup>
101110
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="selectBorder3">
102111
<argument name="property" value="PageBuilderAdvancedBorderPropertyRidge"/>
103112
</actionGroup>
@@ -112,6 +121,9 @@
112121
<actionGroup ref="addTextToTinyMCE" stepKey="enterText4">
113122
<argument name="property" value="PageBuilderTextProperty"/>
114123
</actionGroup>
124+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth4">
125+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty1"/>
126+
</actionGroup>
115127
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="selectBorder4">
116128
<argument name="property" value="PageBuilderAdvancedBorderPropertyInset"/>
117129
</actionGroup>
@@ -126,6 +138,9 @@
126138
<actionGroup ref="addTextToTinyMCE" stepKey="enterText5">
127139
<argument name="property" value="PageBuilderTextProperty"/>
128140
</actionGroup>
141+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth5">
142+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty1"/>
143+
</actionGroup>
129144
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="selectBorder5">
130145
<argument name="property" value="PageBuilderAdvancedBorderPropertyOutset"/>
131146
</actionGroup>
@@ -136,39 +151,39 @@
136151
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageDouble">
137152
<argument name="page" value="TextOnStage"/>
138153
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
139-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
154+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
140155
<argument name="index" value="1"/>
141156
</actionGroup>
142157
<!-- Stage: Check Border: Groove -->
143158
<comment userInput="Stage: Check Border: Groove" stepKey="commentStageCheckGroove"/>
144159
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageGroove">
145160
<argument name="page" value="TextOnStage"/>
146161
<argument name="border" value="PageBuilderAdvancedBorderPropertyGroove"/>
147-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
162+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
148163
<argument name="index" value="2"/>
149164
</actionGroup>
150165
<!-- Stage: Check Border: Ridge -->
151166
<comment userInput="Stage: Check Border: Ridge" stepKey="commentStageCheckRidge"/>
152167
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageRidge">
153168
<argument name="page" value="TextOnStage"/>
154169
<argument name="border" value="PageBuilderAdvancedBorderPropertyRidge"/>
155-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
170+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
156171
<argument name="index" value="3"/>
157172
</actionGroup>
158173
<!-- Stage: Check Border: Inset -->
159174
<comment userInput="Stage: Check Border: Inset" stepKey="commentStageCheckInset"/>
160175
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageInset">
161176
<argument name="page" value="TextOnStage"/>
162177
<argument name="border" value="PageBuilderAdvancedBorderPropertyInset"/>
163-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
178+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
164179
<argument name="index" value="4"/>
165180
</actionGroup>
166181
<!-- Stage: Check Border: Outset -->
167182
<comment userInput="Stage: Check Border: Outset" stepKey="commentStageCheckOutset"/>
168183
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageOutset">
169184
<argument name="page" value="TextOnStage"/>
170185
<argument name="border" value="PageBuilderAdvancedBorderPropertyOutset"/>
171-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
186+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
172187
<argument name="index" value="5"/>
173188
</actionGroup>
174189
<comment userInput="Validate Stage After Save" stepKey="commentStageAfterSave"/>
@@ -180,39 +195,39 @@
180195
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageDouble2">
181196
<argument name="page" value="TextOnStage"/>
182197
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
183-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
198+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
184199
<argument name="index" value="1"/>
185200
</actionGroup>
186201
<!-- Stage: Check Border: Groove -->
187202
<comment userInput="Stage: Check Border: Groove" stepKey="commentStageCheckGroove2"/>
188203
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageGroove2">
189204
<argument name="page" value="TextOnStage"/>
190205
<argument name="border" value="PageBuilderAdvancedBorderPropertyGroove"/>
191-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
206+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
192207
<argument name="index" value="2"/>
193208
</actionGroup>
194209
<!-- Stage: Check Border: Ridge -->
195210
<comment userInput="Stage: Check Border: Ridge" stepKey="commentStageCheckRidge2"/>
196211
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageRidge2">
197212
<argument name="page" value="TextOnStage"/>
198213
<argument name="border" value="PageBuilderAdvancedBorderPropertyRidge"/>
199-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
214+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
200215
<argument name="index" value="3"/>
201216
</actionGroup>
202217
<!-- Stage: Check Border: Inset -->
203218
<comment userInput="Stage: Check Border: Inset" stepKey="commentStageCheckInset2"/>
204219
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageInset2">
205220
<argument name="page" value="TextOnStage"/>
206221
<argument name="border" value="PageBuilderAdvancedBorderPropertyInset"/>
207-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
222+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
208223
<argument name="index" value="4"/>
209224
</actionGroup>
210225
<!-- Stage: Check Border: Outset -->
211226
<comment userInput="Stage: Check Border: Outset" stepKey="commentStageCheckOutset2"/>
212227
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageOutset2">
213228
<argument name="page" value="TextOnStage"/>
214229
<argument name="border" value="PageBuilderAdvancedBorderPropertyOutset"/>
215-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
230+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
216231
<argument name="index" value="5"/>
217232
</actionGroup>
218233
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
@@ -224,7 +239,7 @@
224239
<argument name="page" value="TextOnStorefront"/>
225240
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
226241
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
227-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
242+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
228243
<argument name="index" value="1"/>
229244
</actionGroup>
230245
<!-- Storefront: Check Border: Groove -->
@@ -233,7 +248,7 @@
233248
<argument name="page" value="TextOnStorefront"/>
234249
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
235250
<argument name="border" value="PageBuilderAdvancedBorderPropertyGroove"/>
236-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
251+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
237252
<argument name="index" value="2"/>
238253
</actionGroup>
239254
<!-- Storefront: Check Border: Ridge -->
@@ -242,7 +257,7 @@
242257
<argument name="page" value="TextOnStorefront"/>
243258
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
244259
<argument name="border" value="PageBuilderAdvancedBorderPropertyRidge"/>
245-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
260+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
246261
<argument name="index" value="3"/>
247262
</actionGroup>
248263
<!-- Storefront: Check Border: Inset -->
@@ -251,7 +266,7 @@
251266
<argument name="page" value="TextOnStorefront"/>
252267
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
253268
<argument name="border" value="PageBuilderAdvancedBorderPropertyInset"/>
254-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
269+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
255270
<argument name="index" value="4"/>
256271
</actionGroup>
257272
<!-- Storefront: Check Border: Outset -->
@@ -260,7 +275,7 @@
260275
<argument name="page" value="TextOnStorefront"/>
261276
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
262277
<argument name="border" value="PageBuilderAdvancedBorderPropertyOutset"/>
263-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
278+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty1"/>
264279
<argument name="index" value="5"/>
265280
</actionGroup>
266281
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderTabsThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab1MinHeightCMSBlockStage">
195195
<argument name="content" value="{{TabOnStage.tabContentCSS}}"/>
196196
<argument name="minHeight" value="{{PageBuilderTabMinimumHeight200Property.value}}"/>
197-
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthPropertyDefault.value}}"/>
197+
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthProperty0.value}}"/>
198198
<argument name="index" value="1"/>
199199
</actionGroup>
200200
<seeElement selector="{{DividerOnStage.base('1')}}" stepKey="seeDividerCMSBlockStage"/>

0 commit comments

Comments
 (0)