Skip to content

Commit fd2e06b

Browse files
mohit-adobemohit-adobe
authored
Merge branch 'MQE-Chrome-Update' into MQE-tests
2 parents 99afe48 + 1975702 commit fd2e06b

File tree

4 files changed

+32
-33
lines changed

4 files changed

+32
-33
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/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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
<wait time="10" stepKey="pause1"/>
9292
<moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonStorefront1"/>
9393
<wait time="5" stepKey="pause2"/>
94-
9594
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
9695
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
9796
<!-- Validate Storefront Mobile -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
113113
<argument name="cssProperty" value="backgroundColor"/>
114114
</actionGroup>
115-
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
115+
<moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="50" y="50" stepKey="moveMouseOverBannerStorefront"/>
116116
<waitForPageLoad time="30" stepKey="waitForTransitionStorefront"/>
117117
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
118118
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverStorefront">

0 commit comments

Comments
 (0)