Skip to content

Commit ad1880d

Browse files
author
Hwashiang Yu
committed
MC-4075: Alignment attribute not working as expected for product, map, divider, video
- Removed alignment from map form - Updated map test to no longer expect alignment in form - Updated divider section to look for inline block in hr - Updated edit form action group to for making sure certain fields are not visible
1 parent 8a7b461 commit ad1880d

File tree

4 files changed

+13
-37
lines changed

4 files changed

+13
-37
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,12 @@
348348
</arguments>
349349
<dontSeeElementInDOM selector="{{EditPanelForm.panelFieldNoAfterLabelText(property.fieldName)}}" stepKey="dontSeeElementInDOM"/>
350350
</actionGroup>
351+
<actionGroup name="validateSlideOutPanelFieldNotPresent">
352+
<arguments>
353+
<argument name="property"/>
354+
</arguments>
355+
<dontSee selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="dontSeeField"/>
356+
</actionGroup>
351357
<actionGroup name="validateAlignmentFieldIsNotDisabled">
352358
<arguments>
353359
<argument name="property"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDividerSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<element name="width" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//hr[contains(@style,'width: {{arg2}};')]" parameterized="true"/>
2121
<element name="noWidth" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//hr[not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]" parameterized="true"/>
2222
<!-- Advanced Configuration -->
23-
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//div[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
23+
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//div[contains(@style,'text-align: {{arg2}};')]//hr[contains(@style,'display: inline-block;')]" parameterized="true"/>
2424
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//div[not(contains(@style,'text-align:'))]" parameterized="true"/>
2525
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//div[contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
2626
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-divider')])[{{arg1}}]//div[contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
@@ -44,7 +44,7 @@
4444
<element name="width" type="text" selector="(//div[@data-role='divider'])[{{arg1}}]//hr[contains(@style,'width: {{arg2}};')]" parameterized="true"/>
4545
<element name="noWidth" type="text" selector="(//div[@data-role='divider'])[{{arg1}}]//hr[not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]" parameterized="true"/>
4646
<!-- Advanced Configuration -->
47-
<element name="alignment" type="text" selector="(//div[@data-role='divider'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
47+
<element name="alignment" type="text" selector="(//div[@data-role='divider'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]//hr[contains(@style,'display: inline-block;')]" parameterized="true"/>
4848
<element name="noAlignment" type="text" selector="(//div[@data-role='divider'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
4949
<element name="border" type="text" selector="(//div[@data-role='divider'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
5050
<element name="borderWidth" type="text" selector="(//div[@data-role='divider'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest.xml

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
</actionGroup>
253253
<!-- Validate Default Values -->
254254
<comment userInput="Validate Default Values" stepKey="CommentValidateDefaultValues"/>
255-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
255+
<actionGroup ref="validateSlideOutPanelFieldNotPresent" stepKey="validateNoAlignmentField">
256256
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
257257
</actionGroup>
258258
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
@@ -304,7 +304,7 @@
304304
</actionGroup>
305305
<!-- Validate Edit Panel After Save -->
306306
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
307-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
307+
<actionGroup ref="validateSlideOutPanelFieldNotPresent" stepKey="validateNoAlignment2">
308308
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
309309
</actionGroup>
310310
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder2">
@@ -381,9 +381,6 @@
381381
<actionGroup ref="saveLocationForm" stepKey="saveLocationForm"/>
382382
<!-- Update Values -->
383383
<comment userInput="Update Values" stepKey="commentUpdateValues"/>
384-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
385-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
386-
</actionGroup>
387384
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
388385
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
389386
</actionGroup>
@@ -410,7 +407,6 @@
410407
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
411408
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage">
412409
<argument name="page" value="MapOnStage"/>
413-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
414410
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
415411
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
416412
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -425,9 +421,6 @@
425421
</actionGroup>
426422
<!-- Validate Edit Panel -->
427423
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
428-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
429-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
430-
</actionGroup>
431424
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
432425
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
433426
</actionGroup>
@@ -456,7 +449,6 @@
456449
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
457450
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
458451
<argument name="page" value="MapOnStage"/>
459-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
460452
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
461453
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
462454
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -471,9 +463,6 @@
471463
</actionGroup>
472464
<!-- Validate Edit Panel After Save -->
473465
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
474-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
475-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
476-
</actionGroup>
477466
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder2">
478467
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
479468
</actionGroup>
@@ -502,7 +491,6 @@
502491
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
503492
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
504493
<argument name="page" value="MapOnStorefront"/>
505-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
506494
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
507495
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
508496
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -646,9 +634,6 @@
646634
</actionGroup>
647635
<!-- Update Advanced Section -->
648636
<comment userInput="Update Advanced Section" stepKey="commentUpdateAdvancedSection"/>
649-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
650-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
651-
</actionGroup>
652637
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
653638
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
654639
</actionGroup>
@@ -680,7 +665,6 @@
680665
</actionGroup>
681666
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage1">
682667
<argument name="page" value="MapOnStage"/>
683-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
684668
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
685669
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
686670
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -731,7 +715,6 @@
731715
</actionGroup>
732716
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
733717
<argument name="page" value="MapOnStage"/>
734-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
735718
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
736719
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
737720
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -902,9 +885,6 @@
902885
</actionGroup>
903886
<!-- Edit Panel: Verify Advanced Section -->
904887
<comment userInput="Edit Panel: Verify Advanced Section" stepKey="commentVerifyAdvancedSection"/>
905-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
906-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
907-
</actionGroup>
908888
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
909889
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
910890
</actionGroup>
@@ -938,7 +918,6 @@
938918
</actionGroup>
939919
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
940920
<argument name="page" value="MapOnStorefront"/>
941-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
942921
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
943922
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
944923
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -1090,9 +1069,6 @@
10901069
</actionGroup>
10911070
<!-- Update Advanced Section -->
10921071
<comment userInput="Update Advanced Section" stepKey="commentUpdateAdvancedSection"/>
1093-
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
1094-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
1095-
</actionGroup>
10961072
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
10971073
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
10981074
</actionGroup>
@@ -1134,7 +1110,6 @@
11341110
</actionGroup>
11351111
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage1">
11361112
<argument name="page" value="MapOnStage"/>
1137-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
11381113
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
11391114
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
11401115
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -1316,9 +1291,6 @@
13161291
</actionGroup>
13171292
<!-- Edit Panel: Verify Advanced Section -->
13181293
<comment userInput="Edit Panel: Verify Advanced Section" stepKey="commentVerifyAdvancedSection"/>
1319-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
1320-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
1321-
</actionGroup>
13221294
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
13231295
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
13241296
</actionGroup>
@@ -1355,7 +1327,6 @@
13551327
</actionGroup>
13561328
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
13571329
<argument name="page" value="MapOnStage"/>
1358-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
13591330
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
13601331
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
13611332
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -1537,9 +1508,6 @@
15371508
</actionGroup>
15381509
<!-- Edit Panel: Verify Advanced Section After Save -->
15391510
<comment userInput="Edit Panel: Verify Advanced Section After Save" stepKey="commentVerifyAdvancedSectionAfterSave"/>
1540-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
1541-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
1542-
</actionGroup>
15431511
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder2">
15441512
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
15451513
</actionGroup>
@@ -1574,7 +1542,6 @@
15741542
</actionGroup>
15751543
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
15761544
<argument name="page" value="MapOnStorefront"/>
1577-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
15781545
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
15791546
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
15801547
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_map_form.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,4 +297,7 @@
297297
</formElements>
298298
</field>
299299
</fieldset>
300+
<fieldset name="advanced">
301+
<field name="text_align" formElement="hidden"/>
302+
</fieldset>
300303
</form>

0 commit comments

Comments
 (0)