Skip to content

Commit ffda932

Browse files
AC-103: Update Third Party library: spectrum/spectrum
- use regex to check color
1 parent 315ebed commit ffda932

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@
210210
<data key="value">#407f80</data>
211211
<data key="rgb">rgb(64, 127, 128)</data>
212212
<data key="hex">#407f80</data>
213-
<data key="rgbaCenterOfLightDarkSlider">rgba(64, 127, 128, 0.499)</data>
214-
<data key="rgbaCenterOfLightDarkSliderSwatch">rgba(64, 127, 128, 0.498)</data>
213+
<data key="rgbaCenterOfLightDarkSlider">rgba(64, 127, 128, 0.5)</data>
214+
<data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(64,\s*127,\s*128,\s*0.49(\d+)\)</data>
215215
</entity>
216216
<entity name="PageBuilderBackgroundColor_Invalid" type="pagebuilder_background_color_property">
217217
<data key="name">Background Color</data>

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,16 @@
7474
<!-- Validate Light/Dark Slider -->
7575
<comment userInput="Validate Light/Dark Slider" stepKey="commentLightDarkSlider"/>
7676
<click selector="{{ColorPicker.lightDarkSlider}}" stepKey="clickLightDarkSlider"/>
77-
<waitForElementVisible selector="{{ColorPicker.panelColorSwatchColor(PageBuilderBackgroundColor_CenterColorHueSlider.section, PageBuilderBackgroundColor_CenterColorHueSlider.fieldName, PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSliderSwatch)}}" stepKey="waitForColorSwatchColor4"/>
78-
<seeInField selector="{{ColorPicker.inputField}}" userInput="{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSlider}}" stepKey="seeColorInInputField4"/>
77+
<executeJS function="return window.getComputedStyle(document.evaluate(&quot;{{ColorPicker.panelColorSwatch(PageBuilderBackgroundColor_CenterColorHueSlider.section, PageBuilderBackgroundColor_CenterColorHueSlider.fieldName)}}//div&quot;, document.body).iterateNext()).backgroundColor" stepKey="grabBackgroundColorValue"/>
78+
<assertRegExp stepKey="assertColorSwatchColor">
79+
<expectedResult type="string">/{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSliderRegex}}/</expectedResult>
80+
<actualResult type="variable">grabBackgroundColorValue</actualResult>
81+
</assertRegExp>
82+
<grabValueFrom selector="{{ColorPicker.inputField}}" stepKey="grabColorFromInput" />
83+
<assertRegExp stepKey="assertColorInInputField">
84+
<expectedResult type="string">/{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSliderRegex}}/</expectedResult>
85+
<actualResult type="variable">grabColorFromInput</actualResult>
86+
</assertRegExp>
7987
<!-- Validate Hex Input Field -->
8088
<comment userInput="Validate Hex Input Field" stepKey="commentHexInput"/>
8189
<fillField selector="{{ColorPicker.inputField}}" userInput="{{PageBuilderBackgroundColor_Plaintext_Green.value}}" stepKey="inputColorInInputField"/>

0 commit comments

Comments
 (0)