Skip to content

Commit c11575e

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

8 files changed

+33
-43
lines changed

‎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/ViewportSwitcherMobileColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
</actionGroup>
3333

3434
<!-- Validate CMS Block Stage Desktop Viewport -->
35-
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
36-
<argument name="height" value="PageBuilderMinHeightProperty_300"/>
37-
</actionGroup>
35+
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSBlockStage" />
3836
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3937
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
4038
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
@@ -51,22 +49,20 @@
5149
<!-- Validate CMS Page Stage Desktop Viewport -->
5250
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5351
<argument name="section" value="ColumnOnFrontend"/>
54-
<argument name="height" value="PageBuilderMinHeightProperty_300"/>
5552
</actionGroup>
5653
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
5754
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
58-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
55+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
5956
<argument name="index" value="1"/>
6057
</actionGroup>
6158

6259
<!-- Validate CMS Page Storefront -->
6360
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
6461
<argument name="section" value="ColumnOnFrontend"/>
65-
<argument name="height" value="PageBuilderMinHeightProperty_300"/>
6662
</actionGroup>
6763
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
6864
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
69-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
65+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
7066
<argument name="index" value="1"/>
7167
</actionGroup>
7268

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
</actionGroup>
3232

3333
<!-- Validate CMS Block Stage Desktop Viewport -->
34-
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
35-
<argument name="height" value="PageBuilderMinHeightProperty_300"/>
36-
</actionGroup>
34+
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSBlockStage"/>
3735
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3836
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
3937
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
@@ -50,11 +48,10 @@
5048
<!-- Validate CMS Page Stage Desktop Viewport -->
5149
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5250
<argument name="section" value="ColumnOnFrontend"/>
53-
<argument name="height" value="PageBuilderMinHeightProperty_300"/>
5451
</actionGroup>
5552
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
5653
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
57-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
54+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
5855
<argument name="index" value="1"/>
5956
</actionGroup>
6057

@@ -65,7 +62,7 @@
6562
</actionGroup>
6663
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
6764
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
68-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
65+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
6966
<argument name="index" value="1"/>
7067
</actionGroup>
7168

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,15 @@
248248
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
249249
<argument name="index" value="1"/>
250250
</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>
251+
<actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSPageStage">
252+
<argument name="page" value="ColumnOnFrontend"/>
253+
<argument name="index" value="1"/>
254+
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
255+
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
256+
</actionGroup>
256257
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
257258
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
258-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
259+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
259260
<argument name="index" value="1"/>
260261
</actionGroup>
261262
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStage">
@@ -292,15 +293,14 @@
292293
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
293294
<argument name="index" value="1"/>
294295
</actionGroup>
295-
<actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSPageStorefront">
296-
<argument name="page" value="ColumnOnFrontend"/>
297-
<argument name="index" value="1"/>
298-
<argument name="minHeight" value="PageBuilderMinHeightProperty_300"/>
299-
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
300-
</actionGroup>
296+
<executeJS function="return window.getComputedStyle(document.evaluate('{{ColumnOnFrontend.base('1')}}', document.body).iterateNext()).minHeight.replace(/px/g, &quot;&quot;)" stepKey="grabMinHeightValueCmsPageStorefront"/>
297+
<assertEquals stepKey="assertMinHeightInCmsPageStorefront">
298+
<expectedResult type="string">auto</expectedResult>
299+
<actualResult type="variable">grabMinHeightValueCmsPageStorefront</actualResult>
300+
</assertEquals>
301301
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
302302
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
303-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
303+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
304304
<argument name="index" value="1"/>
305305
</actionGroup>
306306
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStorefront">

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131
</actionGroup>
3232

3333
<!-- Validate CMS Block Stage Desktop Viewport -->
34-
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
35-
<argument name="height" value="PageBuilderMinHeightProperty_300"/>
36-
</actionGroup>
34+
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSBlockStage"/>
3735
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3836
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
3937
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
@@ -50,11 +48,10 @@
5048
<!-- Validate CMS Page Stage Desktop Viewport -->
5149
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5250
<argument name="section" value="ColumnOnFrontend"/>
53-
<argument name="height" value="PageBuilderMinHeightProperty_300"/>
5451
</actionGroup>
5552
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
5653
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
57-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
54+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
5855
<argument name="index" value="1"/>
5956
</actionGroup>
6057

