Skip to content

Commit 5ecdea2

Browse files
dhaeckerdhaecker
committed
MC-3354: All Attributes Banner
- Fixing all failing Banner tests - Rewriting Banner overlay & button tests to be valid - Adding image cleanup to Banner tests - Adding/Updating supporting data & selectors
1 parent ff0bcb0 commit 5ecdea2

7 files changed

+997
-1154
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,24 +96,30 @@
9696
<data key="value">true</data>
9797
</entity>
9898
<!-- Show Button -->
99-
<entity name="PageBuilderBannerShowButtonAlwaysProperty" type="pagebuilder_banner_showButton_property">
99+
<entity name="PageBuilderBannerShowButtonDefaultProperty" type="pagebuilder_banner_show_button_property">
100100
<data key="name">Show Button</data>
101101
<data key="section">contents</data>
102102
<data key="fieldName">show_button</data>
103-
<data key="value">always</data>
103+
<data key="value">never</data>
104104
</entity>
105-
<entity name="PageBuilderBannerShowButtonDefaultProperty" type="pagebuilder_banner_showButton_property">
105+
<entity name="PageBuilderBannerShowButtonAlwaysProperty" type="pagebuilder_banner_show_button_property">
106106
<data key="name">Show Button</data>
107107
<data key="section">contents</data>
108108
<data key="fieldName">show_button</data>
109-
<data key="value">never</data>
109+
<data key="value">always</data>
110110
</entity>
111-
<entity name="PageBuilderBannerShowButtonOnHoverProperty" type="pagebuilder_banner_showButton_property">
111+
<entity name="PageBuilderBannerShowButtonOnHoverProperty" type="pagebuilder_banner_show_button_property">
112112
<data key="name">Show Button</data>
113113
<data key="section">contents</data>
114114
<data key="fieldName">show_button</data>
115115
<data key="value">hover</data>
116116
</entity>
117+
<entity name="PageBuilderBannerShowButtonNeverProperty" type="pagebuilder_banner_show_button_property">
118+
<data key="name">Show Button</data>
119+
<data key="section">contents</data>
120+
<data key="fieldName">show_button</data>
121+
<data key="value">never</data>
122+
</entity>
117123
<!-- Button Text -->
118124
<entity name="PageBuilderBannerButtonText_Default" type="pagebuilder_banner_button_text_property">
119125
<data key="name">Button Text</data>
@@ -190,13 +196,14 @@
190196
<data key="section">contents</data>
191197
<data key="fieldName">overlay_color</data>
192198
<data key="value">#ffffff</data>
199+
<data key="rgb">255, 255, 255</data>
193200
</entity>
194201
<entity name="PageBuilderBannerOverlayColor_FF0000" type="pagebuilder_banner_overlay_color_property">
195202
<data key="name">Overlay Color</data>
196203
<data key="section">contents</data>
197204
<data key="fieldName">overlay_color</data>
198205
<data key="value">#ff0000</data>
199-
<data key="rgb">255,0,0</data>
206+
<data key="rgb">255, 0, 0</data>
200207
</entity>
201208
<!-- Overlay Transparency -->
202209
<entity name="PageBuilderBannerOverlayTransparencyProperty" type="pagebuilder_banner_overlayTransparency_property">

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
<element name="buttonType" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//button[contains(@class,'{{arg2}}')]" parameterized="true"/>
4242
<element name="buttonText" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//button[.='{{arg2}}']" parameterized="true"/>
4343
<element name="showOverlay" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
44-
<element name="overlayColorAndTransparency" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-overlay-color='rgba({{arg2}},{{arg3}})']" parameterized="true"/>
45-
<element name="noOverlayColorAndTransparency" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-overlay-color='transparent']" parameterized="true"/>
44+
<element name="overlayColorAndTransparency" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='overlay'][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
45+
<element name="transparentOverlay" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='overlay'][contains(@style,'background-color: transparent;')]" parameterized="true"/>
4646
<element name="mobileMessageContent" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='mobile_image']//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
4747
<element name="mobileNoMessageContent" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='mobile_image']//div[@data-element='content'][.='Edit Banner Text'][not(*)]" parameterized="true"/>
4848
<element name="mobileButtonType" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='mobile_image']//button[contains(@class,'{{arg2}}')]" parameterized="true"/>
4949
<element name="mobileButtonText" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='mobile_image']//button[.='{{arg2}}']" parameterized="true"/>
50-
<element name="mobileOverlayColorAndTransparency" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='mobile_image']//div[@data-overlay-color='rgba({{arg2}},{{arg3}})']" parameterized="true"/>
51-
<element name="mobileNoOverlayColorAndTransparency" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='mobile_image']//div[@data-overlay-color='transparent']" parameterized="true"/>
50+
<element name="mobileOverlayColorAndTransparency" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='mobile_image']//div[@data-element='overlay'][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
51+
<element name="mobileTransparentOverlay" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='mobile_image']//div[@data-element='overlay'][contains(@style,'background-color: transparent;')]" parameterized="true"/>
5252
<!-- Advanced Configuration -->
5353
<element name="alignment" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
5454
<element name="noAlignment" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'text-align:'))]" parameterized="true"/>
@@ -68,11 +68,9 @@
6868

6969
<!--fix or replace these-->
7070
<element name="poster" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-hidden"/>
71-
<element name="posterOverlay" type="button" selector=".pagebuilder-poster-overlay[style*='rgba(255, 255, 255, 0.7)']"/>
7271
<element name="collageLeft" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-hidden[style*='40px calc(50% + 40px) 40px 40px'][style*='magento']"/>
7372
<element name="collageCentered" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-hidden[style*='40px calc(25% + 40px)'][style*='magento']"/>
7473
<element name="collageRight" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-hidden[style*='40px 40px 40px calc(50% + 40px)'][style*='magento']"/>
75-
<element name="collageOverlay" type="button" selector=".pagebuilder-overlay[style*='rgba(255, 255, 255, 0.7)']"/>
7674
<element name="posterMobileWithMobileImage" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-only[style*='m-logo']"/>
7775
<element name="collageMobileWithMobileImage" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-only[style*='padding: 40px;'][style*='m-logo']"/>
7876
<element name="collageMobileWithoutMobileImage" type="button" selector="div[data-role='banner'] .pagebuilder-mobile-only[style*='padding: 40px;'][style*='magento']"/>
@@ -100,12 +98,13 @@
10098
<!-- Content Configuration -->
10199
<element name="messageContent" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
102100
<element name="noMessageContent" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='content'][.='Edit Banner Text'][not(*)]" parameterized="true"/>
101+
<element name="button" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//button" parameterized="true"/>
103102
<element name="showButton" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-show-button='{{arg2}}']" parameterized="true"/>
104103
<element name="buttonType" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//button[contains(@class,'{{arg2}}')]" parameterized="true"/>
105104
<element name="buttonText" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//button//span[.='{{arg2}}']" parameterized="true"/>
106105
<element name="showOverlay" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
107-
<element name="overlayColorAndTransparency" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-overlay-color='rgba({{arg2}},{{arg3}})']" parameterized="true"/>
108-
<element name="noOverlayColorAndTransparency" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-overlay-color='transparent']" parameterized="true"/>
106+
<element name="overlayColorAndTransparency" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
107+
<element name="transparentOverlay" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'background-color: transparent;')]" parameterized="true"/>
109108
<!-- Advanced Configuration -->
110109
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
111110
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'text-align:'))]" parameterized="true"/>

0 commit comments

Comments
 (0)