Skip to content

Commit ac99b34

Browse files
author
joiecaquicla
committed
magento2/magento2-page-builder#637: Form field/field group viewport scope - fixed failed functional tests
1 parent 1ca5f11 commit ac99b34

12 files changed

+104
-63
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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="addTextToTinyMCEMobile">
11+
<arguments>
12+
<argument name="property" defaultValue=""/>
13+
<argument name="section" defaultValue="TextOnConfiguration"/>
14+
</arguments>
15+
<comment userInput="Adding Text To Tiny MCE Mobile Form" stepKey="commentAddTextToTinyMCE"/>
16+
<waitForElementVisible selector="#{{section.tinyMCEIFrameMobile}}" stepKey="waitForIFrame"/>
17+
<executeJS function="tinymce.activeEditor.setContent(tinymce.activeEditor.getContent() + '{{property.value}}')" stepKey="addTextToWYSIWYG"/>
18+
<!-- Must click Tiny MCE or form will not recognize that text has been added -->
19+
<click selector="#{{section.tinyMCEIFrameMobile}}" stepKey="clickIFrame"/>
20+
<switchToIFrame selector="{{section.tinyMCEIFrameMobile}}" stepKey="switchToIFrame"/>
21+
<waitForElementVisible selector="{{section.textInIFrame(property.value)}}" stepKey="waitForTextVisible"/>
22+
<switchToIFrame stepKey="exitIFrame"/>
23+
</actionGroup>
24+
</actionGroups>

‎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/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="addTextToTinyMCEMobile" 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_300"/>
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_300.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_300"/>
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_300.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_300"/>
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_300.value}}"/>
7070
<argument name="index" value="1"/>
7171
</actionGroup>
7272

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

Lines changed: 6 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_300"/>
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_300.value}}"/>
4040
<argument name="index" value="1"/>
4141
</actionGroup>
4242

@@ -50,22 +50,22 @@
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_300"/>
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_300.value}}"/>
5858
<argument name="index" value="1"/>
5959
</actionGroup>
6060

6161
<!-- Validate CMS Page Storefront -->
6262
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
6363
<argument name="section" value="ColumnOnFrontend"/>
64-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
64+
<argument name="height" value="PageBuilderMinHeightProperty_300"/>
6565
</actionGroup>
6666
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
6767
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
68-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
68+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
6969
<argument name="index" value="1"/>
7070
</actionGroup>
7171

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

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,25 @@
113113
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
114114
<argument name="containerTargetIndex" value="1"/>
115115
</actionGroup>
116+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
117+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
118+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
116119
<!-- Validate CMS Block Stage in Mobile Viewport -->
120+
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewport">
121+
<argument name="viewportButton" value="mobile"/>
122+
<argument name="viewportStage" value="mobile"/>
123+
</actionGroup>
117124
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageCMSBlockStageMobile">
118125
<argument name="section" value="ColumnOnBackend"/>
119126
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_GIF"/>
120127
<argument name="index" value="1"/>
121128
</actionGroup>
129+
<actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSBlockStageMobile">
130+
<argument name="page" value="ColumnOnBackend"/>
131+
<argument name="index" value="1"/>
132+
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
133+
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
134+
</actionGroup>
122135
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStageMobile">
123136
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
124137
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
@@ -148,23 +161,20 @@
148161
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
149162
<argument name="index" value="1"/>
150163
</actionGroup>
151-
<actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSBlockStage">
152-
<argument name="page" value="ColumnOnBackend"/>
153-
<argument name="index" value="1"/>
154-
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
155-
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
156-
</actionGroup>
164+
<executeJS function="return window.getComputedStyle(document.evaluate('{{ColumnOnBackend.base('1')}}', document.body).iterateNext()).minHeight.replace(/px/g, &quot;&quot;)" stepKey="grabMinHeightValueCmsBlockStage"/>
165+
<assertEquals stepKey="assertMinHeightInCmsBlockStageDesktop">
166+
<expectedResult type="string">auto</expectedResult>
167+
<actualResult type="variable">grabMinHeightValueCmsBlockStage</actualResult>
168+
</assertEquals>
157169
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
158170
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
159-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
171+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
160172
<argument name="index" value="1"/>
161173
</actionGroup>
162174
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSBlockStage">
163175
<argument name="page" value="DividerOnStage"/>
164176
</actionGroup>
165177

166-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
167-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
168178
<!-- Add Block to CMS Page -->
169179
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
170180
<argument name="CMSPage" value="$$createCMSPage$$"/>
@@ -193,6 +203,12 @@
193203
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_GIF"/>
194204
<argument name="index" value="1"/>
195205
</actionGroup>
206+
<actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSPageStageMobile">
207+
<argument name="page" value="ColumnOnFrontend"/>
208+
<argument name="index" value="1"/>
209+
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
210+
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
211+
</actionGroup>
196212
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStageMobile">
197213
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
198214
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
@@ -232,15 +248,14 @@
232248
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
233249
<argument name="index" value="1"/>
234250
</actionGroup>
235-
<actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSPageStage">
236-
<argument name="page" value="ColumnOnFrontend"/>
237-
<argument name="index" value="1"/>
238-
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
239-
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
240-
</actionGroup>
251+
<executeJS function="return window.getComputedStyle(document.evaluate('{{ColumnOnBackend.base('1')}}', document.body).iterateNext()).minHeight.replace(/px/g, &quot;&quot;)" stepKey="grabMinHeightValueCmsPageStage"/>
252+
<assertEquals stepKey="assertMinHeightInCmsPageStageDesktop">
253+
<expectedResult type="string">auto</expectedResult>
254+
<actualResult type="variable">grabMinHeightValueCmsPageStage</actualResult>
255+
</assertEquals>
241256
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
242257
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
243-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
258+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
244259
<argument name="index" value="1"/>
245260
</actionGroup>
246261
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStage">
@@ -280,12 +295,12 @@
280295
<actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSPageStorefront">
281296
<argument name="page" value="ColumnOnFrontend"/>
282297
<argument name="index" value="1"/>
283-
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
298+
<argument name="minHeight" value="PageBuilderMinHeightProperty_300"/>
284299
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
285300
</actionGroup>
286301
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
287302
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
288-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
303+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
289304
<argument name="index" value="1"/>
290305
</actionGroup>
291306
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStorefront">

0 commit comments

Comments
 (0)