Skip to content

Commit 8502ac0

Browse files
author
Hwashiang Yu
committed
MC-4075: Alignment attribute not working as expected for product, map, divider, video
- Removed changes to map alignment
1 parent c5e6dbb commit 8502ac0

File tree

3 files changed

+41
-35
lines changed

3 files changed

+41
-35
lines changed

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -406,27 +406,6 @@
406406
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
407407
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
408408
</actionGroup>
409-
<actionGroup name="validateAdvancedStyleWithAllUpdatedWithNoAlignment">
410-
<arguments>
411-
<argument name="page" defaultValue=""/>
412-
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
413-
<argument name="borderColor" defaultValue=""/>
414-
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
415-
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
416-
<argument name="cssClasses" defaultValue=""/>
417-
<argument name="margin" defaultValue="PageBuilderMarginsPropertyDefault"/>
418-
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
419-
<argument name="index" defaultValue="1" type="string"/>
420-
</arguments>
421-
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForElementVisible"/>
422-
<waitForElementVisible selector="{{page.border(index, border.value)}}" stepKey="waitForBorderVisible"/>
423-
<waitForElementVisible selector="{{page.borderColor(index, borderColor.rgb)}}" stepKey="waitForBorderColorVisible"/>
424-
<waitForElementVisible selector="{{page.borderWidth(index, borderWidth.value)}}" stepKey="waitForBorderWidthVisible"/>
425-
<waitForElementVisible selector="{{page.borderRadius(index, borderRadius.value)}}" stepKey="waitForBorderRadiusVisible"/>
426-
<waitForElementVisible selector="{{page.cssClasses(index, cssClasses.value)}}" stepKey="waitForCSSClassesVisible"/>
427-
<waitForElementVisible selector="{{page.margins(index, margin.value)}}" stepKey="waitForMarginVisible"/>
428-
<waitForElementVisible selector="{{page.padding(index, padding.value)}}" stepKey="waitForPaddingVisible"/>
429-
</actionGroup>
430409
<actionGroup name="validateAdvancedStyleWithAllUpdatedNotVisible">
431410
<arguments>
432411
<argument name="page" defaultValue=""/>

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

Lines changed: 41 additions & 11 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="validateSlideOutPanelFieldNotPresent" stepKey="validateNoAlignmentField">
255+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignmentField">
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="validateSlideOutPanelFieldNotPresent" stepKey="validateNoAlignment2">
307+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
308308
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
309309
</actionGroup>
310310
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder2">
@@ -381,6 +381,9 @@
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>
384387
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
385388
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
386389
</actionGroup>
@@ -405,8 +408,9 @@
405408
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
406409
<!-- Validate Stage -->
407410
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
408-
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage">
411+
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage">
409412
<argument name="page" value="MapOnStage"/>
413+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
410414
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
411415
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
412416
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -421,6 +425,9 @@
421425
</actionGroup>
422426
<!-- Validate Edit Panel -->
423427
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
428+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
429+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
430+
</actionGroup>
424431
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
425432
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
426433
</actionGroup>
@@ -447,8 +454,9 @@
447454
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
448455
<!-- Validate Stage After Save -->
449456
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
450-
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage2">
457+
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
451458
<argument name="page" value="MapOnStage"/>
459+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
452460
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
453461
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
454462
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -463,6 +471,9 @@
463471
</actionGroup>
464472
<!-- Validate Edit Panel After Save -->
465473
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
474+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
475+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
476+
</actionGroup>
466477
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder2">
467478
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
468479
</actionGroup>
@@ -489,8 +500,9 @@
489500
</actionGroup>
490501
<!-- Validate Storefront -->
491502
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
492-
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStorefront">
503+
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
493504
<argument name="page" value="MapOnStorefront"/>
505+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
494506
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
495507
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
496508
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -634,6 +646,9 @@
634646
</actionGroup>
635647
<!-- Update Advanced Section -->
636648
<comment userInput="Update Advanced Section" stepKey="commentUpdateAdvancedSection"/>
649+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
650+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
651+
</actionGroup>
637652
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
638653
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
639654
</actionGroup>
@@ -663,8 +678,9 @@
663678
<argument name="height" value="PageBuilderMapHeightProperty350"/>
664679
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
665680
</actionGroup>
666-
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage1">
681+
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage1">
667682
<argument name="page" value="MapOnStage"/>
683+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
668684
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
669685
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
670686
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -713,8 +729,9 @@
713729
<argument name="height" value="PageBuilderMapHeightProperty350"/>
714730
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
715731
</actionGroup>
716-
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage2">
732+
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
717733
<argument name="page" value="MapOnStage"/>
734+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
718735
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
719736
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
720737
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -885,6 +902,9 @@
885902
</actionGroup>
886903
<!-- Edit Panel: Verify Advanced Section -->
887904
<comment userInput="Edit Panel: Verify Advanced Section" stepKey="commentVerifyAdvancedSection"/>
905+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
906+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
907+
</actionGroup>
888908
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
889909
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
890910
</actionGroup>
@@ -916,8 +936,9 @@
916936
<argument name="height" value="PageBuilderMapHeightProperty350"/>
917937
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
918938
</actionGroup>
919-
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStorefront">
939+
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
920940
<argument name="page" value="MapOnStorefront"/>
941+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
921942
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
922943
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
923944
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -1069,6 +1090,9 @@
10691090
</actionGroup>
10701091
<!-- Update Advanced Section -->
10711092
<comment userInput="Update Advanced Section" stepKey="commentUpdateAdvancedSection"/>
1093+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignmentCenter">
1094+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
1095+
</actionGroup>
10721096
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
10731097
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
10741098
</actionGroup>
@@ -1108,8 +1132,9 @@
11081132
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
11091133
<argument name="index" value="2"/>
11101134
</actionGroup>
1111-
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage1">
1135+
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage1">
11121136
<argument name="page" value="MapOnStage"/>
1137+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
11131138
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
11141139
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
11151140
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -1291,6 +1316,9 @@
12911316
</actionGroup>
12921317
<!-- Edit Panel: Verify Advanced Section -->
12931318
<comment userInput="Edit Panel: Verify Advanced Section" stepKey="commentVerifyAdvancedSection"/>
1319+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
1320+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
1321+
</actionGroup>
12941322
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
12951323
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
12961324
</actionGroup>
@@ -1325,8 +1353,9 @@
13251353
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
13261354
<argument name="index" value="2"/>
13271355
</actionGroup>
1328-
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStage2">
1356+
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
13291357
<argument name="page" value="MapOnStage"/>
1358+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
13301359
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
13311360
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
13321361
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -1540,8 +1569,9 @@
15401569
<argument name="showControls" value="PageBuilderMapShowControls_False"/>
15411570
<argument name="index" value="2"/>
15421571
</actionGroup>
1543-
<actionGroup ref="validateAdvancedStyleWithAllUpdatedWithNoAlignment" stepKey="validateAllAdvancedStorefront">
1572+
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
15441573
<argument name="page" value="MapOnStorefront"/>
1574+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
15451575
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
15461576
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
15471577
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>

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

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

0 commit comments

Comments
 (0)