Skip to content

Commit 79abace

Browse files
hannahnidahannahnida
committed
#559: User sees no predefined gutters - Changed Default value for margins and paddings to empty, added new entity
1 parent 6ac23b1 commit 79abace

File tree

65 files changed

+212
-259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+212
-259
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
1919
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
2020
<argument name="cssClasses" defaultValue=""/>
21-
<argument name="margin" defaultValue="PageBuilderMarginsPropertyDefault"/>
22-
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
21+
<argument name="margin" defaultValue="PageBuilderMarginsProperty0"/>
22+
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>
2323
<argument name="index" defaultValue="1" type="string"/>
2424
</arguments>
2525
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForElementVisible"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWidthPercentageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<arguments>
1414
<argument name="page"/>
1515
<argument name="dividerWidth" defaultValue="PageBuilderDividerLineWidth_Default"/>
16-
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
16+
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>
1717
<argument name="border" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1818
<argument name="index" defaultValue="1" type="string"/>
1919
<!-- expectedOffset is necessary because divider width is equal to (expected width) + (line thickness attribute*2) in admin when rendered through Block -->

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingAdvancedConfigurationWithAllOptionsUpdatedActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthPropertyDefault"/>
2121
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
2222
<argument name="cssClasses" defaultValue=""/>
23-
<argument name="margin" defaultValue="PageBuilderMarginsPropertyDefault"/>
24-
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
23+
<argument name="margin" defaultValue="PageBuilderMarginsProperty0"/>
24+
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>
2525
<argument name="index" defaultValue="1" type="string"/>
2626
</arguments>
2727
<waitForElementVisible selector="{{page.baseByTagName(headingType.value, index)}}" stepKey="waitForElementVisible"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageAdvancedConfigurationWithNoAlignmentActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<argument name="border" defaultValue="PageBuilderAdvancedBorderPropertyNone"/>
1818
<argument name="borderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1919
<argument name="borderRadius" defaultValue="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
20-
<argument name="margin" defaultValue="PageBuilderMarginsPropertyDefault"/>
21-
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
20+
<argument name="margin" defaultValue="PageBuilderMarginsProperty0"/>
21+
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>
2222
</arguments>
2323
<assertEquals stepKey="assertAlignment">
2424
<expectedResult type="string">{{defaultAlignment.value}}</expectedResult>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ElementPositioningActionGroup/ValidateContentWidthEqualToContainerWidthActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<arguments>
1212
<argument name="content" type="string"/>
1313
<argument name="contentIndex" defaultValue="1" type="string"/>
14-
<argument name="contentMargins" defaultValue="PageBuilderMarginsPropertyDefault"/>
14+
<argument name="contentMargins" defaultValue="PageBuilderMarginsProperty0"/>
1515
<argument name="container" type="string"/>
1616
<argument name="containerBorder" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1717
<argument name="containerIndex" defaultValue="1" type="string"/>
18-
<argument name="containerPadding" defaultValue="PageBuilderPaddingPropertyDefault"/>
18+
<argument name="containerPadding" defaultValue="PageBuilderPaddingProperty0"/>
1919
<argument name="pixelBuffer" defaultValue="5" type="string"/>
2020
</arguments>
2121
<!-- Validate width of content and width of container are equal -->

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ElementPositioningActionGroup/ValidatePositionRightWithinContainerActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<actionGroup name="validatePositionRightWithinContainer">
1111
<arguments>
1212
<argument name="content" type="string"/>
13-
<argument name="contentMargins" defaultValue="PageBuilderMarginsPropertyDefault"/>
13+
<argument name="contentMargins" defaultValue="PageBuilderMarginsProperty0"/>
1414
<argument name="container" type="string"/>
1515
<argument name="containerBorder" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
16-
<argument name="containerPadding" defaultValue="PageBuilderPaddingPropertyDefault"/>
16+
<argument name="containerPadding" defaultValue="PageBuilderPaddingProperty0"/>
1717
<argument name="index" defaultValue="1" type="string"/>
1818
<argument name="pixelBuffer" defaultValue="5" type="string"/>
1919
</arguments>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightEqualToMinHeightPlusPaddingAndBorderActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<argument name="index" defaultValue="1" type="string"/>
1616
<argument name="borderWidth" defaultValue="{{PageBuilderAdvancedBorderWidthProperty0.value}}" type="string"/>
1717
<argument name="minHeight" defaultValue="{{PageBuilderMinHeightProperty_300px.intValue}}" type="string"/>
18-
<argument name="paddingTop" defaultValue="{{PageBuilderPaddingPropertyDefault.paddingTop}}" type="string"/>
19-
<argument name="paddingBottom" defaultValue="{{PageBuilderPaddingPropertyDefault.paddingBottom}}" type="string"/>
18+
<argument name="paddingTop" defaultValue="{{PageBuilderPaddingProperty0.paddingTop}}" type="string"/>
19+
<argument name="paddingBottom" defaultValue="{{PageBuilderPaddingProperty0.paddingBottom}}" type="string"/>
2020
<argument name="pixelBuffer" defaultValue="5" type="string"/>
2121
</arguments>
2222
<executeJS function="return document.querySelectorAll('{{content}}')[{{index}}-1].getBoundingClientRect().height-{{paddingTop}}-{{paddingBottom}}-({{borderWidth}}*2)" stepKey="actualContentHeight"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightGreaterThanMinHeightActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<argument name="index" defaultValue="1" type="string"/>
1414
<argument name="border" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1515
<argument name="height" defaultValue="PageBuilderMinHeightProperty_300"/>
16-
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
16+
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>
1717
</arguments>
1818
<executeJS function="return document.querySelectorAll('{{content}}')[{{index}}-1].getBoundingClientRect().height-{{padding.paddingTop}}-{{padding.paddingBottom}}-({{border.value}}*2)" stepKey="actualContentHeight"/>
1919
<assertGreaterThan stepKey="assertContentTypeHeightGreaterThanMinHeight">

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeWidthEqualToMaxWidthActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<argument name="index" defaultValue="1" type="string"/>
1414
<argument name="border" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1515
<argument name="width" defaultValue="PageBuilderVideoWidth_500"/>
16-
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
16+
<argument name="padding" defaultValue="PageBuilderPaddingProperty0"/>
1717
<argument name="pixelBuffer" defaultValue="5" type="string"/>
1818
</arguments>
1919
<executeJS function="return document.querySelectorAll('{{content}}')[{{index}}-1].getBoundingClientRect().width-{{padding.paddingLeft}}-{{padding.paddingRight}}-({{border.value}}*2)" stepKey="actualContentWidth"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonCollageActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<argument name="column"/>
1313
<argument name="columnIndex" defaultValue="1" type="string"/>
1414
<argument name="columnBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
15-
<argument name="columnPadding" defaultValue="PageBuilderPaddingPropertyDefault"/>
15+
<argument name="columnPadding" defaultValue="PageBuilderPaddingProperty0"/>
1616
<argument name="element"/>
1717
<argument name="elementIndex" defaultValue="1" type="string"/>
1818
<argument name="elementBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
19-
<argument name="elementPadding" defaultValue="PageBuilderPaddingPropertyDefault"/>
19+
<argument name="elementPadding" defaultValue="PageBuilderPaddingProperty0"/>
2020
<argument name="overlayPadding" defaultValue="PageBuilderPaddingPropertyOverlayDefault"/>
2121
<argument name="diffThreshold" defaultValue="0" type="string"/>
2222
</arguments>

0 commit comments

Comments
 (0)