Skip to content

Commit a335cac

Browse files
author
joiecaquicla
committed
magento2/magento2-page-builder#636: Responsive breakpoint switcher - fix failed functional tests
1 parent 95bc017 commit a335cac

4 files changed

+126
-46
lines changed

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

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,12 @@
5959
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
6060
<!-- Validate CMS Block Stage in Mobile Viewport -->
6161
<executeJS function="return window.innerHeight;" stepKey="viewportHeightCMSBlockStageMobile"/>
62-
<seeElement selector="{{RowOnStage.minHeight('1', PageBuilderMinHeightProperty_200px.value)}}" stepKey="seeFirstMinHeightCMSBlockStageMobile"/>
63-
<executeJS function="return document.evaluate(&quot;{{RowOnStage.base('1')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSBlockStageMobile"/>
62+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightCMSBlockStageMobile">
63+
<argument name="selector" value="{{RowOnStage.base('1')}}"/>
64+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
65+
<argument name="cssProperty" value="minHeight"/>
66+
</actionGroup>
67+
<executeJS function="return document.evaluate('{{RowOnStage.base('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSBlockStageMobile"/>
6468
<assertEquals stepKey="assertFirstMinHeightCMSBlockStageMobile">
6569
<actualResult type="variable">firstMinHeightCMSBlockStageMobile</actualResult>
6670
<expectedResult type="string">{{PageBuilderMinHeightProperty_200px.intValue}}</expectedResult>
@@ -72,8 +76,12 @@
7276
<argument name="viewportStage" value="desktop"/>
7377
</actionGroup>
7478
<executeJS function="return window.innerHeight;" stepKey="viewportHeightCMSBlockStage"/>
75-
<seeElement selector="{{RowOnStage.minHeight('1', PageBuilderMinHeightProperty_200px.value)}}" stepKey="seeFirstMinHeightCMSBlockStage"/>
76-
<executeJS function="return document.evaluate(&quot;{{RowOnStage.base('1')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSBlockStage"/>
79+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightCMSBlockStage">
80+
<argument name="selector" value="{{RowOnStage.base('1')}}"/>
81+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
82+
<argument name="cssProperty" value="minHeight"/>
83+
</actionGroup>
84+
<executeJS function="return document.evaluate('{{RowOnStage.base('1')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSBlockStage"/>
7785
<assertEquals stepKey="assertFirstMinHeightCMSBlockStage">
7886
<actualResult type="variable">firstMinHeightCMSBlockStage</actualResult>
7987
<expectedResult type="string">{{PageBuilderMinHeightProperty_200px.intValue}}</expectedResult>
@@ -106,8 +114,12 @@
106114

