Merge from 559_no-predefined-gutters--products

Author: bluemwhitew

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAdvancedConfigurationDefaultValuesTest.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminPageBuilderProductsCarouselValidateAdvancedConfigurationDefaultValuesTest" extends="ProductsValidateAdvancedConfigurationDefaultValuesTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Products"/>
+            <title value="Validate Advanced Configuration Default Values for Product (Carousel)"/>
+            <description value="Validates the default values for every attribute in the Advanced form and on Stage for Product Carousel."/>
+            <severity value="BLOCKER"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-products"/>
+            <group value="pagebuilder-productsCarousel"/>
+        </annotations>
+        <!-- Select Product Carousel Appearance -->
+        <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance" after="openEditAfterDrop">
+            <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
+        </actionGroup>
+        <actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStage">
+            <argument name="page" value="ProductsCarouselOnStage"/>
+            <argument name="index" value="1"/>
+        </actionGroup>
+        <actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStage2">
+            <argument name="page" value="ProductsCarouselOnStage"/>
+            <argument name="index" value="1"/>
+        </actionGroup>
+    </test>
+</tests>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsValidateAdvancedConfigurationDefaultValuesTest.xml

@@ -5,14 +5,13 @@
   * See COPYING.txt for license details.
   */
 -->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ProductsValidateAdvancedConfigurationDefaultValuesTest">
         <annotations>
             <features value="PageBuilder"/>
             <stories value="Products"/>
-            <title value="Validate Advanced Configuration Default Values"/>
-            <description value="Validate the default values for every attribute in the Advanced Configuration form and on Stage for Product List."/>
+            <title value="Validate Advanced Configuration Default Values for Product (List)"/>
+            <description value="Validates the default values for every attribute in the Advanced form and on Stage for Product List."/>
             <severity value="BLOCKER"/>
             <useCaseId value="MAGETWO-71425"/>
             <testCaseId value="MC-2500"/>
@@ -77,10 +76,12 @@
         <comment userInput="removing step" stepKey="getCssClasses"/>
         <comment userInput="removing step" stepKey="assertCssClasses"/>
         <actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins">
-            <argument name="property" value="PageBuilderMarginsPropertyDefault"/>
+            <!-- @todo: Update `PageBuilderMarginsPropertyDefault` with (Default) Empty Values -->
+            <argument name="property" value="PageBuilderMarginsProperty_Empty"/>
         </actionGroup>
         <actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
-            <argument name="property" value="PageBuilderPaddingPropertyDefault"/>
+            <!-- @todo: Update `PageBuilderPaddingPropertyDefault` with (Default) Empty Values -->
+            <argument name="property" value="PageBuilderPaddingProperty_Empty"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <!-- Validate Stage -->
@@ -126,10 +127,12 @@
         <comment userInput="removing step" stepKey="getCssClasses2"/>
         <comment userInput="removing step" stepKey="assertCssClasses2"/>
         <actionGroup ref="seeInMarginFieldsSlideOutPanel" stepKey="validateMargins2">
-            <argument name="property" value="PageBuilderMarginsPropertyDefault"/>
+            <!-- @todo: Update `PageBuilderMarginsPropertyDefault` with (Default) Empty Values -->
+            <argument name="property" value="PageBuilderMarginsProperty_Empty"/>
         </actionGroup>
         <actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding2">
-            <argument name="property" value="PageBuilderPaddingPropertyDefault"/>
+            <!-- @todo: Update `PageBuilderPaddingPropertyDefault` with (Default) Empty Values -->
+            <argument name="property" value="PageBuilderPaddingProperty_Empty"/>
         </actionGroup>
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
             <argument name="contentType" value="PageBuilderProductsContentType"/>

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

@@ -32,6 +32,15 @@
             </settings>
         </dataProvider>
     </dataSource>
+    <fieldset name="advanced">
+        <field name="margins_and_padding">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="default" xsi:type="null" />
+                </item>
+            </argument>
+        </field>
+    </fieldset>
     <fieldset name="appearance_fieldset" sortOrder="10" component="Magento_PageBuilder/js/form/element/dependent-fieldset">
         <settings>
             <label translate="true">Appearance</label>