Merge from 559_no-predefined-gutters

Author: bluemwhitew

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateAdvancedConfigurationDefaultValuesTest.xml

@@ -5,13 +5,12 @@
   * 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="RowValidateAdvancedConfigurationDefaultValuesTest">
         <annotations>
             <features value="PageBuilder"/>
             <stories value="Row"/>
-            <title value="Validate Advanced Configuration Default Values"/>
+            <title value="Row - Validate Advanced Configuration Default Values"/>
             <description value="Validate the default values for every attribute in the Advanced Configuration form and on Stage for Row."/>
             <severity value="BLOCKER"/>
             <useCaseId value="MAGETWO-83415"/>
@@ -67,6 +66,7 @@
             <argument name="property" value="PageBuilderPaddingProperty_Empty"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="closeEditPanelSettings"/>
+
         <!-- Validate Stage -->
         <comment userInput="Validate Stage" stepKey="commentValidateStage"/>
         <actionGroup ref="ValidateAdvancedConfigurationWithBorderColorActionGroup" stepKey="validateStage">
@@ -81,12 +81,13 @@
         </actionGroup>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStage">
             <argument name="selector" value="{{RowOnStage.affordance('1')}}"/>
-            <argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowStage.value}}"/>
+            <argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowDefault.value}}"/>
             <argument name="cssProperty" value="margin"/>
         </actionGroup>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+
         <!-- Validate Stage After Save -->
         <comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
         <actionGroup ref="ValidateAdvancedConfigurationWithBorderColorActionGroup" stepKey="validateStage2">
@@ -101,12 +102,13 @@
         </actionGroup>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStageAfterSave">
             <argument name="selector" value="{{RowOnStage.affordance('1')}}"/>
-            <argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowStage.value}}"/>
+            <argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowDefault.value}}"/>
             <argument name="cssProperty" value="margin"/>
         </actionGroup>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
             <argument name="contentType" value="PageBuilderRowContentType"/>
         </actionGroup>
+
         <!-- Validate Edit Panel After Save -->
         <comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
         <actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAlignment2">
@@ -138,6 +140,7 @@
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
             <argument name="contentType" value="PageBuilderRowContentType"/>
         </actionGroup>
+
         <!-- Validate Storefront -->
         <comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
         <actionGroup ref="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" stepKey="validateStorefront">

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

@@ -175,7 +175,7 @@
         <field name="margins_and_padding">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
-                    <item name="default" xsi:type="string">{"margin":{"bottom":null,"left":null,"right":null,"top":null},"padding":{"bottom":null,"left":null,"right":null,"top":null}}</item>
+                    <item name="default" xsi:type="null" />
                 </item>
             </argument>
         </field>