Merge branch '557_user-access-row-action-panel' of hannahnida/magento2-page-builder into 557_user-access-row-action-panel

Author: hannahnida

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

@@ -23,8 +23,8 @@
         <element name="rowChildContentWidthJS" type="text" selector="document.querySelectorAll('[data-content-type=row]')[{{arg1}} - 1].querySelectorAll('[data-content-type={{arg2}}]')[{{arg3}} - 1].clientWidth" parameterized="true"/>
         <element name="appearance" type="text" selector="(//div[@data-content-type='row'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
         <element name="appearanceContainedCSS" type="text" selector="[data-content-type=row][data-appearance=contained]"/>
-        <element name="appearanceFullBleedCSS" type="text" selector="[data-content-type=row][data-appearance=full-bleed]"/>
         <element name="appearanceFullWidthCSS" type="text" selector="[data-content-type=row][data-appearance=full-width]"/>
+        <element name="appearanceFullBleedCSS" type="text" selector="[data-content-type=row][data-appearance=full-bleed]"/>
         <element name="minHeight" type="button" selector="(//div[@data-content-type='row'])[{{arg1}}]/div[contains(@style, 'min-height: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>
         <element name="verticalAlignContainer" type="button" selector="(//div[@data-content-type='row'])[{{arg1}}]/div[contains(@style, 'justify-content: {{arg2}};')]" parameterized="true" deprecated="Styles are not inline"/>
         <!-- Background Configuration -->

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderContainerTest/PageBuilderVerifyContainerAffordanceTest.xml

@@ -76,6 +76,16 @@
             <argument name="CMSPage" value="$$createCMSPage$$"/>
         </actionGroup>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+        <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage3">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+        </actionGroup>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance3">
+            <argument name="property" value="PageBuilderRowAppearance_FullBleed"/>
+        </actionGroup>
+        <actionGroup ref="fillSlideOutPanelFieldMarginsAndPadding" stepKey="fillSlideOutPanelFieldMarginsAndPadding">
+            <argument name="property" value="PageBuilderAdvancedMarginsAndPaddingPropertyDefault"/>
+        </actionGroup>
+        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection2">
             <argument name="contentType" value="PageBuilderBlockContentType"/>
         </actionGroup>
@@ -88,7 +98,7 @@
         <actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
             <argument name="block" value="$$createCMSBlock$$"/>
         </actionGroup>
-        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
+        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings4"/>
         <!-- Validate Stage for CMS Page -->
         <actionGroup ref="VerifyAffordanceSizeActionGroup" stepKey="verifyAffordanceSizeActionGroup4"/>
         <seeNumberOfElements selector="{{RowOnStage.affordanceCSS}}" userInput="1" stepKey="seeNumberOfAffordance2"/>
@@ -99,5 +109,24 @@
             <argument name="page" value="$$createCMSPage.identifier$$"/>
         </actionGroup>
         <dontSeeElementInDOM selector="{{RowOnStage.affordanceCSS}}" stepKey="dontSeeAffordanceInDOM"/>
+        <executeJS function="return window.innerWidth;" stepKey="viewportWidth"/>
+        <waitForElementVisible selector="{{RowOnStorefront.appearanceContainedCSS}}" stepKey="waitForRowContainedVisible"/>
+        <executeJS function="return parseInt(document.querySelector('{{RowOnStorefront.appearanceFullBleedCSS}} {{RowOnStorefront.appearanceContainedCSS}}').getBoundingClientRect().width, 10)" stepKey="actualRowContainedSize"/>
+        <assertEquals stepKey="assertRowContainedEqualsExpected">
+            <expectedResult type="variable">actualRowContainedSize</expectedResult>
+            <actualResult type="variable">actualRowContainedSize</actualResult>
+        </assertEquals>
+        <waitForElementVisible selector="{{RowOnStorefront.appearanceFullWidthCSS}}" stepKey="waitForRowFullWidthVisible"/>
+        <executeJS function="return parseInt(document.querySelector('{{RowOnStorefront.appearanceFullBleedCSS}} {{RowOnStorefront.appearanceFullWidthCSS}}').getBoundingClientRect().width, 10)" stepKey="actualRowFullWidthSize"/>
+        <assertEquals stepKey="assertRowFullWidthEqualsExpected">
+            <expectedResult type="variable">viewportWidth</expectedResult>
+            <actualResult type="variable">actualRowFullWidthSize</actualResult>
+        </assertEquals>
+        <waitForElementVisible selector="{{RowOnStorefront.appearanceFullBleedCSS}}" stepKey="waitForRowFullBleedVisible"/>
+        <executeJS function="return parseInt(document.querySelector('{{RowOnStorefront.appearanceFullBleedCSS}} {{RowOnStorefront.appearanceFullBleedCSS}}').getBoundingClientRect().width, 10)" stepKey="actualRowFullBleedSize"/>
+        <assertEquals stepKey="assertRowFullBleedEqualsExpected">
+            <expectedResult type="variable">viewportWidth</expectedResult>
+            <actualResult type="variable">actualRowFullBleedSize</actualResult>
+        </assertEquals>
     </test>
 </tests>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml

@@ -86,13 +86,8 @@
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings4"/>
         <!-- Validate Stage -->
-        <actionGroup ref="ScrollToActionGroup" stepKey="scrollRow4StageBeforeSave">
-            <argument name="cssSelector" value="{{RowOnStage.affordanceCSS}}"/>
-            <argument name="index" value="4"/>
-            <argument name="verticalOffset" value="-100"/>
-        </actionGroup>
         <wait time="5" stepKey="waitForVideoCompleteStage"/>
-        <actionGroup ref="validateVideoBackgroundFinishedPlaying" stepKey="validateVideoFinishedPlayingStage1">
+        <actionGroup ref="validateVideoBackgroundFinishedPlayingBeforeViewing" stepKey="validateVideoFinishedPlayingStage1">
             <argument name="section" value="RowOnStage"/>
             <argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_Mp4_URL"/>
             <argument name="index" value="4"/>