107115
<!-- Validate CMS Page Stage Mobile Viewport -->
108116
<executeJS function="return window.innerHeight;" stepKey="viewportHeightCMSPageStageMobile"/>
109-
<seeElement selector="{{RowOnStorefront.minHeight('2', PageBuilderMinHeightProperty_200px.value)}}" stepKey="seeFirstMinHeightCMSPageStageMobile"/>
110-
<executeJS function="return document.evaluate(&quot;{{RowOnStorefront.base('2')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSPageStageMobile"/>
117+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightCMSPageStageMobile">
118+
<argument name="selector" value="{{RowOnStorefront.base('2')}}"/>
119+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
120+
<argument name="cssProperty" value="minHeight"/>
121+
</actionGroup>
122+
<executeJS function="return document.evaluate('{{RowOnStorefront.base('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSPageStageMobile"/>
111123
<assertEquals stepKey="assertFirstMinHeightCMSPageStageMobile">
112124
<actualResult type="variable">firstMinHeightCMSPageStageMobile</actualResult>
113125
<expectedResult type="string">{{PageBuilderMinHeightProperty_200px.intValue}}</expectedResult>
@@ -119,8 +131,12 @@
119131
<argument name="viewportStage" value="desktop"/>
120132
</actionGroup>
121133
<executeJS function="return window.innerHeight;" stepKey="viewportHeightCMSPageStage"/>
122-
<seeElement selector="{{RowOnStorefront.minHeight('2', PageBuilderMinHeightProperty_200px.value)}}" stepKey="seeFirstMinHeightCMSPageStage"/>
123-
<executeJS function="return document.evaluate(&quot;{{RowOnStorefront.base('2')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSPageStage"/>
134+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightCMSPageStage">
135+
<argument name="selector" value="{{RowOnStorefront.base('2')}}"/>
136+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
137+
<argument name="cssProperty" value="minHeight"/>
138+
</actionGroup>
139+
<executeJS function="return document.evaluate('{{RowOnStorefront.base('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightCMSPageStage"/>
124140
<assertEquals stepKey="assertFirstMinHeightCMSPageStage">
125141
<actualResult type="variable">firstMinHeightCMSPageStage</actualResult>
126142
<expectedResult type="string">{{PageBuilderMinHeightProperty_200px.intValue}}</expectedResult>
@@ -133,17 +149,25 @@
133149
<argument name="page" value="$$createCMSPage.identifier$$"/>
134150
</actionGroup>
135151
<executeJS function="return window.innerHeight;" stepKey="viewportHeightStorefront"/>
136-
<seeElement selector="{{RowOnStorefront.minHeight('2', PageBuilderMinHeightProperty_200px.value)}}" stepKey="seeFirstMinHeightStorefront"/>
137-
<executeJS function="return document.evaluate(&quot;{{RowOnStorefront.base('2')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefront"/>
152+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightStorefront">
153+
<argument name="selector" value="{{RowOnStorefront.base('2')}}"/>
154+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
155+
<argument name="cssProperty" value="minHeight"/>
156+
</actionGroup>
157+
<executeJS function="return document.evaluate('{{RowOnStorefront.base('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefront"/>
138158
<assertEquals stepKey="assertFirstMinHeightStorefront">
139159
<actualResult type="variable">firstMinHeightStorefront</actualResult>
140160
<expectedResult type="string">{{PageBuilderMinHeightProperty_200px.intValue}}</expectedResult>
141161
</assertEquals>
142162
<!-- Validate Storefront Mobile -->
143163
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
144164
<executeJS function="return window.innerHeight;" stepKey="viewportHeightStorefrontMobile"/>
145-
<seeElement selector="{{RowOnStorefront.minHeight('2', PageBuilderMinHeightProperty_200px.value)}}" stepKey="seeFirstMinHeightStorefrontMobile"/>
146-
<executeJS function="return document.evaluate(&quot;{{RowOnStorefront.base('2')}}&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefrontMobile"/>
165+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeFirstMinHeightStorefrontMobile">
166+
<argument name="selector" value="{{RowOnStorefront.base('2')}}"/>
167+
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_200px.intValue}}"/>
168+
<argument name="cssProperty" value="minHeight"/>
169+
</actionGroup>
170+
<executeJS function="return document.evaluate('{{RowOnStorefront.base('2')}}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.getBoundingClientRect().height" stepKey="firstMinHeightStorefrontMobile"/>
147171
<assertEquals stepKey="assertFirstMinHeightStorefrontMobile">
148172
<actualResult type="variable">firstMinHeightStorefrontMobile</actualResult>
149173
<expectedResult type="string">{{PageBuilderMinHeightProperty_200px.intValue}}</expectedResult>

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

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,13 @@
6262
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsDivider"/>
6363

