Skip to content

Commit 55afd84

Browse files
committed
Merge from 559_no-predefined-gutters--video
2 parents b66b864 + 47d3552 commit 55afd84

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAdvancedConfigurationDefaultValuesTest.xml

Lines changed: 9 additions & 6 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="VideoValidateAdvancedConfigurationDefaultValuesTest">
1110
<annotations>
1211
<features value="PageBuilder"/>
@@ -65,10 +64,12 @@
6564
<actualResult type="variable">getCssClasses</actualResult>
6665
</assertEmpty>
6766
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
68-
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
67+
<!-- @todo: Update `PageBuilderMarginsPropertyDefault` with (Default) Empty Values -->
68+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
6969
</actionGroup>
7070
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
71-
<argument name="property" value="PageBuilderPaddingPropertyDefault"/>
71+
<!-- @todo: Update `PageBuilderPaddingPropertyDefault` with (Default) Empty Values -->
72+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
7273
</actionGroup>
7374
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
7475
<!-- Validate Stage -->
@@ -112,10 +113,12 @@
112113
<actualResult type="variable">getCssClasses2</actualResult>
113114
</assertEmpty>
114115
<actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins2">
115-
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
116+
<!-- @todo: Update `PageBuilderMarginsPropertyDefault` with (Default) Empty Values -->
117+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
116118
</actionGroup>
117119
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding2">
118-
<argument name="property" value="PageBuilderPaddingPropertyDefault"/>
120+
<!-- @todo: Update `PageBuilderPaddingPropertyDefault` with (Default) Empty Values -->
121+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
119122
</actionGroup>
120123
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
121124
<argument name="contentType" value="PageBuilderVideoContentType"/>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_video_form.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@
3131
</settings>
3232
</dataProvider>
3333
</dataSource>
34+
<fieldset name="advanced">
35+
<field name="margins_and_padding">
36+
<argument name="data" xsi:type="array">
37+
<item name="config" xsi:type="array">
38+
<item name="default" xsi:type="null" />
39+
</item>
40+
</argument>
41+
</field>
42+
</fieldset>
3443
<fieldset name="appearance_fieldset" sortOrder="10" component="Magento_PageBuilder/js/form/element/dependent-fieldset">
3544
<settings>
3645
<label translate="true">Appearance</label>

0 commit comments

Comments
 (0)