Skip to content

Commit 2f225e4

Browse files
committed
MC-3864: Fix alpha value in background colour
- Adding tests for hsla & hsva
1 parent 140e31c commit 2f225e4

File tree

2 files changed

+54
-1
lines changed

2 files changed

+54
-1
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,15 @@
8787
<data key="hex">#ff8400</data>
8888
<data key="editPanelValue">#ff8400</data>
8989
</entity>
90+
<entity name="PageBuilderBackgroundColor_HSLa_Orange" type="pagebuilder_background_color_property">
91+
<data key="name">Background Color</data>
92+
<data key="section">background</data>
93+
<data key="fieldName">background_color</data>
94+
<data key="value">hsla(31, 100%, 50%, .3)</data>
95+
<data key="rgb">rgba(255, 132, 0, 0.3)</data>
96+
<data key="hex">#ff8400</data>
97+
<data key="editPanelValue">rgba(255, 132, 0, 0.3)</data>
98+
</entity>
9099
<entity name="PageBuilderBackgroundColor_HSV_Orange" type="pagebuilder_background_color_property">
91100
<data key="name">Background Color</data>
92101
<data key="section">background</data>
@@ -96,6 +105,15 @@
96105
<data key="hex">#a96836</data>
97106
<data key="editPanelValue">#a96836</data>
98107
</entity>
108+
<entity name="PageBuilderBackgroundColor_HSVa_Orange" type="pagebuilder_background_color_property">
109+
<data key="name">Background Color</data>
110+
<data key="section">background</data>
111+
<data key="fieldName">background_color</data>
112+
<data key="value">hsva(26.09, 68.05, 66.27, .4)</data>
113+
<data key="rgb">rgba(169, 104, 54, 0.4)</data>
114+
<data key="hex">#a96836</data>
115+
<data key="editPanelValue">rgba(169, 104, 54, 0.4)</data>
116+
</entity>
99117
<entity name="PageBuilderBackgroundColor_CenterColorPicker" type="pagebuilder_background_color_property">
100118
<data key="name">Background Color</data>
101119
<data key="section">background</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest.xml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,9 @@
799799
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="inputRGBa">
800800
<argument name="property" value="PageBuilderBackgroundColor_RGBa_Blue"/>
801801
</actionGroup>
802-
<waitForElementVisible selector="{{ColorPicker.panelColorSwatchColor(PageBuilderBackgroundColor_RGBa_Blue.section, PageBuilderBackgroundColor_RGBa_Blue.fieldName, PageBuilderBackgroundColor_RGBa_Blue.value)}}" stepKey="waitForColorSwatchColor"/>
802+
<actionGroup ref="seeColorInColorSwatch" stepKey="seeSwatchRGBaColor">
803+
<argument name="property" value="PageBuilderBackgroundColor_RGBa_Blue"/>
804+
</actionGroup>
803805
<actionGroup ref="openAndValidateColorPickerValue" stepKey="validateRGBa">
804806
<argument name="color" value="{{PageBuilderBackgroundColor_RGBa_Blue.value}}"/>
805807
</actionGroup>
@@ -814,6 +816,39 @@
814816
<actionGroup ref="openAndValidateColorPickerValue" stepKey="validateHSL">
815817
<argument name="color" value="{{PageBuilderBackgroundColor_HSL_Orange.hex}}"/>
816818
</actionGroup>
819+
<!-- Input: HSLa -->
820+
<comment userInput="Input: HSLa" stepKey="commentHSLa"/>
821+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="inputHSLa">
822+
<argument name="property" value="PageBuilderBackgroundColor_HSLa_Orange"/>
823+
</actionGroup>
824+
<actionGroup ref="seeColorInColorSwatch" stepKey="seeSwatchHSLaColor">
825+
<argument name="property" value="PageBuilderBackgroundColor_HSLa_Orange"/>
826+
</actionGroup>
827+
<actionGroup ref="openAndValidateColorPickerValue" stepKey="validateHSLa">
828+
<argument name="color" value="{{PageBuilderBackgroundColor_HSLa_Orange.rgb}}"/>
829+
</actionGroup>
830+
<!-- Input: HSV -->
831+
<comment userInput="Input: HSV" stepKey="commentHSV"/>
832+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="inputHSV">
833+
<argument name="property" value="PageBuilderBackgroundColor_HSV_Orange"/>
834+
</actionGroup>
835+
<actionGroup ref="seeColorInColorSwatch" stepKey="seeSwatchHSVColor">
836+
<argument name="property" value="PageBuilderBackgroundColor_HSV_Orange"/>
837+
</actionGroup>
838+
<actionGroup ref="openAndValidateColorPickerValue" stepKey="validateHSV">
839+
<argument name="color" value="{{PageBuilderBackgroundColor_HSV_Orange.hex}}"/>
840+
</actionGroup>
841+
<!-- Input: HSVa -->
842+
<comment userInput="Input: HSVa" stepKey="commentHSVa"/>
843+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="inputHSVa">
844+
<argument name="property" value="PageBuilderBackgroundColor_HSVa_Orange"/>
845+
</actionGroup>
846+
<actionGroup ref="seeColorInColorSwatch" stepKey="seeSwatchHSVaColor">
847+
<argument name="property" value="PageBuilderBackgroundColor_HSVa_Orange"/>
848+
</actionGroup>
849+
<actionGroup ref="openAndValidateColorPickerValue" stepKey="validateHSVa">
850+
<argument name="color" value="{{PageBuilderBackgroundColor_HSVa_Orange.rgb}}"/>
851+
</actionGroup>
817852
</test>
818853
<test name="EditPanelColorPickerWindowFunctionality">
819854
<annotations>

0 commit comments

Comments
 (0)