@@ -65,7 +62,7 @@
6562
</actionGroup>
6663
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
6764
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
68-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
65+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
6966
<argument name="index" value="1"/>
7067
</actionGroup>
7168

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,13 @@
133133
<executeJS function="return window.innerHeight;" stepKey="viewportHeightCMSPageStage"/>
134134
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightCMSPageStage">
135135
<argument name="selector" value="{{RowOnStorefront.base('2')}}"/>
136-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
136+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_0.value}}"/>
137137
<argument name="cssProperty" value="minHeight"/>
138138
</actionGroup>
139139
<executeJS function="return document.evaluate('{{RowOnStorefront.base('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSPageStage"/>
140140
<assertEquals stepKey="assertFirstMinHeightCMSPageStage">
141141
<actualResult type="variable">firstMinHeightCMSPageStage</actualResult>
142-
<expectedResult type="string">{{PageBuilderMinHeightProperty_300px.intValue}}</expectedResult>
142+
<expectedResult type="string">{{PageBuilderMinHeightProperty_0.value}}</expectedResult>
143143
</assertEquals>
144144

145145
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
@@ -151,13 +151,13 @@
151151
<executeJS function="return window.innerHeight;" stepKey="viewportHeightStorefront"/>
152152
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightStorefront">
153153
<argument name="selector" value="{{RowOnStorefront.base('2')}}"/>
154-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_300px.intValue}}"/>
154+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_0.value}}"/>
155155
<argument name="cssProperty" value="minHeight"/>
156156
</actionGroup>
157157
<executeJS function="return document.evaluate('{{RowOnStorefront.base('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefront"/>
158158
<assertEquals stepKey="assertFirstMinHeightStorefront">
159159
<actualResult type="variable">firstMinHeightStorefront</actualResult>
160-
<expectedResult type="string">{{PageBuilderMinHeightProperty_300px.intValue}}</expectedResult>
160+
<expectedResult type="string">{{PageBuilderMinHeightProperty_0.value}}</expectedResult>
161161
</assertEquals>
162162
<!-- Validate Storefront Mobile -->
163163
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
<!-- Validate CMS Page Stage Desktop Viewport -->
3636
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightCMSPageStage">
3737
<argument name="selector" value="{{RowOnStorefront_FullWidth_FullBleed.base('2')}}"/>
38-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
38+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_0.value}}"/>
3939
<argument name="cssProperty" value="minHeight"/>
4040
</actionGroup>
4141
<executeJS function="return document.evaluate('{{RowOnStorefront_FullWidth_FullBleed.base('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSPageStage"/>
4242

4343
<!-- Validate Storefront -->
4444
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightStorefront">
4545
<argument name="selector" value="{{RowOnStorefront_FullWidth_FullBleed.base('2')}}"/>
46-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
46+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_0.value}}"/>
4747
<argument name="cssProperty" value="minHeight"/>
4848
</actionGroup>
4949
<executeJS function="return document.evaluate('{{RowOnStorefront_FullWidth_FullBleed.base('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefront"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@
3535
<!-- Validate CMS Page Stage Desktop Viewport -->
3636
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightCMSPageStage">
3737
<argument name="selector" value="{{RowOnStorefront_FullWidth_FullBleed.base('2')}}"/>
38-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
38+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_0.value}}"/>
3939
<argument name="cssProperty" value="minHeight"/>
4040
</actionGroup>
4141
<executeJS function="return document.evaluate('{{RowOnStorefront_FullWidth_FullBleed.base('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSPageStage"/>
4242

4343
<!-- Validate Storefront -->
4444
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightStorefront">
4545
<argument name="selector" value="{{RowOnStorefront_FullWidth_FullBleed.base('2')}}"/>
46-
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
46+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_0.value}}"/>
4747
<argument name="cssProperty" value="minHeight"/>
4848
</actionGroup>
4949
<executeJS function="return document.evaluate('{{RowOnStorefront_FullWidth_FullBleed.base('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefront"/>

0 commit comments

Comments
 (0)