Skip to content

Commit f9426eb

Browse files
davemacaulaydavemacaulay
committed
MC-3895: Banner and Slide has an overlay transparency field that needs to be removed in favor of transparent color
- Fix Slider on hover color overlay - Update slider and banner tests
1 parent 22b27aa commit f9426eb

File tree

14 files changed

+65
-102
lines changed

14 files changed

+65
-102
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,13 +228,6 @@
228228
<data key="value">#ff0000</data>
229229
<data key="rgb">255, 0, 0</data>
230230
</entity>
231-
<entity name="PageBuilderBannerOverlayColor_Blue" type="pagebuilder_banner_overlay_color_property">
232-
<data key="name">Overlay Color</data>
233-
<data key="section">contents</data>
234-
<data key="fieldName">overlay_color</data>
235-
<data key="value">rgb(174, 198, 207)</data>
236-
<data key="rgb">rgb(174, 198, 207)</data>
237-
</entity>
238231
<entity name="PageBuilderBannerOverlayColor_Blue_Opaque" type="pagebuilder_banner_overlay_color_property">
239232
<data key="name">Overlay Color</data>
240233
<data key="section">contents</data>

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -187,26 +187,19 @@
187187
<data key="value">#ffffff</data>
188188
<data key="rgb">255, 255, 255</data>
189189
</entity>
190-
<entity name="PageBuilderSlideItemOverlayColor_FF0000" type="pagebuilder_banner_overlay_color_property">
190+
<entity name="PageBuilderSlideItemOverlayColor_FF0000" type="pagebuilder_slide_item_overlay_color_property">
191191
<data key="name">Overlay Color</data>
192192
<data key="section">general</data>
193193
<data key="fieldName">overlay_color</data>
194194
<data key="value">#ff0000</data>
195195
<data key="rgb">255, 0, 0</data>
196196
</entity>
197-
<!-- Overlay Transparency -->
198-
<entity name="PageBuilderSlideItemOverlayTransparency_70" type="pagebuilder_slide_item_overlay_transparency_property">
199-
<data key="name">Overlay Transparency</data>
200-
<data key="section">general</data>
201-
<data key="fieldName">overlay_transparency</data>
202-
<data key="value">70</data>
203-
<data key="decimal">0.7</data>
204-
</entity>
205-
<entity name="PageBuilderSlideItemOverlayTransparency_0" type="pagebuilder_slide_item_overlay_transparency_property">
206-
<data key="name">Overlay Transparency</data>
197+
<entity name="PageBuilderSlideItemOverlayColor_Blue_Opaque" type="pagebuilder_slide_item_overlay_color_property">
198+
<data key="name">Overlay Color</data>
207199
<data key="section">general</data>
208-
<data key="fieldName">overlay_transparency</data>
209-
<data key="value">0</data>
200+
<data key="fieldName">overlay_color</data>
201+
<data key="value">rgba(174, 198, 207, 0.7)</data>
202+
<data key="rgb">rgba(174, 198, 207, 0.7)</data>
210203
</entity>
211204
<!-- Message -->
212205
<entity name="PageBuilderSlideItemContent_Slide1" type="pagebuilder_slide_item_content_property">

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
<element name="buttonText" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//button[.='{{arg2}}']" parameterized="true"/>
4848
<element name="showOverlay" type="text" selector="(//div[@data-role='banner'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
4949
<element name="overlayBackgroundColor" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
50-
<element name="overlayColorAndTransparency" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
5150
<element name="transparentOverlay" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'background-color: transparent;')]" parameterized="true"/>
5251
<!-- Advanced Configuration -->
5352
<element name="alignment" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
@@ -106,7 +105,6 @@
106105
<element name="buttonText" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//a//span[.='{{arg2}}']" parameterized="true"/>
107106
<element name="showOverlay" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
108107
<element name="overlayBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
109-
<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"/>
110108
<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"/>
111109
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
112110
<!-- Advanced Configuration -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<element name="buttonType" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//button[@data-element='button'][contains(@class,'{{arg2}}')]" parameterized="true"/>
104104
<element name="buttonText" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//button[@data-element='button'][.='{{arg2}}']" parameterized="true"/>
105105
<element name="showOverlay" type="text" selector="(//div[@data-role='slide'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
106-
<element name="overlayColorAndTransparency" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
106+
<element name="overlayBackgroundColor" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
107107
<element name="transparentOverlay" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: transparent;')]" parameterized="true"/>
108108
<!-- Advanced Configuration -->
109109
<element name="alignment" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
@@ -163,7 +163,7 @@
163163
<element name="buttonType" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//a[@data-element='button'][contains(@class,'{{arg2}}')]" parameterized="true"/>
164164
<element name="buttonText" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//a[@data-element='button']//span[.='{{arg2}}']" parameterized="true"/>
165165
<element name="showOverlay" type="button" selector="(//div[@data-role='slide'])[{{arg1}}][@data-show-overlay='{{arg2}}']" parameterized="true"/>
166-
<element name="overlayColorAndTransparency" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: rgba({{arg2}}, {{arg3}});')]" parameterized="true"/>
166+
<element name="overlayBackgroundColor" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
167167
<element name="transparentOverlay" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: transparent;')]" parameterized="true"/>
168168
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
169169
<!-- Advanced Configuration -->

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,7 @@
349349
<argument name="property" value="PageBuilderSlideItemShowOverlay_Always"/>
350350
</actionGroup>
351351
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayColor">
352-
<argument name="property" value="PageBuilderSlideItemOverlayColor_FF0000"/>
353-
</actionGroup>
354-
<actionGroup ref="fillSlideOutPanelField" stepKey="enterOverlayTransparency">
355-
<argument name="property" value="PageBuilderSlideItemOverlayTransparency_70"/>
352+
<argument name="property" value="PageBuilderSlideItemOverlayColor_Blue_Opaque"/>
356353
</actionGroup>
357354
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
358355
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>

0 commit comments

Comments
 (0)