Skip to content

Commit 2f1841f

Browse files
dhaeckerdhaecker
committed
MC-3681: Make Button Text Centered By Default
- Updating button adv config test default alignment - Adding supporting selectors
1 parent 081c694 commit 2f1841f

File tree

2 files changed

+47
-18
lines changed

2 files changed

+47
-18
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,19 @@
6969
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
7070
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][not(contains(@style,'text-align:'))]" parameterized="true"/>
7171
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
72+
<element name="noBorder" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][not(contains(@style,'border-style:'))]" parameterized="true"/>
7273
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
7374
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][not(contains(@style,'border-color:'))]" parameterized="true"/>
7475
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
76+
<element name="noBorderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][not(contains(@style,'border-width:'))]" parameterized="true"/>
7577
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
78+
<element name="noBorderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][not(contains(@style,'border-radius:'))]" parameterized="true"/>
7679
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}][contains(@class,'{{arg2}}')]//a[contains(@class,'pagebuilder-button')]" parameterized="true"/>
7780
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')]" parameterized="true"/>
7881
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
82+
<element name="noMargins" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][not(contains(@style,'margin:'))]" parameterized="true"/>
7983
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
84+
<element name="noPadding" type="text" selector="(//div[contains(@class,'pagebuilder-button-item')])[{{arg1}}]//a[contains(@class,'pagebuilder-button')][not(contains(@style,'padding:'))]" parameterized="true"/>
8085
</section>
8186
<section name="ButtonItemOnStorefront">
8287
<element name="all" type="button" selector="[data-role='button-item']"/>
@@ -94,13 +99,18 @@
9499
<element name="alignment" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
95100
<element name="noAlignment" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@style,'text-align:'))]" parameterized="true"/>
96101
<element name="border" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
102+
<element name="noBorder" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@style,'border-style:'))]" parameterized="true"/>
97103
<element name="borderColor" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
98104
<element name="noBorderColor" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@style,'border-color:'))]" parameterized="true"/>
99105
<element name="borderWidth" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
106+
<element name="noBorderWidth" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@style,'border-width:'))]" parameterized="true"/>
100107
<element name="borderRadius" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
108+
<element name="noBorderRadius" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@style,'border-radius:'))]" parameterized="true"/>
101109
<element name="cssClasses" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}][contains(@class,'{{arg2}}')]//a" parameterized="true"/>
102110
<element name="noCssClasses" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]" parameterized="true"/>
103111
<element name="margins" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
112+
<element name="noMargins" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@style,'margin:'))]" parameterized="true"/>
104113
<element name="padding" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
114+
<element name="noPadding" type="text" selector="(//div[@data-role='button-item'])[{{arg1}}]//a[not(contains(@style,'padding:'))]" parameterized="true"/>
105115
</section>
106116
</sections>

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

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@
609609
</actionGroup>
610610
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
611611
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
612-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
612+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
613613
</actionGroup>
614614
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
615615
<argument name="property" value="PageBuilderAdvancedBorderPropertyDefault"/>
@@ -635,48 +635,67 @@
635635
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
636636
<!-- Validate Stage -->
637637
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
638-
<waitForElementVisible selector="{{ButtonItemOnStage.defaultStyle('1')}}" stepKey="waitForButtonItemStage1"/>
638+
<seeElement selector="{{ButtonItemOnStage.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
639+
<seeElement selector="{{ButtonItemOnStage.noBorder('1')}}" stepKey="seeNoBorderStage"/>
640+
<seeElement selector="{{ButtonItemOnStage.noBorderColor('1')}}" stepKey="seeNoBorderColorStage"/>
641+
<seeElement selector="{{ButtonItemOnStage.noBorderWidth('1')}}" stepKey="seeNoBorderWidthStage"/>
642+
<seeElement selector="{{ButtonItemOnStage.noBorderRadius('1')}}" stepKey="seeNoBorderRadiusStage"/>
643+
<seeElement selector="{{ButtonItemOnStage.noMargins('1')}}" stepKey="seeNoMarginsStage"/>
644+
<seeElement selector="{{ButtonItemOnStage.noPadding('1')}}" stepKey="seeNoPaddingStage"/>
639645
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
640646
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
641647
<!-- Validate Stage After Save -->
642648
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
643-
<waitForElementVisible selector="{{ButtonItemOnStage.defaultStyle('1')}}" stepKey="waitForButtonItemStage2"/>
649+
<seeElement selector="{{ButtonItemOnStage.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
650+
<seeElement selector="{{ButtonItemOnStage.noBorder('1')}}" stepKey="seeNoBorderStage2"/>
651+
<seeElement selector="{{ButtonItemOnStage.noBorderColor('1')}}" stepKey="seeNoBorderColorStage2"/>
652+
<seeElement selector="{{ButtonItemOnStage.noBorderWidth('1')}}" stepKey="seeNoBorderWidthStage2"/>
653+
<seeElement selector="{{ButtonItemOnStage.noBorderRadius('1')}}" stepKey="seeNoBorderRadiusStage2"/>
654+
<seeElement selector="{{ButtonItemOnStage.noMargins('1')}}" stepKey="seeNoMarginsStage2"/>
655+
<seeElement selector="{{ButtonItemOnStage.noPadding('1')}}" stepKey="seeNoPaddingStage2"/>
644656
<!-- Validate Edit Panel After Save -->
645657
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
646-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
647-
<argument name="contentType" value="PageBuilderButtonsContentType"/>
658+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage2">
659+
<argument name="section" value="ButtonItemOnStage"/>
660+
<argument name="targetIndex" value="1"/>
648661
</actionGroup>
649662
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
650663
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
651-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
664+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
652665
</actionGroup>
653666
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder2">
654-
<argument name="property" value="PageBuilderAdvancedBorderPropertyNone"/>
667+
<argument name="property" value="PageBuilderAdvancedBorderPropertyDefault"/>
655668
</actionGroup>
656669
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderColor2">
657670
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_Empty"/>
658671
</actionGroup>
659672
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderWidth2">
660-
<argument name="property" value="PageBuilderAdvancedBorderWidthPropertyDefault"/>
673+
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_Empty"/>
661674
</actionGroup>
662675
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateBorderRadius2">
663-
<argument name="property" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
676+
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty_Empty"/>
664677
</actionGroup>
665678
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateCssClasses2">
666679
<argument name="property" value="PageBuilderAdvancedCssClassesProperty_Empty"/>
667680
</actionGroup>
668681
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins2">
669-
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
682+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
670683
</actionGroup>
671684
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding2">
672-
<argument name="property" value="PageBuilderPaddingPropertyButtons"/>
685+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
673686
</actionGroup>
674687
<!-- Validate Storefront -->
675688
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
676689
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
677690
<argument name="contentType" value="PageBuilderButtonsContentType"/>
678691
</actionGroup>
679-
<waitForElementVisible selector="{{ButtonItemOnStorefront.defaultStyle('1')}}" stepKey="waitForButtonItemStorefront"/>
692+
<seeElement selector="{{ButtonItemOnStorefront.alignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStorefront"/>
693+
<seeElement selector="{{ButtonItemOnStorefront.noBorder('1')}}" stepKey="seeNoBorderStorefront"/>
694+
<seeElement selector="{{ButtonItemOnStorefront.noBorderColor('1')}}" stepKey="seeNoBorderColorStorefront"/>
695+
<seeElement selector="{{ButtonItemOnStorefront.noBorderWidth('1')}}" stepKey="seeNoBorderWidthStorefront"/>
696+
<seeElement selector="{{ButtonItemOnStorefront.noBorderRadius('1')}}" stepKey="seeNoBorderRadiusStorefront"/>
697+
<seeElement selector="{{ButtonItemOnStorefront.noMargins('1')}}" stepKey="seeNoMarginsStorefront"/>
698+
<seeElement selector="{{ButtonItemOnStorefront.noPadding('1')}}" stepKey="seeNoPaddingStorefront"/>
680699
</test>
681700
<test name="ButtonItemUpdateAdvancedConfigurationValues">
682701
<annotations>
@@ -718,7 +737,7 @@
718737
<!-- Update Values -->
719738
<comment userInput="Update Values" stepKey="commentUpdateValues"/>
720739
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAlignment">
721-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
740+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyLeft"/>
722741
</actionGroup>
723742
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
724743
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
@@ -746,7 +765,7 @@
746765
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
747766
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage">
748767
<argument name="page" value="ButtonItemOnStage"/>
749-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
768+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyLeft"/>
750769
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
751770
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
752771
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -764,7 +783,7 @@
764783
</actionGroup>
765784
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
766785
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
767-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
786+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyLeft"/>
768787
</actionGroup>
769788
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder">
770789
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
@@ -794,7 +813,7 @@
794813
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
795814
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStage2">
796815
<argument name="page" value="ButtonItemOnStage"/>
797-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
816+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyLeft"/>
798817
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
799818
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
800819
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
@@ -812,7 +831,7 @@
812831
<!-- Validate Edit Panel After Save -->
813832
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
814833
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
815-
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
834+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyLeft"/>
816835
</actionGroup>
817836
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBorder2">
818837
<argument name="property" value="PageBuilderAdvancedBorderPropertyDouble"/>
@@ -842,7 +861,7 @@
842861
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
843862
<actionGroup ref="validateAdvancedStyleWithAllUpdated" stepKey="validateAllAdvancedStorefront">
844863
<argument name="page" value="ButtonItemOnStorefront"/>
845-
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
864+
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyLeft"/>
846865
<argument name="border" value="PageBuilderAdvancedBorderPropertyDouble"/>
847866
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
848867
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>

0 commit comments

Comments
 (0)