#510: User edits CMS page content in full-screen mode only

omiroshnichenko · omiroshnichenko · commit c62b3a169f27 · 2020-07-29T17:00:22.000-05:00
- fix mftf tests
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateParallaxVideoBackgroundWithAllAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateParallaxVideoBackgroundWithAllAttributesActionGroup.xml
@@ -11,12 +11,15 @@
         <annotations>
             <description>Validates all video background attributes when all attributes are configured and parallax is enabled. Extends: validateVideoBackgroundWithAllAttributes</description>
         </annotations>
+        <arguments>
+            <argument name="expectedPosition" defaultValue="position: fixed;" type="string"/>
+        </arguments>
         <assertStringContainsString stepKey="assertVideoPosition">
-            <expectedResult type="string">position: fixed;</expectedResult>
+            <expectedResult type="string">{{expectedPosition}}</expectedResult>
             <actualResult type="variable">$videoStyle</actualResult>
         </assertStringContainsString>
         <assertStringContainsString stepKey="assertImagePosition">
-            <expectedResult type="string">position: fixed;</expectedResult>
+            <expectedResult type="string">{{expectedPosition}}</expectedResult>
             <actualResult type="variable">$fallbackImageStyle</actualResult>
         </assertStringContainsString>
     </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ScrollToActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ScrollToActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * 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">
+    <actionGroup name="ScrollToActionGroup">
+        <arguments>
+            <argument name="cssSelector" type="string"/>
+            <argument name="index" defaultValue="1" type="string" />
+            <argument name="verticalOffset" defaultValue="0" type="string"/>
+        </arguments>
+        <executeJS function="return document.querySelectorAll('{{cssSelector}}')[{{index}}-1].offsetTop" stepKey="elementPosition"/>
+        <executeJS function="document.querySelector('{{PageBuilderStage.stageWrapperFullScreen}}').scrollTop = parseInt({$elementPosition} - {{verticalOffset}}, 10)" stepKey="scrollToElement"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SliderOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SliderOnStageSection.xml
@@ -10,6 +10,7 @@
     <section name="SliderOnStage">
         <element name="all" type="button" selector="div[data-content-type=slider]"/>
         <element name="base" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}]" parameterized="true"/>
+        <element name="baseCSS" type="button" selector="div.pagebuilder-content-type.pagebuilder-slider"/>
         <element name="containerCSS" type="text" selector="[data-content-type=slider] &gt; .slider-container"/>
         <element name="hidden" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
         <element name="notHidden" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}]/parent::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml
@@ -202,6 +202,7 @@
         <assertFalse stepKey="assertMessageHasNoImageLinks">
             <actualResult type="variable">grabIfImageLinkInWysiwygBoolean</actualResult>
         </assertFalse>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
         <!-- Storefront: Validate no Widget and Link in Banner Content -->
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
@@ -94,7 +94,10 @@
             <argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded"/>
             <argument name="index" value="4"/>
         </actionGroup>
-        <scrollTo selector="{{BannerOnBackend.base('4')}}" stepKey="scrollBanner4Stage"/>
+        <actionGroup ref="ScrollToActionGroup" stepKey="scrollBanner4Stage">
+            <argument name="cssSelector" value="{{BannerOnBackend.baseCSS}}"/>
+            <argument name="index" value="4"/>
+        </actionGroup>
         <!-- Stage: Validate Video is Playing -->
         <actionGroup ref="validateVideoBackgroundPlaying" stepKey="validateVideoPlayingStage2">
             <argument name="section" value="BannerOnBackend"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
@@ -62,6 +62,7 @@
             <argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
             <argument name="fallbackImage" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             <argument name="index" value="2"/>
+            <argument name="expectedPosition" value="position: absolute;"/>
         </actionGroup>
         <actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateParallaxStorefront" before="validateStorefront">
             <argument name="page" value="RowOnStorefront"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
@@ -65,6 +65,7 @@
             <argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
             <argument name="fallbackImage" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             <argument name="index" value="2"/>
+            <argument name="expectedPosition" value="position: absolute;"/>
         </actionGroup>
         <actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateParallaxStorefront" before="validateStorefront">
             <argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
@@ -65,6 +65,7 @@
             <argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
             <argument name="fallbackImage" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             <argument name="index" value="2"/>
+            <argument name="expectedPosition" value="position: absolute;"/>
         </actionGroup>
         <actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateParallaxStorefront" before="validateStorefront">
             <argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeFormDisablesStageAfterTabItemOptionsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeFormDisablesStageAfterTabItemOptionsTest.xml
