Merge branch '559_no-predefined-gutters--tabs' of github.com:bluemwhitew/magento2-page-builder into 559_no-predefined-gutters

 Conflicts:
	app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnHoverOptionMenusTest.xml

Author: omiroshnichenko

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

@@ -5,11 +5,10 @@
   * See COPYING.txt for license details.
   */
 -->
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder">
         <annotations>
-            <description>Validates that a content type's minimum height is equal to it's actual height minus top padding minus bottom padding minus border width times two.</description>
+            <description>Validates that a content type's minimum height is equal to its actual height minus top padding, minus bottom padding, minus border width, doubled.</description>
         </annotations>
         <arguments>
             <argument name="content" type="string"/>

app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml

@@ -496,7 +496,7 @@
         <data key="marginBottom">0</data>
         <data key="marginLeft">0</data>
     </entity>
-    <entity name="PageBuilderMarginsPropertyTabDefault" type="pagebuilder_margins_property">
+    <entity name="PageBuilderMarginsPropertyTabDefault" type="pagebuilder_margins_property" deprecated="Use `PageBuilderMarginsPropertyDefault`">
         <data key="name">Margins and Padding</data>
         <data key="section">advanced</data>
         <data key="fieldName">margins_and_padding</data>
@@ -606,6 +606,16 @@
         <data key="paddingBottom">0</data>
         <data key="paddingLeft">10</data>
     </entity>
+    <entity name="PageBuilderPaddingProperty20" type="pagebuilder_padding_property">
+        <data key="name">Margins and Padding</data>
+        <data key="section">advanced</data>
+        <data key="fieldName">margins_and_padding</data>
+        <data key="value">20</data>
+        <data key="paddingTop">20</data>
+        <data key="paddingRight">20</data>
+        <data key="paddingBottom">20</data>
+        <data key="paddingLeft">20</data>
+    </entity>
     <entity name="PageBuilderPaddingProperty40" type="pagebuilder_padding_property">
         <data key="name">Margins and Padding</data>
         <data key="section">advanced</data>

app/code/Magento/PageBuilder/Test/Mftf/Data/TabData.xml

@@ -5,9 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <!-- Tab Name -->
     <entity name="PageBuilderTabName1Default" type="pagebuilder_tab_property">
         <data key="name">Tab Name</data>

app/code/Magento/PageBuilder/Test/Mftf/Data/TabsData.xml

@@ -5,9 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-
-<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="PageBuilderFirstTabInStage" type="pagebuilder_column">
         <data key="index">1</data>
         <data key="pageName" unique="suffix">tab</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderTabsThroughBlockContentTypeTest.xml

@@ -5,8 +5,7 @@
   * 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="BlockRenderTabsThroughBlockContentTypeTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -57,6 +56,7 @@
         <actionGroup ref="addChildContentTypeFromOptionMenu" stepKey="addChildContentType">
             <argument name="contentType" value="PageBuilderTabsContentType"/>
         </actionGroup>
+
         <!-- Edit Tab Group -->
         <comment userInput="Edit Tab Group" stepKey="commentEditTabs"/>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuTabs">
@@ -72,6 +72,7 @@
             <argument name="property" value="PageBuilderTabsAlignmentCenter"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsTabs"/>
+
         <!-- Edit Tab 1 -->
         <comment userInput="Edit Tab 1" stepKey="commentEditTab1"/>
         <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanelTab1">
@@ -109,7 +110,7 @@
             <argument name="property" value="PageBuilderTabVerticalAlignmentPropertyCenter"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsTab1"/>
-        <!-- Add Divider To Tab 1 -->
+        <!-- Add Divider -->
         <comment userInput="Add Divider To Tab 1" stepKey="commentAddDividerToTab1"/>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPanelDividerMenuSection">
             <argument name="contentType" value="PageBuilderDividerContentType"/>
@@ -119,6 +120,7 @@
             <argument name="containerTargetType" value="PageBuilderTabContentType"/>
             <argument name="containerTargetIndex" value="1"/>
         </actionGroup>
+
         <!-- Edit Tab 2 -->
         <comment userInput="Edit Tab 2" stepKey="commentEditTab2"/>
         <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanelTab2">
@@ -135,6 +137,7 @@
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
         <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
+
         <!-- Validate CMS Block Stage -->
         <comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
         <seeElement selector="{{TabOnStage.tabHeaderItemActive('2')}}" stepKey="seeTab2ActiveCMSBlockStage"/>
@@ -191,15 +194,14 @@
         <actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab1MinHeightCMSBlockStage">
             <argument name="content" value="{{TabOnStage.tabContentCSS}}"/>
             <argument name="minHeight" value="{{PageBuilderTabMinimumHeight200Property.value}}"/>
-            <argument name="paddingTop" value="{{PageBuilderPaddingProperty40.paddingTop}}"/>
-            <argument name="paddingBottom" value="{{PageBuilderPaddingProperty40.paddingBottom}}"/>
             <argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthPropertyDefault.value}}"/>
             <argument name="index" value="1"/>
         </actionGroup>
         <seeElement selector="{{DividerOnStage.base('1')}}" stepKey="seeDividerCMSBlockStage"/>
         <actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSBlockStage">
             <argument name="page" value="DividerOnStage"/>
         </actionGroup>
