Skip to content

Commit 69ba9cc

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #675 from joweecaquicla/637-apply-scope-to-content-types
#637: Form field/field group viewport scope - fixed failed functional tests
2 parents c621b15 + 7d5db6c commit 69ba9cc

16 files changed

+130
-60
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEMobileFormActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AddTextToTinyMCEMobileFormActionGroup" extends="addTextToTinyMCE">
11+
<annotations>
12+
<description>Adds content to the TinyMCE editor on a content type's edit panel when editing in the mobile viewport.</description>
13+
</annotations>
14+
<waitForElementVisible selector="#{{section.tinyMCEIFrameMobile}}" stepKey="waitForIFrame"/>
15+
<click selector="#{{section.tinyMCEIFrameMobile}}" stepKey="clickIFrame"/>
16+
<switchToIFrame selector="{{section.tinyMCEIFrameMobile}}" stepKey="switchToIFrame"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,20 @@
2121
<data key="value">0</data>
2222
<data key="style">min-height: 0px</data>
2323
</entity>
24+
<entity name="PageBuilderMinHeightProperty_60" type="pagebuilder_min_height_property">
25+
<data key="name">Minimum Height</data>
26+
<data key="section">appearance_fieldset</data>
27+
<data key="fieldName">min_height</data>
28+
<data key="value">60</data>
29+
<data key="style">min-height: 60px</data>
30+
</entity>
31+
<entity name="PageBuilderMinHeightProperty_85" type="pagebuilder_min_height_property">
32+
<data key="name">Minimum Height</data>
33+
<data key="section">appearance_fieldset</data>
34+
<data key="fieldName">min_height</data>
35+
<data key="value">85</data>
36+
<data key="style">min-height: 85px</data>
37+
</entity>
2438
<entity name="PageBuilderMinHeightProperty_500" type="pagebuilder_min_height_property">
2539
<data key="name">Minimum Height</data>
2640
<data key="section">appearance_fieldset</data>
@@ -95,6 +109,13 @@
95109
<data key="value">calc(100vh - 200px)</data>
96110
<data key="style">min-height: calc(100vh - 200px)</data>
97111
</entity>
112+
<entity name="PageBuilderMinHeightProperty_Auto" type="pagebuilder_min_height_property">
113+
<data key="name">Minimum Height</data>
114+
<data key="section">appearance_fieldset</data>
115+
<data key="fieldName">min_height</data>
116+
<data key="value">auto</data>
117+
<data key="style">min-height: auto</data>
118+
</entity>
98119
<entity name="PageBuilderMinHeightProperty_NonNumeric" type="pagebuilder_min_height_property">
99120
<data key="name">Minimum Height</data>
100121
<data key="section">appearance_fieldset</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnConfigurationPanelSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<section name="BannerOnConfigurationPanel">
1111
<element name="textArea" type="text" selector="#pagebuilder_banner_form_message"/>
1212
<element name="tinyMCEIFrame" type="text" selector="pagebuilder_banner_form_message_ifr"/>
13+
<element name="tinyMCEIFrameMobile" type="text" selector="pagebuilder_banner_mobile_form_message_ifr"/>
1314
<element name="textInIFrame" type="text" selector="//body//p[.='{{text}}']" parameterized="true"/>
1415
</section>
1516
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnConfigurationPanelSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<section name="SlideOnConfigurationPanel">
1111
<element name="textArea" type="text" selector="#pagebuilder_slide_form_content"/>
1212
<element name="tinyMCEIFrame" type="text" selector="pagebuilder_slide_form_content_ifr"/>
13+
<element name="tinyMCEIFrameMobile" type="text" selector="pagebuilder_slide_mobile_form_content_ifr"/>
1314
<element name="textInIFrame" type="text" selector="//body//p[.='{{text}}']" parameterized="true"/>
1415
</section>
1516
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageCenteredAppearanceThroughBlockContentTypeTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</actionGroup>
4949
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSBlockStageDesktop">
5050
<argument name="selector" value="{{BannerOnBackend.wrapper('1')}}"/>
51-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
51+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
5252
<argument name="cssProperty" value="minHeight"/>
5353
</actionGroup>
5454
<moveMouseOver selector="{{BannerOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverBannerCMSBlockStageDesktop"/>
@@ -75,7 +75,7 @@
7575
</actionGroup>
7676
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSPageStageDesktop">
7777
<argument name="selector" value="{{BannerOnFrontend.wrapper('1')}}"/>
78-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
78+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
7979
<argument name="cssProperty" value="minHeight"/>
8080
</actionGroup>
8181
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStageDesktop"/>
@@ -87,7 +87,7 @@
8787
</actionGroup>
8888
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSPageStorefront">
8989
<argument name="selector" value="{{BannerOnFrontend.wrapper('1')}}"/>
90-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
90+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
9191
<argument name="cssProperty" value="minHeight"/>
9292
</actionGroup>
9393
<moveMouseOver selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverBannerCMSPageStorefront"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerPosterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="setBackgroundRepeat">
8989
<argument name="property" value="PageBuilderBackgroundRepeat_Enabled"/>
9090
</actionGroup>
91-
<actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCE">
91+
<actionGroup ref="AddTextToTinyMCEMobileFormActionGroup" stepKey="addTextToTinyMCE">
9292
<argument name="property" value="PageBuilderBannerMessageProperty"/>
9393
<argument name="section" value="BannerOnConfigurationPanel"/>
9494
</actionGroup>
@@ -187,12 +187,12 @@
187187
</actionGroup>
188188
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSBlockStageDesktop">
189189
<argument name="selector" value="{{BannerOnBackend.overlay('1')}}"/>
190-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
190+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
191191
<argument name="cssProperty" value="minHeight"/>
192192
</actionGroup>
193193
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSBlockStageDesktop">
194194
<argument name="content" value="{{BannerOnBackend.wrapperCSS}}"/>
195-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
195+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
196196
</actionGroup>
197197
<actionGroup ref="ValidateBackgroundConfigurationWithNoImageActionGroup" stepKey="validateBackgroundAttributesCMSBlockStageDesktop">
198198
<argument name="section" value="BannerOnBackend"/>
@@ -316,12 +316,12 @@
316316
</actionGroup>
317317
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSPageStageDesktop">
318318
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
319-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
319+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
320320
<argument name="cssProperty" value="minHeight"/>
321321
</actionGroup>
322322
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSPageStageDesktop">
323323
<argument name="content" value="{{BannerOnFrontend.wrapperCSS}}"/>
324-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
324+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
325325
</actionGroup>
326326
<actionGroup ref="ValidateBackgroundConfigurationWithNoImageActionGroup" stepKey="validateBackgroundAttributesCMSPageStageDesktop">
327327
<argument name="section" value="BannerOnFrontend"/>
@@ -368,12 +368,12 @@
368368
</actionGroup>
369369
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSPageStorefront">
370370
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
371-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
371+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
372372
<argument name="cssProperty" value="minHeight"/>
373373
</actionGroup>
374374
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSPageStorefront">
375375
<argument name="content" value="{{BannerOnFrontend.wrapperCSS}}"/>
376-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
376+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
377377
</actionGroup>
378378
<actionGroup ref="ValidateBackgroundConfigurationWithNoImageActionGroup" stepKey="validateBackgroundAttributesCMSPageStorefront">
379379
<argument name="section" value="BannerOnFrontend"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333