@@ -65,7 +65,10 @@
         <!-- Close grid form and check options are restored -->
         <comment userInput="Close grid form and check options are restored" stepKey="commentCloseAndValidateOptionsAreRestored"/>
         <actionGroup ref="closeGridSizeForm" stepKey="closeGridForm"/>
-        <scrollTo selector="{{RowOnStage.base('1')}}" stepKey="scrollToTop"/>
+        <actionGroup ref="ScrollToActionGroup" stepKey="scrollToTop">
+            <argument name="cssSelector" value="{{RowOnStage.baseCSS}}"/>
+            <argument name="index" value="1"/>
+        </actionGroup>
         <moveMouseOver selector="{{PageBuilderStage.contentTypeInStage(PageBuilderRowContentType.role)}}" x="10" y="0" stepKey="onMouseOverContentTypeStage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderRowContentType.role)}}" stepKey="waitForOptions"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateParallaxVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateParallaxVideoBackground.xml
@@ -49,6 +49,7 @@
             <argument name="lazyLoad" value="PageBuilderVideoBackgroundLazyLoad_Enabled"/>
             <argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
             <argument name="fallbackImage" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
+            <argument name="expectedPosition" value="position: absolute;"/>
         </actionGroup>
         <actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateParallaxStage2" before="validateStage2">
             <argument name="page" value="RowOnStage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateParallaxVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateParallaxVideoBackground.xml
@@ -52,6 +52,7 @@
             <argument name="lazyLoad" value="PageBuilderVideoBackgroundLazyLoad_Enabled"/>
             <argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
             <argument name="fallbackImage" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
+            <argument name="expectedPosition" value="position: absolute;"/>
         </actionGroup>
         <actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateParallaxStage2" before="validateStage2">
             <argument name="page" value="RowOnStage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateParallaxVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateParallaxVideoBackground.xml
@@ -52,6 +52,7 @@
             <argument name="lazyLoad" value="PageBuilderVideoBackgroundLazyLoad_Enabled"/>
             <argument name="playOnlyWhenVisible" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
             <argument name="fallbackImage" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
+            <argument name="expectedPosition" value="position: absolute;"/>
         </actionGroup>
         <actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateParallaxStage2" before="validateStage2">
             <argument name="page" value="RowOnStage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
@@ -88,7 +88,10 @@
             <argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded"/>
             <argument name="index" value="4"/>
         </actionGroup>
-        <scrollTo selector="{{RowOnStage.base('4')}}" stepKey="scrollRow4Stage"/>
+        <actionGroup ref="ScrollToActionGroup" stepKey="scrollRow4Stage">
+            <argument name="cssSelector" value="{{RowOnStage.baseCSS}}"/>
+            <argument name="index" value="4"/>
+        </actionGroup>
         <!-- Stage: Validate Video is Playing -->
         <actionGroup ref="validateVideoBackgroundPlaying" stepKey="validateVideoPlayingStage2">
             <argument name="section" value="RowOnStage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
@@ -84,7 +84,10 @@
             <argument name="section" value="SlideOnBackend"/>
             <argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded"/>
         </actionGroup>
-        <scrollTo selector="{{SlideOnBackend.base('1')}}" stepKey="scrollToSlideStage"/>
+        <actionGroup ref="ScrollToActionGroup" stepKey="scrollToSlideStage">
+            <argument name="cssSelector" value="{{SliderOnStage.baseCSS}}"/>
+            <argument name="index" value="1"/>
+        </actionGroup>
         <!-- Stage: Validate Video is Playing -->
         <actionGroup ref="validateVideoBackgroundPlaying" stepKey="validateVideoPlayingStage2">
             <argument name="section" value="SlideOnBackend"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAlignmentInheritanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAlignmentInheritanceTest.xml
@@ -53,7 +53,7 @@
         <actionGroup ref="saveEditPanelSettings" stepKey="saveTextEditPanelSettings"/>
         <executeJS function="return window.getComputedStyle({{TextOnStage.contentJS('1')}}).textAlign" stepKey="grabDefaultComputedTextAlign"/>
         <assertEquals stepKey="assertDefaultComputedTextAlign">
-            <expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyStart.value}}</expectedResult>
+            <expectedResult type="string">{{PageBuilderAdvancedAlignmentPropertyLeft.value}}</expectedResult>
             <actualResult type="variable">grabDefaultComputedTextAlign</actualResult>
         </assertEquals>
         <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusTextEditor2"/>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less
@@ -344,6 +344,7 @@
                 position: relative;
                 top: 0;
                 width: calc(~'100% - 150px');
+                z-index: 106;
             }
         }
     }
