Skip to content

Commit 0819e00

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

5 files changed

+59
-25
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@
3232
</actionGroup>
3333

3434
<!-- Validate CMS Block Stage Desktop Viewport -->
35-
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSBlockStage" />
35+
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
36+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
37+
</actionGroup>
3638
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3739
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
38-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
40+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
3941
<argument name="index" value="1"/>
4042
</actionGroup>
4143

@@ -49,20 +51,22 @@
4951
<!-- Validate CMS Page Stage Desktop Viewport -->
5052
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5153
<argument name="section" value="ColumnOnFrontend"/>
54+
<argument name="height" value="PageBuilderMinHeightProperty_60"/>
5255
</actionGroup>
5356
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
5457
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
55-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
58+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_60.value}}"/>
5659
<argument name="index" value="1"/>
5760
</actionGroup>
5861

5962
<!-- Validate CMS Page Storefront -->
6063
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
6164
<argument name="section" value="ColumnOnFrontend"/>
65+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
6266
</actionGroup>
6367
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
6468
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
65-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
69+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
6670
<argument name="index" value="1"/>
6771
</actionGroup>
6872

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
</actionGroup>
3232

3333
<!-- Validate CMS Block Stage Desktop Viewport -->
34-
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSBlockStage"/>
34+
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
35+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
36+
</actionGroup>
3537
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3638
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
37-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
39+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
3840
<argument name="index" value="1"/>
3941
</actionGroup>
4042

@@ -48,21 +50,22 @@
4850
<!-- Validate CMS Page Stage Desktop Viewport -->
4951
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5052
<argument name="section" value="ColumnOnFrontend"/>
53+
<argument name="height" value="PageBuilderMinHeightProperty_60"/>
5154
</actionGroup>
5255
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
5356
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
54-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
57+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_60.value}}"/>
5558
<argument name="index" value="1"/>
5659
</actionGroup>
5760

5861
<!-- Validate CMS Page Storefront -->
5962
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
6063
<argument name="section" value="ColumnOnFrontend"/>
61-
<argument name="height" value="PageBuilderMinHeightProperty_300"/>
64+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
6265
</actionGroup>
6366
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
6467
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
65-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
68+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
6669
<argument name="index" value="1"/>
6770
</actionGroup>
6871

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,12 @@
161161
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
162162
<argument name="index" value="1"/>
163163
</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>
164+
<actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSBlockStage">
165+
<argument name="page" value="ColumnOnBackend"/>
166+
<argument name="index" value="1"/>
167+
<argument name="minHeight" value="PageBuilderMinHeightProperty_Auto"/>
168+
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
169+
</actionGroup>
169170
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
170171
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
171172
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
@@ -277,6 +278,7 @@
277278
</actionGroup>
278279
<actionGroup ref="validateColumnAppearanceFullHeight" stepKey="validateColumn1AppearanceCMSPageStorefront">
279280
<argument name="section" value="ColumnOnFrontend"/>
281+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
280282
</actionGroup>
281283
<actionGroup ref="ValidateBackgroundConfigurationWithNoImageActionGroup" stepKey="validateBackgroundCMSPageStorefront">
282284
<argument name="section" value="ColumnOnFrontend"/>
@@ -293,14 +295,15 @@
293295
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
294296
<argument name="index" value="1"/>
295297
</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>
298+
<actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSPageStorefront">
299+
<argument name="page" value="ColumnOnFrontend"/>
300+
<argument name="index" value="1"/>
301+
<argument name="minHeight" value="PageBuilderMinHeightProperty_Auto"/>
302+
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
303+
</actionGroup>
301304
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
302305
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
303-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
306+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
304307
<argument name="index" value="1"/>
305308
</actionGroup>
306309
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStorefront">

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@
3131
</actionGroup>
3232

3333
<!-- Validate CMS Block Stage Desktop Viewport -->
34-
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSBlockStage"/>
34+
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
35+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
36+
</actionGroup>
3537
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3638
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
37-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_300.value}}"/>
39+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
3840
<argument name="index" value="1"/>
3941
</actionGroup>
4042

@@ -48,21 +50,22 @@
4850
<!-- Validate CMS Page Stage Desktop Viewport -->
4951
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5052
<argument name="section" value="ColumnOnFrontend"/>
53+
<argument name="height" value="PageBuilderMinHeightProperty_60"/>
5154
</actionGroup>
5255
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
5356
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
54-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
57+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_60.value}}"/>
5558
<argument name="index" value="1"/>
5659
</actionGroup>
5760

5861
<!-- Validate CMS Page Storefront -->
5962
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
6063
<argument name="section" value="ColumnOnFrontend"/>
61-
<argument name="height" value="PageBuilderMinHeightProperty_300"/>
64+
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
6265
</actionGroup>
6366
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
6467
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
65-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
68+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
6669
<argument name="index" value="1"/>
6770
</actionGroup>
6871

0 commit comments

Comments
 (0)