Skip to content

Commit 93bf294

Browse files
bluemwhitewbluemwhitew
committed
Merge from 559_no-predefined-gutters--divider 
2 parents 2759639 + 1f4c491 commit 93bf294

File tree

9 files changed

+34
-27
lines changed

9 files changed

+34
-27
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="seeInMarginFieldsSlideOutPanel">
10+
<annotations>
11+
<description>Validates margin field contents.</description>
12+
</annotations>
1113
<arguments>
1214
<argument name="property" defaultValue=""/>
1315
</arguments>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="seeInPaddingFieldsSlideOutPanel">
10+
<annotations>
11+
<description>Validates padding field contents.</description>
12+
</annotations>
1113
<arguments>
1214
<argument name="property" defaultValue=""/>
1315
</arguments>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="ValidateAdvancedConfigurationAllOptionsActionGroup">
1110
<annotations>
12-
<description value="Validates styles from Advanced configuration in content type settings"/>
11+
<description>Validates styles from Advanced Configuration in content type settings.</description>
1312
</annotations>
1413
<arguments>
1514
<argument name="page" defaultValue=""/>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
1110
<annotations>
12-
<description value="Validate Advanced Configuration without Alignment, Css classes and Border"/>
11+
<description>Validate Advanced Configuration without Alignment, CSS Classes and Border</description>
1312
</annotations>
1413
<arguments>
1514
<argument name="page" defaultValue=""/>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
109
<actionGroup name="validateDividerWidthPercentage">
10+
<annotations>
11+
<description>Validates the width of a Divider content type by comparing it against its container.</description>
12+
</annotations>
1113
<arguments>
1214
<argument name="page"/>
1315
<argument name="dividerWidth" defaultValue="PageBuilderDividerLineWidth_Default"/>
14-
<argument name="padding" defaultValue="PageBuilderPaddingProperty10"/>
16+
<argument name="padding" defaultValue="PageBuilderPaddingPropertyDefault"/>
1517
<argument name="border" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
1618
<argument name="index" defaultValue="1" type="string"/>
1719
<!-- 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/Section/PageBuilderEditFormSection/AdvancedFormSection.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
109
<section name="AdvancedForm">
1110
<element name="sectionName" type="button" selector="//div[@data-index='advanced']"/>
1211
<element name="sectionExpanded" type="button" selector="//div[@data-index='advanced' and contains(@class,'_show')]"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderDividerThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
109
<test name="BlockRenderDividerThroughBlockContentTypeTest">
1110
<annotations>
1211
<features value="PageBuilder"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerValidateAdvancedConfigurationDefaultValuesTest.xml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
109
<test name="DividerValidateAdvancedConfigurationDefaultValuesTest">
1110
<annotations>
1211
<features value="PageBuilder"/>
@@ -39,6 +38,7 @@
3938
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
4039
<argument name="contentType" value="PageBuilderDividerContentType"/>
4140
</actionGroup>
41+
4242
<!-- Validate Default Values -->
4343
<comment userInput="Validate Default Values" stepKey="CommentValidateDefaultValues"/>
4444
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment">
@@ -62,32 +62,35 @@
6262
<actualResult type="variable">getCssClasses</actualResult>
6363
</assertEmpty>
6464
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
65-
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
65+
<!-- @todo: Update `PageBuilderMarginsPropertyDefault` with (Default) Empty Values -->
66+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
6667
</actionGroup>
6768
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
68-
<argument name="property" value="PageBuilderPaddingProperty10"/>
69+
<!-- @todo: Update `PageBuilderPaddingPropertyDefault` with (Default) Empty Values -->
70+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
6971
</actionGroup>
7072
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
73+
7174
<!-- Validate Stage -->
7275
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
7376
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStage">
7477
<argument name="page" value="DividerOnStage"/>
75-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
7678
<argument name="index" value="1"/>
7779
</actionGroup>
7880
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
7981
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
8082
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
83+
8184
<!-- Validate Stage After Save -->
8285
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
8386
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStage2">
8487
<argument name="page" value="DividerOnStage"/>
85-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
8688
<argument name="index" value="1"/>
8789
</actionGroup>
8890
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
8991
<argument name="contentType" value="PageBuilderDividerContentType"/>
9092
</actionGroup>
93+
9194
<!-- Validate Edit Panel After Save -->
9295
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
9396
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
@@ -111,20 +114,22 @@
111114
<actualResult type="variable">getCssClasses2</actualResult>
112115
</assertEmpty>
113116
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins2">
114-
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
117+
<!-- @todo: Update `PageBuilderMarginsPropertyDefault` with (Default) Empty Values -->
118+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
115119
</actionGroup>
116120
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding2">
117-
<argument name="property" value="PageBuilderPaddingProperty10"/>
121+
<!-- @todo: Update `PageBuilderPaddingPropertyDefault` with (Default) Empty Values -->
122+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
118123
</actionGroup>
119124
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
120125
<argument name="contentType" value="PageBuilderDividerContentType"/>
121126
</actionGroup>
127+
122128
<!-- Validate Storefront -->
123129
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
124130
<actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStorefront">
125131
<argument name="page" value="DividerOnStorefront"/>
126132
<argument name="defaultAlignment" value="PageBuilderAdvancedAlignmentPropertyStart"/>
127-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
128133
<argument name="index" value="1"/>
129134
</actionGroup>
130135
</test>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<field name="margins_and_padding">
139139
<argument name="data" xsi:type="array">
140140
<item name="config" xsi:type="array">
141-
<item name="default" xsi:type="string">{"margin":{"bottom":"0","left":"0","right":"0","top":"0"},"padding":{"bottom":"10","left":"10","right":"10","top":"10"}}</item>
141+
<item name="default" xsi:type="null" />
142142
</item>
143143
</argument>
144144
</field>

0 commit comments

Comments
 (0)