Skip to content

Commit f223a81

Browse files
omiroshnichenkoomiroshnichenko
committed
#559: User sees no predefined gutters
- fix tests
1 parent 3586ea6 commit f223a81

File tree

5 files changed

+32
-15
lines changed

5 files changed

+32
-15
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,14 @@
201201
<data key="placeholderText">Default</data>
202202
<data key="afterLabelText">px</data>
203203
</entity>
204+
<entity name="PageBuilderAdvancedBorderWidthProperty3" type="pagebuilder_advanced_border_width_property">
205+
<data key="name">Border Width</data>
206+
<data key="section">advanced</data>
207+
<data key="fieldName">border_width</data>
208+
<data key="value">3</data>
209+
<data key="placeholderText">Default</data>
210+
<data key="afterLabelText">px</data>
211+
</entity>
204212
<entity name="PageBuilderAdvancedBorderWidthProperty0" type="pagebuilder_advanced_border_width_property">
205213
<data key="name">Border Width</data>
206214
<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
@@ -91,10 +91,10 @@
9191
</actionGroup>
9292
<!-- Check Disabled -->
9393
<comment userInput="Check Disabled" stepKey="commentCheckDisabled"/>
94-
<actionGroup ref="validateSlideOutPanelFieldIsDisabled" stepKey="checkDisabledBorderColor">
94+
<actionGroup ref="validateSlideOutPanelFieldIsNotDisabled" stepKey="checkDisabledBorderColor">
9595
<argument name="property" value="PageBuilderAdvancedBorderColorDefaultProperty"/>
9696
</actionGroup>
97-
<actionGroup ref="validateSlideOutPanelFieldIsDisabled" stepKey="checkDisabledBorderWidth">
97+
<actionGroup ref="validateSlideOutPanelFieldIsNotDisabled" stepKey="checkDisabledBorderWidth">
9898
<argument name="property" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
9999
</actionGroup>
100100
<actionGroup ref="validateSlideOutPanelFieldIsNotDisabled" stepKey="checkDisabledBorderRadius">

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,23 @@
150150
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageDotted">
151151
<argument name="page" value="TextOnStage"/>
152152
<argument name="border" value="PageBuilderAdvancedBorderPropertyDotted"/>
153-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
153+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
154154
<argument name="index" value="3"/>
155155
</actionGroup>
156156
<!-- Stage: Check Border: Dashed -->
157157
<comment userInput="Stage: Check Border: Dashed" stepKey="commentStageCheckDashed"/>
158158
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageDashed">
159159
<argument name="page" value="TextOnStage"/>
160160
<argument name="border" value="PageBuilderAdvancedBorderPropertyDashed"/>
161-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
161+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
162162
<argument name="index" value="4"/>
163163
</actionGroup>
164164
<!-- Stage: Check Border: Solid -->
165165
<comment userInput="Stage: Check Border: Solid" stepKey="commentStageCheckSolid"/>
166166
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageSolid">
167167
<argument name="page" value="TextOnStage"/>
168168
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
169-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
169+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
170170
<argument name="index" value="5"/>
171171
</actionGroup>
172172
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
@@ -191,23 +191,23 @@
191191
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageDotted2">
192192
<argument name="page" value="TextOnStage"/>
193193
<argument name="border" value="PageBuilderAdvancedBorderPropertyDotted"/>
194-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
194+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
195195
<argument name="index" value="3"/>
196196
</actionGroup>
197197
<!-- Stage: Check Border: Dashed -->
198198
<comment userInput="Stage: Check Border: Dashed" stepKey="commentStageCheckDashed2"/>
199199
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageDashed2">
200200
<argument name="page" value="TextOnStage"/>
201201
<argument name="border" value="PageBuilderAdvancedBorderPropertyDashed"/>
202-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
202+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
203203
<argument name="index" value="4"/>
204204
</actionGroup>
205205
<!-- Stage: Check Border: Solid -->
206206
<comment userInput="Stage: Check Border: Solid" stepKey="commentStageCheckSolid2"/>
207207
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageSolid2">
208208
<argument name="page" value="TextOnStage"/>
209209
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
210-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
210+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
211211
<argument name="index" value="5"/>
212212
</actionGroup>
213213
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
@@ -235,7 +235,7 @@
235235
<argument name="page" value="TextOnStorefront"/>
236236
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
237237
<argument name="border" value="PageBuilderAdvancedBorderPropertyDotted"/>
238-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
238+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
239239
<argument name="index" value="3"/>
240240
</actionGroup>
241241
<!-- Storefront: Check Border: Dashed -->
@@ -244,7 +244,7 @@
244244
<argument name="page" value="TextOnStorefront"/>
245245
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
246246
<argument name="border" value="PageBuilderAdvancedBorderPropertyDashed"/>
247-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
247+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
248248
<argument name="index" value="4"/>
249249
</actionGroup>
250250
<!-- Storefront: Check Border: Solid -->
@@ -253,7 +253,7 @@
253253
<argument name="page" value="TextOnStorefront"/>
254254
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
255255
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
256-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
256+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
257257
<argument name="index" value="5"/>
258258
</actionGroup>
259259
</test>

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageEmpty">
171171
<argument name="page" value="TextOnStage"/>
172172
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
173-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
173+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
174174
<argument name="index" value="1"/>
175175
</actionGroup>
176176
<!-- Stage: Check Border Color: Plaintext -->
@@ -179,6 +179,7 @@
179179
<argument name="page" value="TextOnStage"/>
180180
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
181181
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
182+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
182183
<argument name="index" value="2"/>
183184
</actionGroup>
184185
<!-- Stage: Check Border Color: Hex -->
@@ -187,6 +188,7 @@
187188
<argument name="page" value="TextOnStage"/>
188189
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
189190
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_FF0000_rgb"/>
191+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
190192
<argument name="index" value="3"/>
191193
</actionGroup>
192194
<!-- Stage: Check Border Color: RGB -->
@@ -195,6 +197,7 @@
195197
<argument name="page" value="TextOnStage"/>
196198
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
197199
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_rgb_0_0_255"/>
200+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
198201
<argument name="index" value="4"/>
199202
</actionGroup>
200203

