MC-3407: Create/update MFTF tests for background attributes for tab

- Resolve issues with merge

Author: davemacaulay

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection.xml

@@ -65,7 +65,6 @@
         <element name="tabContentPadding" type="button" selector="//*[@role='tabpanel'][{{arg1}}]//div[contains(@class, 'pagebuilder-tab-item')][contains(@style, 'padding: {{arg2}}')]" parameterized="true"/>
         <element name="tabTextContent" type="button" selector="//div[@class='pagebuilder-text']"/>
         <element name="tabColumnContent" type="button" selector="//div[contains(@class,'pagebuilder-tabs')]//div[contains(@class, 'pagebuilder-column-group')]"/>
-        <element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>
         <!-- Background Configuration -->
         <element name="backgroundPosition" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and @data-element='desktop_image'])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
         <element name="backgroundSize" type="button" selector="(//div[contains(@class,'pagebuilder-tab-item') and @data-element='desktop_image'])[{{arg1}}][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
@@ -90,7 +89,6 @@
         <element name="tabContentAdvancedStylesBorder" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][contains(@style, 'border-style: {{arg2}}') and contains(@style, 'border-color: {{arg3}}') and contains(@style, 'border-width: {{arg4}}px') and contains(@style, 'border-radius: {{arg5}}px')]" parameterized="true"/>
         <element name="tabContentAdvancedStyles" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style, 'text-align: {{arg2}}') and contains(@style, 'margin: {{arg3}}px') and contains(@style, 'padding: {{arg4}}px')]" parameterized="true"/>
         <element name="tabContentAdvancedClass" type="button" selector="(//div[@class='tabs-content']//div[@data-role='tab-item'])[{{arg1}}][contains(@class, '{{arg2}}')]" parameterized="true"/>
-        <element name="base" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]" parameterized="true"/>
         <!-- Background Configuration -->
         <element name="backgroundPosition" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
         <element name="backgroundSize" type="button" selector="(//div[@data-role='tab-item'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideCommonTest.xml

@@ -713,7 +713,7 @@
             <argument name="contentType" value="PageBuilderSliderContentType"/>
         </actionGroup>
         <actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorFFFFFFProperty">
-            <argument name="property" value="PageBuilderSlideWhiteBackgroundColorProperty"/>
+            <argument name="property" value="PageBuilderBackgroundColorProperty_FFFFFF"/>
         </actionGroup>
         <actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCE">
             <argument name="property" value="PageBuilderSlideMessageProperty"/>
@@ -1964,7 +1964,7 @@
             <argument name="contentType" value="PageBuilderSliderContentType"/>
         </actionGroup>
         <actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorFFFFFFProperty">
-            <argument name="property" value="PageBuilderSlideWhiteBackgroundColorProperty"/>
+            <argument name="property" value="PageBuilderBackgroundColorProperty_FFFFFF"/>
         </actionGroup>
         <actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCE">
             <argument name="property" value="PageBuilderSlideMessageProperty"/>
@@ -2021,7 +2021,7 @@
             <argument name="contentType" value="PageBuilderSliderContentType"/>
         </actionGroup>
         <actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorFFFFFFProperty">
-            <argument name="property" value="PageBuilderSlideWhiteBackgroundColorProperty"/>
+            <argument name="property" value="PageBuilderBackgroundColorProperty_FFFFFF"/>
         </actionGroup>
         <actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCE">
             <argument name="property" value="PageBuilderSlideMessageProperty"/>