3434
<!-- Validate CMS Block Stage Desktop Viewport -->
3535
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
36-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
36+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
3737
</actionGroup>
3838
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3939
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
40-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
40+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
4141
<argument name="index" value="1"/>
4242
</actionGroup>
4343

@@ -51,22 +51,22 @@
5151
<!-- Validate CMS Page Stage Desktop Viewport -->
5252
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5353
<argument name="section" value="ColumnOnFrontend"/>
54-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
54+
<argument name="height" value="PageBuilderMinHeightProperty_60"/>
5555
</actionGroup>
5656
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
5757
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
58-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
58+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_60.value}}"/>
5959
<argument name="index" value="1"/>
6060
</actionGroup>
6161

6262
<!-- Validate CMS Page Storefront -->
6363
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
6464
<argument name="section" value="ColumnOnFrontend"/>
65-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
65+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
6666
</actionGroup>
6767
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
6868
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
69-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
69+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
7070
<argument name="index" value="1"/>
7171
</actionGroup>
7272

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232

3333
<!-- Validate CMS Block Stage Desktop Viewport -->
3434
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
35-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
35+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
3636
</actionGroup>
3737
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3838
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
39-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
39+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
4040
<argument name="index" value="1"/>
4141
</actionGroup>
4242

@@ -50,22 +50,28 @@
5050
<!-- Validate CMS Page Stage Desktop Viewport -->
5151
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5252
<argument name="section" value="ColumnOnFrontend"/>
53-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
53+
<argument name="height" value="PageBuilderMinHeightProperty_60"/>
5454
</actionGroup>
5555
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
5656
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
57-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
57+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_60.value}}"/>
5858
<argument name="index" value="1"/>
5959
</actionGroup>
6060

6161
<!-- Validate CMS Page Storefront -->
62+
<actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSPageStage">
63+
<argument name="page" value="ColumnOnFrontend"/>
64+
<argument name="index" value="1"/>
65+
<argument name="minHeight" value="PageBuilderMinHeightProperty_Auto"/>
66+
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
67+
</actionGroup>
6268
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
6369
<argument name="section" value="ColumnOnFrontend"/>
64-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
70+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
6571
</actionGroup>
6672
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
6773
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
68-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
74+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
6975
<argument name="index" value="1"/>
7076
</actionGroup>
7177

0 commit comments

Comments
 (0)