Merge remote-tracking branch 'origin/558_7_content-type-style-attribute-removal' into 558_7_content-type-style-attribute-removal

Author: petrovsa

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/ValidateTabContentAdvancedConfigurationAllOptionsActionGroup.xml

@@ -11,12 +11,12 @@
         <annotations>
             <description>Validates Tab content</description>
         </annotations>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedTabContentConfigurationPath(index)}}', document.body).iterateNext()).textAlign" stepKey="grabAlignmentValue"/>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedTabContentConfigurationPath(index)}}', document.body).iterateNext()).borderStyle" stepKey="grabBorderStyleValue"/>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedTabContentConfigurationPath(index)}}', document.body).iterateNext()).borderColor" stepKey="grabBorderColorValue"/>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedTabContentConfigurationPath(index)}}', document.body).iterateNext()).borderWidth.replace(&quot;px&quot;, &quot;&quot;)" stepKey="grabBorderWidthValue"/>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedTabContentConfigurationPath(index)}}', document.body).iterateNext()).borderRadius.replace(/px/g, &quot;&quot;)" stepKey="grabBorderRadiusValue"/>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedTabContentConfigurationPath(index)}}', document.body).iterateNext()).margin.replace(/px/g, &quot;&quot;)" stepKey="grabMarginValue"/>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.advancedTabContentConfigurationPath(index)}}', document.body).iterateNext()).padding.replace(/px/g, &quot;&quot;)" stepKey="grabPaddingValue"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.base(index)}}', document.body).iterateNext()).textAlign" stepKey="grabAlignmentValue"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.base(index)}}', document.body).iterateNext()).borderStyle" stepKey="grabBorderStyleValue"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.base(index)}}', document.body).iterateNext()).borderColor" stepKey="grabBorderColorValue"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.base(index)}}', document.body).iterateNext()).borderWidth.replace(&quot;px&quot;, &quot;&quot;)" stepKey="grabBorderWidthValue"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.base(index)}}', document.body).iterateNext()).borderRadius.replace(/px/g, &quot;&quot;)" stepKey="grabBorderRadiusValue"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.base(index)}}', document.body).iterateNext()).margin.replace(/px/g, &quot;&quot;)" stepKey="grabMarginValue"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.base(index)}}', document.body).iterateNext()).padding.replace(/px/g, &quot;&quot;)" stepKey="grabPaddingValue"/>
     </actionGroup>
 </actionGroups>

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

@@ -18,12 +18,12 @@
             <argument name="verticalAlign" defaultValue="PageBuilderVerticalAlignmentPropertyCenter"/>
         </arguments>
         <waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForContentType"/>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.minHeightPath(index)}}', document.body).iterateNext()).minHeight.replace(/px/g, &quot;&quot;)" stepKey="grabMinHeightValue"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.base(index)}}', document.body).iterateNext()).minHeight.replace(/px/g, &quot;&quot;)" stepKey="grabMinHeightValue"/>
         <assertEquals stepKey="assertMinHeightVisible">
             <expectedResult type="string">{{minHeight.value}}</expectedResult>
             <actualResult type="variable">grabMinHeightValue</actualResult>
         </assertEquals>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.verticalAlignContainerPath(index)}}', document.body).iterateNext()).justifyContent" stepKey="grabVerticalAlignValue"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate('{{page.elementChildren(index)}}', document.body).iterateNext()).justifyContent" stepKey="grabVerticalAlignValue"/>
         <assertEquals stepKey="verticalAlignVisible">
             <expectedResult type="string">{{verticalAlign.value}}</expectedResult>
             <actualResult type="variable">grabVerticalAlignValue</actualResult>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnBackendSection.xml

@@ -8,13 +8,14 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ColumnOnBackend">
-        <element name="base" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}]" parameterized="true"/>
+        <element name="base" type="button" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
         <element name="baseJS" type="text" selector="document.querySelectorAll('[data-content-type=column]')[{{arg1}} - 1]" parameterized="true"/>
         <element name="baseCSS" type="text" selector="[data-content-type=column][data-element=main]"/>
+        <element name="elementChildren" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]/div[contains(@class,&quot;element-children&quot;)]" parameterized="true"/>
         <element name="columnConfigurationPath" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
         <element name="columnChildrenConfigurationPath" type="text" selector="(//div[contains(@class, &quot;pagebuilder-column-group&quot;)])[{{arg1}}]/descendant::div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(@class, &quot;pagebuilder-column&quot;)][{{arg2}}]//div[contains(@class, &quot;element-children&quot;)]" parameterized="true"/>
         <element name="allColumns" type="text" selector="//div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-column')]"/>
-        <element name="default" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-column')])[{{arg1}}][@style='border: {{arg2}}; border-radius: {{arg3}}px; margin: {{arg4}}px; padding: {{arg5}}px; width: {{arg6}}; background-size: {{arg7}}; background-repeat: {{arg8}}; background-attachment: {{arg9}}; align-self: {{arg10}};']" parameterized="true"/>
+        <element name="default" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-column')])[{{arg1}}][@style='border: {{arg2}}; border-radius: {{arg3}}px; margin: {{arg4}}px; padding: {{arg5}}px; width: {{arg6}}; background-size: {{arg7}}; background-repeat: {{arg8}}; background-attachment: {{arg9}}; align-self: {{arg10}};']" parameterized="true" deprecated="Styles are not inline"/>
         <element name="empty" type="button" selector="(//div[contains(@class,'empty-container')]//div[contains(@class,'element-children') and contains(@class,'column-container')])[{{arg1}}]" parameterized="true"/>
         <element name="columnGroup" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]" parameterized="true"/>
         <element name="columnGroupPath" type="text" selector="(//div[contains(@class, &quot;pagebuilder-column-group&quot;)])[{{arg1}}]" parameterized="true"/>
