#557: User access Row action panel with 2+ level nesting - Mftf tests fixes

Author: hannahnida

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullWidthRowAppearanceActionGroup.xml

@@ -17,10 +17,11 @@
             <argument name="childContentTypeIndex" defaultValue="1" type="string"/>
             <argument name="padding" defaultValue="PageBuilderPaddingPropertyRowDefault"/>
             <argument name="acceptableOffset" defaultValue="2" type="string"/>
+            <argument name="affordanceValue" defaultValue="0" type="string"/>
         </arguments>
         <comment userInput="Increase window size to see varying widths for rows" stepKey="commentResizeWindow"/>
         <resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
-        <executeJS function="return {{pageOrStageWidthJS}}" stepKey="pageOrStageWidth"/>
+        <executeJS function="return {{pageOrStageWidthJS}} - {{affordanceValue}}" stepKey="pageOrStageWidth"/>
         <executeJS function="return {{section.rowWidthJS(rowIndex)}}" stepKey="rowWidth"/>
         <executeJS function="return parseInt({{section.rowChildContentWidthJS(rowIndex, childContentType.role, childContentTypeIndex)}} + {{padding.paddingLeft}} + {{padding.paddingRight}} + ({{childContentTypeBorder.value}}*2))" stepKey="rowChildElementWidth"/>
         <executeJS function="return Math.abs({$pageOrStageWidth} - {$rowWidth})" stepKey="pageMinusRowWidth"/>

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

@@ -10,6 +10,9 @@
     <entity name="PageBuilderRowDefaultHeight" type="pagebuilder_row">
         <data key="value">300</data>
     </entity>
+    <entity name="PageBuilderRowAffordanceWidth" type="pagebuilder_row">
+        <data key="value">30</data>
+    </entity>
     <!-- Appearance -->
     <entity name="PageBuilderRowAppearance_Contained" type="pagebuilder_row_background_appearance_property">
         <data key="name">Appearance</data>

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

@@ -84,7 +84,7 @@
             <actualResult type="variable">columnRatio3CMSBlockStage</actualResult>
         </assertEquals>
         <executeJS function="return Math.round({$columnOneWidthCMSBlockStage}+{$columnTwoWidthCMSBlockStage}+{$columnThreeWidthCMSBlockStage}+{$columnFourWidthCMSBlockStage})" stepKey="totalColumnWidthCMSBlockStage"/>
-        <executeJS function="return Math.round({{RowOnStage.rowWidthJS('1')}}-{{PageBuilderPaddingPropertyRowDefault.paddingLeft}}-{{PageBuilderPaddingPropertyRowDefault.paddingRight}})" stepKey="rowWidthCMSBlockStage"/>
+        <executeJS function="return Math.round({{RowOnStage.rowWidthJS('1')}}-{{PageBuilderPaddingPropertyRowDefault.paddingLeft}}-{{PageBuilderPaddingPropertyRowDefault.paddingRight}}-{{PageBuilderRowAffordanceWidth.value}})" stepKey="rowWidthCMSBlockStage"/>
         <executeJS function="return Math.abs({$totalColumnWidthCMSBlockStage}-{$rowWidthCMSBlockStage})" stepKey="widthDifferenceCMSBlockStage"/>
         <assertLessThanOrEqual stepKey="assertWidthOfAllColumnsCMSBlockStage">
             <expectedResult type="int">2</expectedResult>

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

@@ -29,7 +29,9 @@
         </actionGroup>
         <comment userInput="---merging to remove step---" stepKey="enterParallaxBackgroundSpeed"/>
         <!-- Validate CMS Block Stage -->
-        <actionGroup ref="validateFullBleedRowAppearance" stepKey="validateRowAppearanceCMSBlockStage"/>
+        <actionGroup ref="validateFullBleedRowAppearance" stepKey="validateRowAppearanceCMSBlockStage">
+            <argument name="affordanceValue" value="{{PageBuilderRowAffordanceWidth.value}}"/>
+        </actionGroup>
         <actionGroup ref="validateBackgroundAttributes" stepKey="validateBackgroundCMSBlockStage">
             <argument name="section" value="RowOnStage"/>
             <argument name="index" value="1"/>