+
         <!-- Add Block to CMS Page -->
         <comment userInput="Add Block to CMS Page" stepKey="commentAddBlockToCMSPage"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
@@ -219,6 +221,7 @@
             <argument name="block" value="$$createCMSBlock$$"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlock"/>
+
         <!-- Validate CMS Page Stage -->
         <comment userInput="Validate CMS Page Stage" stepKey="commentValidateCMSPageStage"/>
         <seeElement selector="{{TabOnStorefront.tabHeaderItemActive('2')}}" stepKey="seeTab2ActiveCMSPageStage"/>
@@ -247,12 +250,13 @@
         <actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab2MinHeightCMSPageStage">
             <argument name="content" value="{{TabOnStorefront.tabContentCSS}}"/>
             <argument name="minHeight" value="{{PageBuilderTabMinHeight0Property.value}}"/>
-            <argument name="paddingTop" value="{{PageBuilderPaddingProperty40.paddingTop}}"/>
-            <argument name="paddingBottom" value="{{PageBuilderPaddingProperty40.paddingBottom}}"/>
+            <argument name="paddingTop" value="{{PageBuilderPaddingProperty20.paddingTop}}"/>
+            <argument name="paddingBottom" value="{{PageBuilderPaddingProperty20.paddingBottom}}"/>
             <argument name="index" value="2"/>
         </actionGroup>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
+
         <!-- Validate CMS Page Storefront -->
         <comment userInput="Validate CMS Page Storefront" stepKey="commentValidateCMSPageStorefront"/>
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
@@ -329,6 +333,7 @@
         <actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSPageStorefront">
             <argument name="page" value="DividerOnStorefront"/>
         </actionGroup>
+
         <!-- Validate CMS Page Storefront Mobile -->
         <comment userInput="Validate CMS Page Storefront Mobile" stepKey="commentValidateCMSPageStorefrontMobile"/>
         <resizeWindow width="767" height="1000" stepKey="resizeWindowToMobileCMSPageStorefrontMobile"/>
@@ -368,6 +373,7 @@
             <argument name="index" value="2"/>
         </actionGroup>
         <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+
         <!-- Change Default Tab -->
         <comment userInput="Change Default Tab" stepKey="commentChangeDefaultTab"/>
         <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
@@ -392,6 +398,7 @@
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsTabs2"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock2"/>
+
         <!-- Validate CMS Page Stage Again -->
         <comment userInput="Validate CMS Page Stage Again" stepKey="commentValidateCMSPageStageAgain"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage2">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsValidateAdvancedConfigurationDefaultValuesTest.xml

@@ -5,8 +5,7 @@
   * 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="TabsValidateAdvancedConfigurationDefaultValuesTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -31,6 +30,7 @@
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
             <argument name="contentType" value="PageBuilderTabsContentType"/>
         </actionGroup>
+
         <!-- Add Tabs to Stage -->
         <comment userInput="Add Tabs to Stage" stepKey="addTabsToStage"/>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
@@ -39,11 +39,13 @@
         <actionGroup ref="dragContentTypeToStage" stepKey="dragTabsIntoStage">
             <argument name="contentType" value="PageBuilderTabsContentType"/>
         </actionGroup>
+
         <!-- Open Tabs Panel -->
         <click selector="{{TabsOnStage.tabsContainer}}" stepKey="focusTabsElement"/>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
             <argument name="contentType" value="PageBuilderTabsContentType"/>
         </actionGroup>
+
         <!-- Validate Default Values -->
         <comment userInput="Validate Default Values" stepKey="CommentValidateDefaultValues"/>
         <actionGroup ref="validateTextAlignment" stepKey="validateAlignment">
@@ -67,12 +69,15 @@
             <actualResult type="variable">getCssClasses</actualResult>
         </assertEmpty>
         <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 Style On Stage -->
         <comment userInput="Validate Style On Stage" stepKey="CommentValidateStage"/>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="waitForDefaultBorderStyleTab">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/DefaultTabItemStateOnAddingNewTabTest.xml

@@ -5,8 +5,7 @@
   * 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="DefaultTabItemStateOnAddingNewTabTest">
         <annotations>
             <features value="PageBuilder"/>
@@ -106,12 +105,12 @@
         </actionGroup>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTab1Margins">
             <argument name="selector" value="{{TabOnStage.tabContent('1')}}"/>
-            <argument name="expectedProperty" value="{{PageBuilderMarginsPropertyTabDefault.value}}"/>
+            <argument name="expectedProperty" value="{{PageBuilderMarginsPropertyDefault.value}}"/>
             <argument name="cssProperty" value="margin"/>
         </actionGroup>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTab1Padding">
             <argument name="selector" value="{{TabOnStage.tabContent('1')}}"/>
-            <argument name="expectedProperty" value="{{PageBuilderPaddingProperty40.value}}"/>
+            <argument name="expectedProperty" value="{{PageBuilderPaddingPropertyDefault.value}}"/>
             <argument name="cssProperty" value="padding"/>
         </actionGroup>
         <!-- Validate Default Values on Edit Tab for initial tab -->