Skip to content

Commit 9cd5e73

Browse files
vzabaznovvzabaznov
authored
Merge pull request #181 from magento-gl/release-functional-tests-automation
MQE-3576 : Chrome upgrade fixes
2 parents 67f529c + 1e5d193 commit 9cd5e73

File tree

20 files changed

+134
-53
lines changed

20 files changed

+134
-53
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentCenterInBlockActionGroup.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="verifyVerticalAlignmentCenterInBlock">
11-
<arguments>
12-
<argument name="block" defaultValue="BlockOnStorefront"/>
13-
<argument name="container"/>
14-
<argument name="containerIndex" defaultValue="1" type="string"/>
15-
<argument name="content"/>
16-
<argument name="contentIndex" defaultValue="1" type="string"/>
17-
</arguments>
18-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].getBoundingClientRect().top" stepKey="containerCenter"/>
19-
<executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].getBoundingClientRect().top" stepKey="contentCenter"/>
20-
<assertGreaterThanOrEqual stepKey="assertBottomPosition">
21-
<expectedResult type="variable">containerCenter</expectedResult>
22-
<actualResult type="variable">contentCenter</actualResult>
23-
</assertGreaterThanOrEqual>
24-
</actionGroup>
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="verifyVerticalAlignmentCenterInBlock">
11+
<arguments>
12+
<argument name="block" defaultValue="BlockOnStorefront"/>
13+
<argument name="container"/>
14+
<argument name="containerIndex" defaultValue="1" type="string"/>
15+
<argument name="content"/>
16+
<argument name="contentIndex" defaultValue="1" type="string"/>
17+
</arguments>
18+
<executeJS function="return Math.round(document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].getBoundingClientRect().top)" stepKey="containerCenter"/>
19+
<executeJS function="return Math.round(document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].getBoundingClientRect().top)" stepKey="contentCenter"/>
20+
<assertEquals stepKey="assertBottomPosition">
21+
<expectedResult type="variable">containerCenter</expectedResult>
22+
<actualResult type="variable">contentCenter</actualResult>
23+
</assertEquals>
24+
</actionGroup>
2525
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<executeJS function="return Math.round((window.getComputedStyle(document.evaluate('{{section.columnGroupPath(parentIndex)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;) - 30)* {{columnWidth}})" stepKey="grabCalculatedColumnWidthValue"/>
2121
<executeJS function="return Math.abs({$grabColumnWidthValue}-{$grabCalculatedColumnWidthValue})" stepKey="columnWidthDifference"/>
2222
<assertLessThanOrEqual stepKey="assertColumnWidthValue">
23-
<expectedResult type="int">2</expectedResult>
23+
<expectedResult type="int">3</expectedResult>
2424
<actualResult type="variable">columnWidthDifference</actualResult>
2525
</assertLessThanOrEqual>
2626
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleEqualsExpectedStyleActionGroup.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9-
<actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
10-
<annotations>
11-
<description>Content types expected style equals the computed style</description>
12-
</annotations>
13-
<arguments>
14-
<argument name="selector" type="string"/>
15-
<argument name="expectedProperty" type="string"/>
16-
<argument name="cssProperty" defaultValue="backgroundColor" type="string"/>
17-
</arguments>
18-
<executeJS function="return window.getComputedStyle(document.evaluate('{{selector}}', document.body).iterateNext()).{{cssProperty}}.replace(/px/g, &quot;&quot;)" stepKey="fetchedProperty"/>
19-
<assertEquals stepKey="propertyIsEqualsAsExpected">
20-
<expectedResult type="string">{{expectedProperty}}</expectedResult>
21-
<actualResult type="variable">fetchedProperty</actualResult>
22-
</assertEquals>
23-
</actionGroup>
9+
<actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
10+
<annotations>
11+
<description>Content types expected style equals the computed style</description>
12+
</annotations>
13+
<arguments>
14+
<argument name="selector" type="string"/>
15+
<argument name="expectedProperty" type="string"/>
16+
<argument name="cssProperty" defaultValue="backgroundColor" type="string"/>
17+
</arguments>
18+
<executeJS function="return window.getComputedStyle(document.evaluate('{{selector}}', document.body).iterateNext()).{{cssProperty}}.replace(/px/g, &quot;&quot;)" stepKey="fetchedProperty"/>
19+
<assertEquals stepKey="propertyIsEqualsAsExpected">
20+
<expectedResult type="string">{{expectedProperty}}</expectedResult>
21+
<actualResult type="variable">fetchedProperty</actualResult>
22+
</assertEquals>
23+
</actionGroup>
2424
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonOnHoverTest.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@
8585
</actionGroup>
8686
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
8787
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
88+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
89+
<wait time="5" stepKey="pauseAfterIconHover"/>
8890
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
91+
<wait time="10" stepKey="pause1"/>
92+
<moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonStorefront1"/>
93+
<wait time="5" stepKey="pause2"/>
8994
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
9095
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
9196
<!-- Validate Storefront Mobile -->
@@ -100,7 +105,10 @@
100105
</actionGroup>
101106
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
102107
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
103-
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
108+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStorefrontMobile"/>
109+
<wait time="5" stepKey="pauseAfterIconHoverMobileStorefront"/>
110+
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerMobileStorefront"/>
111+
<wait time="10" stepKey="pause3"/>
104112
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
105113
</test>
106114
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonOnHoverTest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@
8585
</actionGroup>
8686
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
8787
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
88+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
89+
<wait time="5" stepKey="pauseAfterIconHover"/>
8890
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
91+
<wait time="10" stepKey="pause1"/>
8992
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
9093
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
9194
<!-- Validate Storefront Mobile -->
@@ -100,7 +103,10 @@
100103
</actionGroup>
101104
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
102105
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
106+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideStorefrontMobile"/>
107+
<wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
103108
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
109+
<wait time="10" stepKey="pause1StorefrontMobile"/>
104110
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
105111
</test>
106112
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonOnHoverTest.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-bannerCollageRight"/>
22+
<skip>
23+
<issueId value="ACQE-3837">Skipped</issueId>
24+
</skip>
2225
</annotations>
2326
<before>
2427
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -85,7 +88,11 @@
8588
</actionGroup>
8689
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
8790
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
91+
<!-- -->
92+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
93+
<wait time="5" stepKey="pauseAfterIconHover"/>
8894
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
95+
<wait time="10" stepKey="pause1"/>
8996
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
9097
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
9198
<!-- Validate Storefront Mobile -->
@@ -100,7 +107,10 @@
100107
</actionGroup>
101108
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
102109
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
110+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideStorefrontMobile"/>
111+
<wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
103112
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
113+
<wait time="10" stepKey="pause3"/>
104114
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
105115
</test>
106116
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonNeverShowTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<severity value="BLOCKER"/>
1717
<useCaseId value="MAGETWO-83553"/>
1818
<testCaseId value="MC-2692"/>
19-
<group value="pagebuilder"/>
19+
<group value="pagebuilder"/>
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-bannerPoster"/>
2222
</annotations>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonOnHoverTest.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@
8585
</actionGroup>
8686
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
8787
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
88+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
89+
<wait time="5" stepKey="pauseAfterIconHover"/>
8890
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
91+
<wait time="10" stepKey="pause1"/>
92+
<moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonStorefront1"/>
93+
<wait time="5" stepKey="pause2"/>
8994
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
9095
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
9196
<!-- Validate Storefront Mobile -->
@@ -100,7 +105,10 @@
100105
</actionGroup>
101106
<seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
102107
<dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
108+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideMobileStorefront"/>
109+
<wait time="5" stepKey="pauseAfterIconHoverMobileStorefront"/>
103110
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
111+
<wait time="10" stepKey="pause3"/>
104112
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
105113
</test>
106114
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayAndButtonOnHoverTest.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,10 @@
112112
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
113113
<argument name="cssProperty" value="backgroundColor"/>
114114
</actionGroup>
115+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
116+
<wait time="5" stepKey="pauseAfterIconHover"/>
115117
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
116-
<waitForPageLoad time="30" stepKey="waitForTransitionStorefront"/>
118+
<wait time="10" stepKey="waitForTransitionStorefront"/>
117119
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
118120
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverStorefront">
119121
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
@@ -145,9 +147,12 @@
145147
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
146148
<argument name="cssProperty" value="backgroundColor"/>
147149
</actionGroup>
148-
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
149-
<waitForPageLoad time="30" stepKey="waitForTransitionStorefrontMobile"/>
150-
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
150+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStorefrontMobile"/>
151+
<wait time="5" stepKey="waitForTransitionStorefrontMobile"/>
152+
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
153+
<wait time="5" stepKey="pause3"/>
154+
<moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonMobileStorefront"/>
155+
<wait time="5" stepKey="pause4"/>
151156
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverStorefrontMobile">
152157
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
153158
<argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.value}}"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayOnHoverTest.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,11 @@
7979
<argument name="contentType" value="PageBuilderBannerContentType"/>
8080
</actionGroup>
8181
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="seeAppearanceStorefront"/>
82+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
83+
<wait time="5" stepKey="pauseAfterIconHover"/>
8284
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
83-
<waitForPageLoad time="30" stepKey="waitForTransitionStorefront"/>
85+
<wait time="5" stepKey="pause1"/>
86+
<waitForPageLoad time="30" stepKey="waitForTransitionStorefront"/>
8487
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayBackgroundColorStorefront">
8588
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
8689
<argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
@@ -92,11 +95,14 @@
9295
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
9396
<seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="seeAppearanceStorefrontMobile"/>
9497
<waitForPageLoad time="30" stepKey="waitForTransitionStorefrontMobile"/>
95-
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
98+
<moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStorefrontMobile"/>
99+
<wait time="5" stepKey="pauseAfterIconHoverMobileStorefront"/>
100+
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerMobileStorefront"/>
101+
<wait time="5" stepKey="pause3"/>
96102
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayBackgroundColorStorefrontMobile">
97-
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
98-
<argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
99-
<argument name="cssProperty" value="backgroundColor"/>
100-
</actionGroup>
103+
<argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
104+
<argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
105+
<argument name="cssProperty" value="backgroundColor"/>
106+
</actionGroup>
101107
</test>
102108
</tests>

0 commit comments

Comments
 (0)