@@ -49,6 +51,7 @@
         <actionGroup ref="validateFullBleedRowAppearance" stepKey="validateRowAppearanceCMSPageStage">
             <argument name="section" value="RowOnStorefront"/>
             <argument name="rowIndex" value="2"/>
+            <argument name="affordanceValue" value="{{PageBuilderRowAffordanceWidth.value}}"/>
         </actionGroup>
         <actionGroup ref="validateBackgroundAttributesWithNoImage" stepKey="validateRowBackgroundCMSPageStage">
             <argument name="section" value="RowOnStorefront_FullWidth_FullBleed"/>

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

@@ -26,11 +26,14 @@
             <argument name="property" value="PageBuilderRowAppearance_FullBleed"/>
         </actionGroup>
         <!-- Validate CMS Block Stage -->
-        <actionGroup ref="validateFullBleedRowAppearance" stepKey="validateRowAppearanceCMSBlockStage"/>
+        <actionGroup ref="validateFullBleedRowAppearance" stepKey="validateRowAppearanceCMSBlockStage">
+            <argument name="affordanceValue" value="{{PageBuilderRowAffordanceWidth.value}}"/>
+        </actionGroup>
         <!-- Validate CMS Page Stage -->
         <actionGroup ref="validateFullBleedRowAppearance" stepKey="validateRowAppearanceCMSPageStage">
             <argument name="section" value="RowOnStorefront"/>
             <argument name="rowIndex" value="2"/>
+            <argument name="affordanceValue" value="{{PageBuilderRowAffordanceWidth.value}}"/>
         </actionGroup>
         <actionGroup ref="validateRowBackgroundAttributesWithAllUpdatedAndParallaxEnabled" stepKey="validateRowBackgroundCMSPageStage">
             <argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>

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

@@ -29,7 +29,9 @@
         </actionGroup>
         <comment userInput="---merging to remove step---" stepKey="enterParallaxBackgroundSpeed"/>
         <!-- Validate CMS Block Stage -->
-        <actionGroup ref="validateFullWidthRowAppearance" stepKey="validateRowAppearanceCMSBlockStage"/>
+        <actionGroup ref="validateFullWidthRowAppearance" stepKey="validateRowAppearanceCMSBlockStage">
+            <argument name="affordanceValue" value="{{PageBuilderRowAffordanceWidth.value}}"/>
+        </actionGroup>
         <actionGroup ref="validateBackgroundAttributes" stepKey="validateBackgroundCMSBlockStage">
             <argument name="section" value="RowOnStage"/>
             <argument name="index" value="1"/>
@@ -55,6 +57,7 @@
         <actionGroup ref="validateFullBleedRowAppearance" stepKey="validateRowAppearanceCMSPageStage">
             <argument name="section" value="RowOnStorefront"/>
             <argument name="rowIndex" value="2"/>
+            <argument name="affordanceValue" value="{{PageBuilderRowAffordanceWidth.value}}"/>
         </actionGroup>
         <actionGroup ref="validateBackgroundAttributesWithNoImage" stepKey="validateRowBackgroundCMSPageStage">
             <argument name="section" value="RowOnStorefront_FullWidth_FullBleed"/>

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

@@ -26,11 +26,14 @@
             <argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
         </actionGroup>
         <!-- Validate CMS Block Stage -->
-        <actionGroup ref="validateFullWidthRowAppearance" stepKey="validateRowAppearanceCMSBlockStage"/>
+        <actionGroup ref="validateFullWidthRowAppearance" stepKey="validateRowAppearanceCMSBlockStage">
+            <argument name="affordanceValue" value="{{PageBuilderRowAffordanceWidth.value}}"/>
+        </actionGroup>
         <!-- Validate CMS Page Stage -->
         <actionGroup ref="validateFullBleedRowAppearance" stepKey="validateRowAppearanceCMSPageStage">
             <argument name="section" value="RowOnStorefront"/>
             <argument name="rowIndex" value="2"/>
+            <argument name="affordanceValue" value="{{PageBuilderRowAffordanceWidth.value}}"/>
         </actionGroup>
         <actionGroup ref="validateRowBackgroundAttributesWithAllUpdatedAndParallaxEnabled" stepKey="validateRowBackgroundCMSPageStage">
             <argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>