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

Hanna Hnida · Hanna Hnida · commit f678e7747bb5 · 2020-10-23T16:02:53.000+02:00
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStageSection.xml
@@ -17,7 +17,8 @@
         <element name="baseCSS" type="text" selector="div.pagebuilder-content-type.pagebuilder-row"/>
         <element name="empty" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@class,'empty-container')]//div[contains(@class,'element-children') and contains(@class,'row-container')]" parameterized="true"/>
         <element name="emptyPlaceholder" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@class,'empty-container')]//div[contains(@class,'empty-placeholder')]" parameterized="true"/>
-        <element name="affordance" type="text" selector="(//div[contains(@class,'pagebuilder-affordance-row') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>
+        <element name="affordance" type="text" selector="(//div[contains(@class,&quot;pagebuilder-affordance-row&quot;) and contains(@class,&quot;pagebuilder-content-type&quot;)])[{{arg1}}]" parameterized="true"/>
+        <element name="affordanceCSS" type="text" selector="div.pagebuilder-content-type-affordance.pagebuilder-affordance-row"/>
         <element name="displayLabel" type="text" selector="(//div[contains(@class,'pagebuilder-affordance-row') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//div[contains(@class,'pagebuilder-display-label')]" parameterized="true"/>
         <element name="rowChildrenStyle" type="text" selector="(//div[contains(@class, 'pagebuilder-row')])[{{arg1}}]//div[contains(@class, 'element-children') and contains(@class, 'row-container')][contains(@style, '{{arg2}}')]" parameterized="true" deprecated="Styles are not inline"/>
         <element name="rowChildrenPath" 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"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml
@@ -86,6 +86,11 @@
         </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">
             <argument name="section" value="RowOnStage"/>
@@ -112,7 +117,11 @@
             <argument name="fallbackImage" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             <argument name="index" value="4"/>
         </actionGroup>
-        <scrollTo selector="{{RowOnStage.base('4')}}" stepKey="scrollRow4Stage"/>
+        <actionGroup ref="ScrollToActionGroup" stepKey="scrollRow4Stage">
+            <argument name="cssSelector" value="{{RowOnStage.affordanceCSS}}"/>
+            <argument name="index" value="4"/>
+            <argument name="verticalOffset" value="-100"/>
+        </actionGroup>
         <actionGroup ref="validateVideoBackgroundFinishedPlayingBeforeViewing" stepKey="validateVideoFinishedPlayingStage3">
             <argument name="section" value="RowOnStage"/>
             <argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_Mp4_URL"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
@@ -73,6 +73,11 @@
             <argument name="property" value="PageBuilderVideoBackgroundPlayOnlyWhenVisible_Enabled"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings4"/>
+        <actionGroup ref="ScrollToActionGroup" stepKey="scrollRow4StageBeforeSave">
+            <argument name="cssSelector" value="{{RowOnStage.affordanceCSS}}"/>
+            <argument name="index" value="4"/>
+            <argument name="verticalOffset" value="-100"/>
+        </actionGroup>
         <!-- Stage: Validate Video is Playing -->
         <actionGroup ref="validateVideoBackgroundPlaying" stepKey="validateVideoPlayingStage1">
             <argument name="section" value="RowOnStage"/>
@@ -89,8 +94,9 @@
             <argument name="index" value="4"/>
         </actionGroup>
         <actionGroup ref="ScrollToActionGroup" stepKey="scrollRow4Stage">
-            <argument name="cssSelector" value="{{RowOnStage.baseCSS}}"/>
+            <argument name="cssSelector" value="{{RowOnStage.affordanceCSS}}"/>
             <argument name="index" value="4"/>
+            <argument name="verticalOffset" value="-100"/>
         </actionGroup>
         <!-- Stage: Validate Video is Playing -->
         <actionGroup ref="validateVideoBackgroundPlaying" stepKey="validateVideoPlayingStage2">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowDuplicateTest.xml
@@ -167,10 +167,15 @@
             <argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
             <argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty12"/>
             <argument name="cssClasses" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
-            <argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
+            <argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
             <argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
             <argument name="index" value="2"/>
         </actionGroup>
+        <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStage">
+            <argument name="selector" value="{{RowOnStage.affordance('2')}}"/>
+            <argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
+            <argument name="cssProperty" value="margin"/>
+        </actionGroup>
         <waitForElementVisible selector="{{RowOnStage.appearanceFullWidthFullBleed(('2', PageBuilderRowAppearance_FullWidth.value)}}" stepKey="waitForAppearanceVisible"/>
         <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage2">
             <argument name="contentType" value="PageBuilderRowContentType"/>
@@ -278,10 +283,15 @@
             <argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
             <argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty12"/>
             <argument name="cssClasses" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
-            <argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
+            <argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
             <argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
             <argument name="index" value="2"/>
         </actionGroup>
+        <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStage2">
+            <argument name="selector" value="{{RowOnStage.affordance('2')}}"/>
+            <argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
+            <argument name="cssProperty" value="margin"/>
+        </actionGroup>
         <waitForElementVisible selector="{{RowOnStage.appearanceFullWidthFullBleed(('2', PageBuilderRowAppearance_FullWidth.value)}}" stepKey="waitForAppearanceVisible2"/>
         <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage3">
             <argument name="contentType" value="PageBuilderRowContentType"/>
