Skip to content

Commit c52e73a

Browse files
committed
Merge branch 'develop' of https://github.com/magento-commerce/magento2-page-builder into PR-2021-20-08
2 parents 7cdadf6 + abbc720 commit c52e73a

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211
<data key="rgb">rgb(64, 127, 128)</data>
212212
<data key="hex">#407f80</data>
213213
<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>
214215
</entity>
215216
<entity name="PageBuilderBackgroundColor_Invalid" type="pagebuilder_background_color_property">
216217
<data key="name">Background Color</data>

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,17 @@
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.rgbaCenterOfLightDarkSlider)}}" stepKey="waitForColorSwatchColor4"/>
78-
<seeInField selector="{{ColorPicker.inputField}}" userInput="{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSlider}}" stepKey="seeColorInInputField4"/>
77+
<waitForElementVisible selector="{{ColorPicker.panelColorSwatch(PageBuilderBackgroundColor_CenterColorHueSlider.section, PageBuilderBackgroundColor_CenterColorHueSlider.fieldName)}}" stepKey="waitForColorSwatchColor4"/>
78+
<executeJS function="return window.getComputedStyle(document.evaluate(&quot;{{ColorPicker.panelColorSwatch(PageBuilderBackgroundColor_CenterColorHueSlider.section, PageBuilderBackgroundColor_CenterColorHueSlider.fieldName)}}//div&quot;, document.body).iterateNext()).backgroundColor" stepKey="grabBackgroundColorValue"/>
79+
<assertRegExp stepKey="seeColorInSwatch">
80+
<expectedResult type="string">/{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSliderRegex}}/</expectedResult>
81+
<actualResult type="variable">grabBackgroundColorValue</actualResult>
82+
</assertRegExp>
83+
<grabValueFrom selector="{{ColorPicker.inputField}}" stepKey="grabColorFromInput" />
84+
<assertRegExp stepKey="seeColorInInputField4">
85+
<expectedResult type="string">/{{PageBuilderBackgroundColor_CenterColorHueSlider.rgbaCenterOfLightDarkSliderRegex}}/</expectedResult>
86+
<actualResult type="variable">grabColorFromInput</actualResult>
87+
</assertRegExp>
7988
<!-- Validate Hex Input Field -->
8089
<comment userInput="Validate Hex Input Field" stepKey="commentHexInput"/>
8190
<fillField selector="{{ColorPicker.inputField}}" userInput="{{PageBuilderBackgroundColor_Plaintext_Green.value}}" stepKey="inputColorInInputField"/>

0 commit comments

Comments
 (0)