@@ -208,7 +211,7 @@
208211
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStageEmpty2">
209212
<argument name="page" value="TextOnStage"/>
210213
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
211-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
214+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
212215
<argument name="index" value="1"/>
213216
</actionGroup>
214217
<!-- Stage: Check Border Color: Plaintext -->
@@ -217,6 +220,7 @@
217220
<argument name="page" value="TextOnStage"/>
218221
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
219222
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
223+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
220224
<argument name="index" value="2"/>
221225
</actionGroup>
222226
<!-- Stage: Check Border Color: Hex -->
@@ -225,6 +229,7 @@
225229
<argument name="page" value="TextOnStage"/>
226230
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
227231
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_FF0000_rgb"/>
232+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
228233
<argument name="index" value="3"/>
229234
</actionGroup>
230235
<!-- Stage: Check Border Color: RGB -->
@@ -233,6 +238,7 @@
233238
<argument name="page" value="TextOnStage"/>
234239
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
235240
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_rgb_0_0_255"/>
241+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
236242
<argument name="index" value="4"/>
237243
</actionGroup>
238244

@@ -248,7 +254,7 @@
248254
<argument name="page" value="TextOnStorefront"/>
249255
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
250256
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
251-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
257+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
252258
<argument name="index" value="1"/>
253259
</actionGroup>
254260
<!-- Storefront: Check Border Color: Plaintext -->
@@ -258,6 +264,7 @@
258264
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
259265
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
260266
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
267+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
261268
<argument name="index" value="2"/>
262269
</actionGroup>
263270
<!-- Storefront: Check Border Color: Hex -->
@@ -267,6 +274,7 @@
267274
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
268275
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
269276
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_FF0000_rgb"/>
277+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
270278
<argument name="index" value="3"/>
271279
</actionGroup>
272280
<!-- Storefront: Check Border Color: RGB -->
@@ -276,6 +284,7 @@
276284
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
277285
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
278286
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_rgb_0_0_255"/>
287+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty3"/>
279288
<argument name="index" value="4"/>
280289
</actionGroup>
281290
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnValidateDefaultAndUpdateAdvancedConfigurationDefaultValuesTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<actionGroup ref="validateSlideOutPanelField" stepKey="seeAdvancedBorderRadiusProperty">
6969
<argument name="property" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
7070
</actionGroup>
71-
<seeInField userInput="0" selector="{{AdvancedForm.advancedBorderRadius}}" stepKey="assertBorderRadiusDefaultValue"/>
71+
<seeInField userInput="" selector="{{AdvancedForm.advancedBorderRadius}}" stepKey="assertBorderRadiusDefaultValue"/>
7272
<!-- Check for class field -->
7373
<actionGroup ref="validateSlideOutPanelField" stepKey="seeAdvancedCssClassesProperty">
7474
<argument name="property" value="PageBuilderAdvancedCssClassesDefaultProperty"/>

0 commit comments

Comments
 (0)