@@ -356,8 +366,16 @@
         <comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
         <!-- Validate content type is enabled in Storefront -->
         <comment userInput="Validate content type is enabled in Storefront" stepKey="commentValidateShownStorefront"/>
-        <waitForElementVisible selector="{{RowOnStorefront.notHidden('1')}}" stepKey="waitForContentTypeShownStorefront1"/>
-        <waitForElementVisible selector="{{RowOnStorefront.notHidden('2')}}" stepKey="waitForContentTypeShownStorefront2"/>
+        <actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="waitForContentTypeShownStorefront1">
+            <argument name="selector" value="{{RowOnStorefront.main('1')}}"/>
+            <argument name="notExpectedProperty" value="none"/>
+            <argument name="cssProperty" value="display"/>
+        </actionGroup>
+        <actionGroup ref="ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup" stepKey="waitForContentTypeShownStorefront2">
+            <argument name="selector" value="{{RowOnStorefront.main('2')}}"/>
+            <argument name="notExpectedProperty" value="none"/>
+            <argument name="cssProperty" value="display"/>
+        </actionGroup>
         <actionGroup ref="ValidateRowBackgroundConfigurationWithAllUpdatedAndParallaxEnabledActionGroup" stepKey="validateDuplicateOnStorefront">
             <argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>
             <argument name="index" value="2"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -71,10 +71,15 @@
             <argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty0"/>
             <argument name="borderColor" value="PageBuilderAdvancedBorderColorTransparent"/>
             <argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
-            <argument name="margin" value="PageBuilderMarginsPropertyRowDefault"/>
+            <argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
             <argument name="padding" value="PageBuilderPaddingProperty10"/>
             <argument name="index" value="1"/>
         </actionGroup>
+        <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStage">
+            <argument name="selector" value="{{RowOnStage.affordance('1')}}"/>
+            <argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowDefault.value}}"/>
+            <argument name="cssProperty" value="margin"/>
+        </actionGroup>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
@@ -86,10 +91,15 @@
             <argument name="borderColor" value="PageBuilderAdvancedBorderColorTransparent"/>
             <argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty0"/>
             <argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusDefaultProperty"/>
-            <argument name="margin" value="PageBuilderMarginsPropertyRowDefault"/>
+            <argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
             <argument name="padding" value="PageBuilderPaddingProperty10"/>
             <argument name="index" value="1"/>
         </actionGroup>
+        <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStageAfterSave">
+            <argument name="selector" value="{{RowOnStage.affordance('1')}}"/>
+            <argument name="expectedProperty" value="{{PageBuilderMarginsPropertyRowDefault.value}}"/>
+            <argument name="cssProperty" value="margin"/>
+        </actionGroup>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
             <argument name="contentType" value="PageBuilderRowContentType"/>
         </actionGroup>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/contained/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/contained/preview.html
@@ -11,8 +11,6 @@
     <div class="pagebuilder-affordance-row pagebuilder-content-type pagebuilder-content-type-affordance"
          ko-style="getStyle(data.inner, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight'])"
          event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
-        <div class="pagebuilder-display-label"
-             text="function () { return displayLabel().toUpperCase(); }()"></div>
         <div class="pagebuilder-content-type no-system-border type-container pagebuilder-row children-min-height"
              attr="data.inner.attributes"
              ko-style="getStyleWithout(data.inner, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight'])"
@@ -39,5 +37,7 @@
                  css="placeholderCss()"
                  translate="'Drag content types or columns here'"/>
         </div>
+        <div class="pagebuilder-display-label"
+             text="function () { return displayLabel().toUpperCase(); }()"/>
     </div>
 </div>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-bleed/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-bleed/preview.html
@@ -8,8 +8,6 @@
 <div class="pagebuilder-affordance-row pagebuilder-content-type pagebuilder-content-type-affordance"
      ko-style="getStyle(data.main, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight'])"
      event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
-    <div class="pagebuilder-display-label"
-         text="function () { return displayLabel().toUpperCase(); }()"></div>
     <div class="pagebuilder-content-type type-container no-system-border pagebuilder-row children-min-height"
          attr="data.main.attributes"
          ko-style="getStyleWithout(data.main, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight'])"
@@ -36,4 +34,6 @@
              css="placeholderCss()"
              translate="'Drag content types or columns here'"/>
     </div>
+    <div class="pagebuilder-display-label"
+         text="function () { return displayLabel().toUpperCase(); }()"/>
 </div>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/preview.html
@@ -8,8 +8,6 @@
 <div class="pagebuilder-affordance-row pagebuilder-content-type pagebuilder-content-type-affordance"
      ko-style="getStyle(data.main, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight'])"
      event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
-    <div class="pagebuilder-display-label"
-         text="function () { return displayLabel().toUpperCase(); }()"></div>
     <div class="pagebuilder-content-type pagebuilder-row type-container no-system-border children-min-height"
          attr="data.main.attributes"
          ko-style="getStyleWithout(data.main, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight'])"
@@ -36,4 +34,6 @@
              css="placeholderCss()"
              translate="'Drag content types or columns here'"/>
     </div>
+    <div class="pagebuilder-display-label"
+         text="function () { return displayLabel().toUpperCase(); }()"/>
 </div>
