Skip to content

Commit caa10bb

Browse files
author
Hwashiang Yu
committed
MC-13925: Hard Coded Margins On individual Button
- Cleaned up test implementation
1 parent f773fa9 commit caa10bb

File tree

3 files changed

+31
-21
lines changed

3 files changed

+31
-21
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,16 @@
167167
<expectedResult type="variable">button2Width</expectedResult>
168168
</assertNotEquals>
169169
</actionGroup>
170+
<actionGroup name="validateButtonItemsDefaultMargin">
171+
<arguments>
172+
<argument name="buttonItemPage"/>
173+
<argument name="buttonIndex" defaultValue="1" type="string"/>
174+
</arguments>
175+
<comment userInput="Validate default margin" stepKey="comment"/>
176+
<executeJS function="return window.getComputedStyle({{buttonItemPage.jsButtonSelector(buttonIndex)}}).margin" stepKey="getDefaultMarginValueStage"/>
177+
<assertEquals stepKey="checkDefaultMarginValueStage">
178+
<expectedResult type="string">{{PageBuilderMarginPropertyButtonItemDefault.value}}</expectedResult>
179+
<actualResult type="variable">getDefaultMarginValueStage</actualResult>
180+
</assertEquals>
181+
</actionGroup>
170182
</actionGroups>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,16 @@
328328
<data key="marginBottom">0</data>
329329
<data key="marginLeft">0</data>
330330
</entity>
331+
<entity name="PageBuilderMarginPropertyButtonItemDefault" type="pagebuilder_margins_property">
332+
<data key="name">Margins and Padding</data>
333+
<data key="section">advanced</data>
334+
<data key="fieldName">margins_and_padding</data>
335+
<data key="value">0px 10px 10px 0px</data>
336+
<data key="marginTop">0</data>
337+
<data key="marginRight">10</data>
338+
<data key="marginBottom">10</data>
339+
<data key="marginLeft">0</data>
340+
</entity>
331341
<entity name="PageBuilderMarginsProperty_Empty" type="pagebuilder_margins_property">
332342
<data key="name">Margins and Padding</data>
333343
<data key="section">advanced</data>

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

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -650,13 +650,9 @@
650650
<seeElement selector="{{ButtonItemOnStage.noBorderWidth('1')}}" stepKey="seeNoBorderWidthStage"/>
651651
<seeElement selector="{{ButtonItemOnStage.noBorderRadius('1')}}" stepKey="seeNoBorderRadiusStage"/>
652652
<seeElement selector="{{ButtonItemOnStage.noMargins('1')}}" stepKey="seeNoMarginsStage"/>
653-
<!-- Validate default margin -->
654-
<comment userInput="Validate default margin" stepKey="commentDefaultMarginStage"/>
655-
<executeJS function="return window.getComputedStyle({{ButtonItemOnStage.jsButtonSelector('1')}}).margin" stepKey="getDefaultMarginValueStage"/>
656-
<assertEquals stepKey="checkDefaultMarginValueStage">
657-
<expectedResult type="string">0px 10px 10px 0px</expectedResult>
658-
<actualResult type="variable">getDefaultMarginValueStage</actualResult>
659-
</assertEquals>
653+
<actionGroup ref="validateButtonItemsDefaultMargin" stepKey="validateDefaultMarginValueStage">
654+
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
655+
</actionGroup>
660656
<seeElement selector="{{ButtonItemOnStage.noPadding('1')}}" stepKey="seeNoPaddingStage"/>
661657
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
662658
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
@@ -668,13 +664,9 @@
668664
<seeElement selector="{{ButtonItemOnStage.noBorderWidth('1')}}" stepKey="seeNoBorderWidthStage2"/>
669665
<seeElement selector="{{ButtonItemOnStage.noBorderRadius('1')}}" stepKey="seeNoBorderRadiusStage2"/>
670666
<seeElement selector="{{ButtonItemOnStage.noMargins('1')}}" stepKey="seeNoMarginsStage2"/>
671-
<!-- Validate default margin After Save -->
672-
<comment userInput="Validate default margin After Save" stepKey="commentDefaultMarginStage2"/>
673-
<executeJS function="return window.getComputedStyle({{ButtonItemOnStage.jsButtonSelector('1')}}).margin" stepKey="getDefaultMarginValueStage2"/>
674-
<assertEquals stepKey="checkDefaultMarginValueStage2">
675-
<expectedResult type="string">0px 10px 10px 0px</expectedResult>
676-
<actualResult type="variable">getDefaultMarginValueStage2</actualResult>
677-
</assertEquals>
667+
<actionGroup ref="validateButtonItemsDefaultMargin" stepKey="validateDefaultMarginValueStage2">
668+
<argument name="buttonItemPage" value="ButtonItemOnStage"/>
669+
</actionGroup>
678670
<seeElement selector="{{ButtonItemOnStage.noPadding('1')}}" stepKey="seeNoPaddingStage2"/>
679671
<!-- Validate Edit Panel After Save -->
680672
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
@@ -717,13 +709,9 @@
717709
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.noBorderWidth('1')}}" stepKey="seeNoBorderWidthStorefront"/>
718710
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.noBorderRadius('1')}}" stepKey="seeNoBorderRadiusStorefront"/>
719711
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.noMargins('1')}}" stepKey="seeNoMarginsStorefront"/>
720-
<!-- Validate default margin Storefront -->
721-
<comment userInput="Validate default margin Storefront" stepKey="commentDefaultMarginStorefront"/>
722-
<executeJS function="return window.getComputedStyle({{ButtonItemOnStorefrontEmptyLink.jsButtonSelector('1')}}).margin" stepKey="getDefaultMarginValueStorefront"/>
723-
<assertEquals stepKey="checkDefaultMarginValueStorefront">
724-
<expectedResult type="string">0px 10px 10px 0px</expectedResult>
725-
<actualResult type="variable">getDefaultMarginValueStorefront</actualResult>
726-
</assertEquals>
712+
<actionGroup ref="validateButtonItemsDefaultMargin" stepKey="validateDefaultMarginValueStorefront">
713+
<argument name="buttonItemPage" value="ButtonItemOnStorefrontEmptyLink"/>
714+
</actionGroup>
727715
<seeElement selector="{{ButtonItemOnStorefrontEmptyLink.noPadding('1')}}" stepKey="seeNoPaddingStorefront"/>
728716
</test>
729717
<test name="ButtonItemUpdateAdvancedConfigurationValues">

0 commit comments

Comments
 (0)