6464
<!-- Validate CMS Block Stage on Mobile Viewport -->
65-
<seeElement selector="{{DividerOnStage.color('1', PageBuilderDividerLineColor_Yellow.rgb)}}" stepKey="seeDividerColorCMSBlockStageMobile"/>
66-
<seeElement selector="{{DividerOnStage.thickness('1', PageBuilderDividerLineThickness_10.value)}}" stepKey="seeDividerThicknessCMSBlockStageMobile"/>
67-
<seeElement selector="{{DividerOnStage.width('1', PageBuilderDividerLineWidth_50.value)}}" stepKey="seeDividerWidthCMSBlockStageMobile"/>
65+
<actionGroup ref="ValidateDividerGeneralAttributesActionGroup" stepKey="seeDividerColorCMSBlockStageMobile">
66+
<argument name="page" value="DividerOnStage"/>
67+
<argument name="lineColor" value="PageBuilderDividerLineColor_Yellow"/>
68+
<argument name="lineThickness" value="PageBuilderDividerLineThickness_10"/>
69+
<argument name="lineWidth" value="PageBuilderDividerLineWidth_50"/>
70+
<argument name="index" value="1"/>
71+
</actionGroup>
6872
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSBlockStageMobile">
6973
<argument name="page" value="DividerOnStage"/>
7074
<argument name="dividerWidth" value="PageBuilderDividerLineWidth_50"/>
@@ -75,9 +79,13 @@
7579
<argument name="viewportButton" value="desktop"/>
7680
<argument name="viewportStage" value="desktop"/>
7781
</actionGroup>
78-
<seeElement selector="{{DividerOnStage.color('1', PageBuilderDividerLineColor_Yellow.rgb)}}" stepKey="seeDividerColorCMSBlockStage"/>
79-
<seeElement selector="{{DividerOnStage.thickness('1', PageBuilderDividerLineThickness_10.value)}}" stepKey="seeDividerThicknessCMSBlockStage"/>
80-
<seeElement selector="{{DividerOnStage.width('1', PageBuilderDividerLineWidth_50.value)}}" stepKey="seeDividerWidthCMSBlockStage"/>
82+
<actionGroup ref="ValidateDividerGeneralAttributesActionGroup" stepKey="seeDividerColorCMSBlockStage">
83+
<argument name="page" value="DividerOnStage"/>
84+
<argument name="lineColor" value="PageBuilderDividerLineColor_Yellow"/>
85+
<argument name="lineThickness" value="PageBuilderDividerLineThickness_10"/>
86+
<argument name="lineWidth" value="PageBuilderDividerLineWidth_50"/>
87+
<argument name="index" value="1"/>
88+
</actionGroup>
8189
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSBlockStage">
8290
<argument name="page" value="DividerOnStage"/>
8391
<argument name="dividerWidth" value="PageBuilderDividerLineWidth_50"/>
@@ -110,9 +118,13 @@
110118
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlock"/>
111119