@@ -37,9 +38,7 @@
         <element name="gridSizeError" type="button" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'admin__field-error') and contains(text(), '{{arg2}}')]" parameterized="true"/>
         <element name="appearance" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
         <element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true" deprecated="Styles are not inline"/>
-        <element name="minHeightPath" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
         <element name="verticalAlignContainer" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}]/div[contains(@class,'column-container')][contains(@style,'justify-content: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>
-        <element name="verticalAlignContainerPath" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]/div[contains(@class,&quot;column-container&quot;)]" parameterized="true"/>
         <!-- Background Configuration -->
         <element name="backgroundPath" type="text" selector="(//div[contains(@class,&quot;pagebuilder-column&quot;) and contains(@class,&quot;pagebuilder-content-type&quot;)])[{{arg1}}]" parameterized="true"/>
         <element name="backgroundPosition" type="button" selector="(//div[contains(@class,'pagebuilder-column') and contains(@class,'pagebuilder-content-type')])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnFrontendSection.xml

@@ -11,6 +11,7 @@
         <element name="base" type="block" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
         <element name="baseJS" type="text" selector="document.querySelectorAll('[data-content-type=column]')[{{arg1}} - 1]" parameterized="true"/>
         <element name="baseCSS" type="text" selector="[data-content-type=column]"/>
+        <element name="elementChildren" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
         <element name="columnGroup" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]" parameterized="true"/>
         <element name="allColumnGroups" type="block" selector=".pagebuilder-column-group"/>
         <element name="allColumns" type="block" selector="(//div[@data-content-type='column'])"/>
@@ -54,9 +55,7 @@
         <element name="columnClass" type="button" selector="[data-content-type='column']:first-child.first-class.second-class.third-class"/>
         <element name="appearance" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
         <element name="minHeight" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true" deprecated="Styles are not inline"/>
-        <element name="minHeightPath" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
         <element name="verticalAlignContainer" type="text" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'justify-content: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>
-        <element name="verticalAlignContainerPath" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
         <!-- Background Configuration -->
         <element name="backgroundPath" type="button" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
         <element name="backgroundPosition" type="button" selector="(//div[@data-content-type='column'])[{{arg1}}][contains(@style,'background-position: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStageSection.xml

@@ -9,8 +9,9 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="RowOnStage">
         <element name="allRows" type="text" selector="//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')]"/>
-        <element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]" parameterized="true"/>
+        <element name="base" type="text" selector="(//div[contains(@class,&quot;pagebuilder-content-type&quot;) and contains(@class,&quot;pagebuilder-row&quot;)])[{{arg1}}]" parameterized="true"/>
         <element name="baseJS" type="text" selector="document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1]" parameterized="true"/>
+        <element name="elementChildren" type="text" selector="(//div[contains(@class, &quot;pagebuilder-row&quot;)])[{{arg1}}]//div[contains(@class, &quot;element-children&quot;) and contains(@class, &quot;row-container&quot;)]" parameterized="true"/>
         <element name="hidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
         <element name="notHidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
         <element name="baseCSS" type="text" selector="div.pagebuilder-content-type.pagebuilder-row"/>
@@ -24,9 +25,7 @@
         <element name="appearanceContained" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
         <element name="appearanceFullWidthFullBleed" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
         <element name="minHeight" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'min-height: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>
-        <element name="minHeightPath" type="text" selector="(//div[contains(@class,&quot;pagebuilder-content-type&quot;) and contains(@class,&quot;pagebuilder-row&quot;)])[{{arg1}}]" parameterized="true"/>
         <element name="verticalAlignContainer" type="button" selector="(//div[contains(@class, 'pagebuilder-row')])[{{arg1}}]//div[contains(@class, 'element-children') and contains(@class, 'row-container')][contains(@style,'justify-content: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>
-        <element name="verticalAlignContainerPath" type="text" selector="(//div[contains(@class, &quot;pagebuilder-row&quot;)])[{{arg1}}]//div[contains(@class, &quot;element-children&quot;) and contains(@class, &quot;row-container&quot;)]" parameterized="true"/>
         <!-- Background Configuration -->
         <element name="backgroundPath" type="button" selector="(//div[contains(@class,&quot;pagebuilder-content-type&quot;) and contains(@class,&quot;pagebuilder-row&quot;)])[{{arg1}}]" parameterized="true"/>
         <element name="backgroundType" type="text" parameterized="true" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{index}}][@data-background-type='{{backgroundType}}']"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStage_ContainedSection.xml

@@ -8,7 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="RowOnStage_Contained">
-        <element name="base" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}]//div[@data-element='inner']" parameterized="true"/>
+        <element name="base" type="text" selector="(//div[@data-content-type=&quot;row&quot;])[{{arg1}}]//div[@data-element=&quot;inner&quot;]" parameterized="true"/>
         <element name="baseJS" type="text" selector="(document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1]).querySelector('[data-element=inner]')" parameterized="true"/>
     </section>
 </sections>