Skip to content

Commit 340d212

Browse files
anthoulaanthoula
committed
MC-4117: Update banner to use new background images logic
- add test to verify collage left overlay position
1 parent 34e533c commit 340d212

File tree

3 files changed

+99
-0
lines changed

3 files changed

+99
-0
lines changed

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="validateOverlayPositionLeft">
12+
<arguments>
13+
<argument name="page"/>
14+
<argument name="index" defaultValue="1" type="string"/>
15+
</arguments>
16+
<!-- Validate overlay position is left -->
17+
<comment userInput="Validate overlay position is left" stepKey="commentValidateOverlayPositionIsLeft"/>
18+
<executeJS function="return Math.round({{page.wrapperJS('1')}}.getBoundingClientRect().right) - Math.round({{page.wrapperJS('1')}}.getBoundingClientRect().width / 2)" stepKey="wrapperRightPositionMinusWidth50Percent"/>
19+
<executeJS function="return Math.round({{page.overlayJS('1')}}.getBoundingClientRect().right)" stepKey="overlayRightPosition"/>
20+
<assertEquals stepKey="assertOverlayIsPositionedLeftBeforeSave">
21+
<expectedResult type="variable">wrapperRightPositionMinusWidth50Percent</expectedResult>
22+
<actualResult type="variable">overlayRightPosition</actualResult>
23+
</assertEquals>
24+
</actionGroup>
25+
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<element name="baseJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-banner-wrapper')[{{arg1}} - 1]" parameterized="true"/>
1414
<element name="hidden" type="button" selector="(//div[@data-role='banner'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
1515
<element name="notHidden" type="button" selector="(//div[@data-role='banner'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
16+
<element name="wrapperJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-banner-wrapper')[{{arg1}} - 1]" parameterized="true"/>
1617
<element name="overlay" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='overlay']" parameterized="true"/>
18+
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-overlay')[{{arg1}} - 1]" parameterized="true"/>
1719
<element name="wysiwygLinkUrl" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//a[@href='{{arg2}}']" parameterized="true"/>
1820
<!-- Appearance Configuration -->
1921
<element name="appearance" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
@@ -60,7 +62,9 @@
6062
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]" parameterized="true"/>
6163
<element name="hidden" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
6264
<element name="notHidden" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
65+
<element name="wrapperJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-banner-wrapper')[{{arg1}} - 1]" parameterized="true"/>
6366
<element name="overlay" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-banner')])[{{arg1}}]//div[@data-element='overlay']" parameterized="true"/>
67+
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-role=banner] div.pagebuilder-overlay')[{{arg1}} - 1]" parameterized="true"/>
6468
<element name="emptyBanner" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//div[contains(@class,'placeholder-text') and .='Edit Banner Text']" parameterized="true"/>
6569
<element name="editableButtonOnStage" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//button//span[@contenteditable='true']" parameterized="true"/>
6670
<element name="wysiwygLinkUrl" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{arg1}}]//a[@href='{{arg2}}']" parameterized="true"/>

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

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,76 @@
707707
<seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
708708
<seeElement selector="{{BannerOnFrontend.overlayColorAndTransparency('1', PageBuilderBannerContentOverlayColorProperty.rgb, PageBuilderBannerOverlayTransparencyProperty.decimal)}}" stepKey="seeOverlayOnHoverStorefrontMobile"/>
709709
</test>
710+
<test name="BannerCollageLeftOverlayPosition">
711+
<annotations>
712+
<features value="PageBuilder"/>
713+
<stories value="Banner"/>
714+
<title value="Collage Left - Check collage left overlay position is correct"/>
715+
<description value="Check collage left overlay is correct"/>
716+
<severity value="CRITICAL"/>
717+
<useCaseId value="MC-4117"/>
718+
<testCaseId value="MC-4945"/>
719+
<group value="pagebuilder"/>
720+
<group value="pagebuilder-banner"/>
721+
<group value="pagebuilder-bannerCollageLeft"/>
722+
</annotations>
723+
<before>
724+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
725+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
726+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
727+
</before>
728+
<after>
729+
<actionGroup ref="logout" stepKey="logout"/>
730+
</after>
731+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
732+
<argument name="contentType" value="PageBuilderBannerContentType"/>
733+
</actionGroup>
734+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
735+
<argument name="group" value="PageBuilderBannerContentType"/>
736+
</actionGroup>
737+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
738+
<argument name="contentType" value="PageBuilderBannerContentType"/>
739+
</actionGroup>
740+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
741+
<argument name="contentType" value="PageBuilderBannerContentType"/>
742+
</actionGroup>
743+
<!-- Fill Out Edit Panel -->
744+
<comment userInput="Fill Out Edit Panel" stepKey="commentFillEditPanel"/>
745+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
746+
<argument name="property" value="PageBuilderBannerCollageLeftProperty"/>
747+
</actionGroup>
748+
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowOverlay">
749+
<argument name="property" value="PageBuilderBannerShowContentOverlayAlwaysProperty"/>
750+
</actionGroup>
751+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayColor">
752+
<argument name="property" value="PageBuilderBannerOverlayColor_FF0000"/>
753+
</actionGroup>
754+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayTransparency">
755+
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
756+
</actionGroup>
757+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
758+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
759+
<!-- Validate Stage -->
760+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
761+
<actionGroup ref="validateOverlayPositionLeft" stepKey="validateOverlayPositionStage">
762+
<argument name="page" value="BannerOnBackend"/>
763+
</actionGroup>
764+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
765+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
766+
<!-- Validate Stage After Save -->
767+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
768+
<actionGroup ref="validateOverlayPositionLeft" stepKey="validateOverlayPositionAfterStage">
769+
<argument name="page" value="BannerOnBackend"/>
770+
</actionGroup>
771+
<!-- Validate Storefront -->
772+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
773+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
774+
<argument name="contentType" value="PageBuilderBannerContentType"/>
775+
</actionGroup>
776+
<actionGroup ref="validateOverlayPositionLeft" stepKey="validateOverlayPositionStorefront">
777+
<argument name="page" value="BannerOnFrontend"/>
778+
</actionGroup>
779+
</test>
710780
<test name="BannerCollageLeftButtonsCanBeEditedInline">
711781
<annotations>
712782
<features value="PageBuilder"/>

0 commit comments

Comments
 (0)