Skip to content

Commit 7df8f56

Browse files
author
Hwashiang Yu
committed
MC-4075: Alignment attribute not working as expected for product, map, divider, video
- Updated video and divider configuration to fix alignment issue - Updated video test to add coverage for video alignment
1 parent 9a9a039 commit 7df8f56

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/VideoData.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,17 @@
5050
<data key="fieldName">max_width</data>
5151
<data key="value">500</data>
5252
</entity>
53+
<!-- Advanced -->
54+
<entity name="PageBuilderVideoAdvancedAlignmentPropertyRight" type="pagebuilder_video_advanced_alignment_property">
55+
<data key="name">Alignment</data>
56+
<data key="section">advanced</data>
57+
<data key="fieldName">text_align</data>
58+
<data key="value">flex-end</data>
59+
</entity>
60+
<entity name="PageBuilderVideoAdvancedAlignmentPropertyLeft" type="pagebuilder_video_advanced_alignment_property">
61+
<data key="name">Alignment</data>
62+
<data key="section">advanced</data>
63+
<data key="fieldName">text_align</data>
64+
<data key="value">flex-start</data>
65+
</entity>
5366
</entities>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@
390390
<testCaseId value="MC-2667"/>
391391
<group value="pagebuilder"/>
392392
<group value="pagebuilder-video"/>
393+
<group value="m"/>
393394
</annotations>
394395
<before>
395396
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -414,7 +415,7 @@
414415
<!-- Update Values -->
415416
<comment userInput="Update Values" stepKey="commentUpdateValues"/>
416417
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
417-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
418+
<argument name="property" value="PageBuilderVideoAdvancedAlignmentPropertyRight"/>
418419
</actionGroup>
419420
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
420421
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
@@ -442,7 +443,7 @@
442443
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
443444
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage">
444445
<argument name="page" value="VideoOnStage"/>
445-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
446+
<argument name="alignment" value="PageBuilderVideoAdvancedAlignmentPropertyRight"/>
446447
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
447448
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
448449
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -458,7 +459,7 @@
458459
<!-- Validate Edit Panel -->
459460
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
460461
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
461-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
462+
<argument name="property" value="PageBuilderVideoAdvancedAlignmentPropertyRight"/>
462463
</actionGroup>
463464
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
464465
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
@@ -488,7 +489,7 @@
488489
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
489490
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
490491
<argument name="page" value="VideoOnStage"/>
491-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
492+
<argument name="alignment" value="PageBuilderVideoAdvancedAlignmentPropertyRight"/>
492493
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
493494
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
494495
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -504,7 +505,7 @@
504505
<!-- Validate Edit Panel After Save -->
505506
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
506507
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
507-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
508+
<argument name="property" value="PageBuilderVideoAdvancedAlignmentPropertyRight"/>
508509
</actionGroup>
509510
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder2">
510511
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
@@ -534,7 +535,7 @@
534535
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
535536
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
536537
<argument name="page" value="VideoOnStorefront"/>
537-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
538+
<argument name="alignment" value="PageBuilderVideoAdvancedAlignmentPropertyRight"/>
538539
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
539540
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
540541
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>

app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/divider.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<style name="line_width" source="width"/>
4040
<style name="line_thickness" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
4141
<style name="line_color" source="border_color"/>
42+
<static_style source="display" value="inline-block"/>
4243
</element>
4344
</elements>
4445
</appearance>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_video_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
</field>
9797
</fieldset>
9898
<fieldset name="advanced">
99-
<field name="text_align">
99+
<field name="text_align" formElement="select">
100100
<formElements>
101101
<select>
102102
<settings>

0 commit comments

Comments
 (0)