112120
<!-- Validate CMS Page Stage Mobile Viewport -->
113-
<seeElement selector="{{DividerOnStorefront.color('1', PageBuilderDividerLineColor_Yellow.rgb)}}" stepKey="seeDividerColorCMSPageStageMobile"/>
114-
<seeElement selector="{{DividerOnStorefront.thickness('1', PageBuilderDividerLineThickness_10.value)}}" stepKey="seeDividerThicknessCMSPageStageMobile"/>
115-
<seeElement selector="{{DividerOnStorefront.width('1', PageBuilderDividerLineWidth_50.value)}}" stepKey="seeDividerWidthCMSPageStageMobile"/>
121+
<actionGroup ref="ValidateDividerGeneralAttributesActionGroup" stepKey="seeDividerColorCMSPageStageMobile">
122+
<argument name="page" value="DividerOnStorefront"/>
123+
<argument name="lineColor" value="PageBuilderDividerLineColor_Yellow"/>
124+
<argument name="lineThickness" value="PageBuilderDividerLineThickness_10"/>
125+
<argument name="lineWidth" value="PageBuilderDividerLineWidth_50"/>
126+
<argument name="index" value="1"/>
127+
</actionGroup>
116128
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSPageStageMobile">
117129
<argument name="page" value="DividerOnStorefront"/>
118130
<argument name="dividerWidth" value="PageBuilderDividerLineWidth_50"/>
@@ -124,9 +136,13 @@
124136
<argument name="viewportButton" value="desktop"/>
125137
<argument name="viewportStage" value="desktop"/>
126138
</actionGroup>
127-
<seeElement selector="{{DividerOnStorefront.color('1', PageBuilderDividerLineColor_Yellow.rgb)}}" stepKey="seeDividerColorCMSPageStage"/>
128-
<seeElement selector="{{DividerOnStorefront.thickness('1', PageBuilderDividerLineThickness_10.value)}}" stepKey="seeDividerThicknessCMSPageStage"/>
129-
<seeElement selector="{{DividerOnStorefront.width('1', PageBuilderDividerLineWidth_50.value)}}" stepKey="seeDividerWidthCMSPageStage"/>
139+
<actionGroup ref="ValidateDividerGeneralAttributesActionGroup" stepKey="seeDividerColorCMSPageStage">
140+
<argument name="page" value="DividerOnStorefront"/>
141+
<argument name="lineColor" value="PageBuilderDividerLineColor_Yellow"/>
142+
<argument name="lineThickness" value="PageBuilderDividerLineThickness_10"/>
143+
<argument name="lineWidth" value="PageBuilderDividerLineWidth_50"/>
144+
<argument name="index" value="1"/>
145+
</actionGroup>
130146
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSPageStage">
131147
<argument name="page" value="DividerOnStorefront"/>
132148
<argument name="dividerWidth" value="PageBuilderDividerLineWidth_50"/>
@@ -139,18 +155,26 @@
139155
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
140156
<argument name="page" value="$$createCMSPage.identifier$$"/>
141157
</actionGroup>
142-
<seeElement selector="{{DividerOnStorefront.color('1', PageBuilderDividerLineColor_Yellow.rgb)}}" stepKey="seeDividerColorCMSPageStorefront"/>
143-
<seeElement selector="{{DividerOnStorefront.thickness('1', PageBuilderDividerLineThickness_10.value)}}" stepKey="seeDividerThicknessCMSPageStorefront"/>
144-
<seeElement selector="{{DividerOnStorefront.width('1', PageBuilderDividerLineWidth_50.value)}}" stepKey="seeDividerWidthCMSPageStorefront"/>
158+
<actionGroup ref="ValidateDividerGeneralAttributesActionGroup" stepKey="seeDividerColorCMSPageStorefront">
159+
<argument name="page" value="DividerOnStorefront"/>
160+
<argument name="lineColor" value="PageBuilderDividerLineColor_Yellow"/>
161+
<argument name="lineThickness" value="PageBuilderDividerLineThickness_10"/>
162+
<argument name="lineWidth" value="PageBuilderDividerLineWidth_50"/>
163+
<argument name="index" value="1"/>
164+
</actionGroup>
145165
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSPageStorefront">
146166
<argument name="page" value="DividerOnStorefront"/>
147167
<argument name="dividerWidth" value="PageBuilderDividerLineWidth_50"/>
148168
</actionGroup>
149169
<!-- Validate CMS Page Storefront Mobile -->
150170
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
151-
<seeElement selector="{{DividerOnStorefront.color('1', PageBuilderDividerLineColor_Yellow.rgb)}}" stepKey="seeDividerColorCMSPageStorefrontMobile"/>
152-
<seeElement selector="{{DividerOnStorefront.thickness('1', PageBuilderDividerLineThickness_10.value)}}" stepKey="seeDividerThicknessCMSPageStorefrontMobile"/>
153-
<seeElement selector="{{DividerOnStorefront.width('1', PageBuilderDividerLineWidth_50.value)}}" stepKey="seeDividerWidthCMSPageStorefrontMobile"/>
171+
<actionGroup ref="ValidateDividerGeneralAttributesActionGroup" stepKey="seeDividerColorCMSPageStorefrontMobile">
172+
<argument name="page" value="DividerOnStorefront"/>
173+
<argument name="lineColor" value="PageBuilderDividerLineColor_Yellow"/>
174+
<argument name="lineThickness" value="PageBuilderDividerLineThickness_10"/>
175+
<argument name="lineWidth" value="PageBuilderDividerLineWidth_50"/>
176+
<argument name="index" value="1"/>
177+
</actionGroup>
154178
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSPageStorefrontMobile">
155179
<argument name="page" value="DividerOnStorefront"/>
156180
<argument name="dividerWidth" value="PageBuilderDividerLineWidth_50"/>

0 commit comments

Comments
 (0)