Skip to content

Commit ddc99b3

Browse files
author
Hwashiang Yu
committed
Merge remote-tracking branch 'origin/MC-3087-overlay-color-for-banner-displays-as-input' into cms-team-2-sprint-13
2 parents 890beae + 7c1147c commit ddc99b3

File tree

8 files changed

+109
-97
lines changed

8 files changed

+109
-97
lines changed

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

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1111
<!-- Line Color -->
1212
<entity name="PageBuilderDividerLineColor_Default" type="pagebuilder_divider_line_color_property">
13-
<data key="name">Line Color</data>
14-
<data key="section">general</data>
15-
<data key="fieldName">line_color</data>
16-
<data key="value">#CECECE</data>
17-
<data key="rgb">rgb(206, 206, 206)</data>
18-
</entity>
19-
<entity name="PageBuilderDividerLineColor_DefaultLower" type="pagebuilder_divider_line_color_property">
2013
<data key="name">Line Color</data>
2114
<data key="section">general</data>
2215
<data key="fieldName">line_color</data>
@@ -35,63 +28,54 @@
3528
<data key="section">general</data>
3629
<data key="fieldName">line_color</data>
3730
<data key="value">yellow</data>
38-
<data key="rgb">yellow</data>
31+
<data key="rgb">rgb(255, 255, 0)</data>
32+
<data key="editPanelValue">#ffff00</data>
3933
</entity>
4034
<entity name="PageBuilderDividerLineColor_FF5733" type="pagebuilder_divider_line_color_property">
41-
<data key="name">Line Color</data>
42-
<data key="section">general</data>
43-
<data key="fieldName">line_color</data>
44-
<data key="value">#FF5733</data>
45-
<data key="rgb">rgb(255, 87, 51)</data>
46-
</entity>
47-
<entity name="PageBuilderDividerLineColor_FF5733Lower" type="pagebuilder_divider_line_color_property">
4835
<data key="name">Line Color</data>
4936
<data key="section">general</data>
5037
<data key="fieldName">line_color</data>
5138
<data key="value">#ff5733</data>
5239
<data key="rgb">rgb(255, 87, 51)</data>
5340
</entity>
54-
<entity name="PageBuilderDividerLineColor_FF5833Lower" type="pagebuilder_divider_line_color_property">
55-
<data key="name">Line Color</data>
56-
<data key="section">general</data>
57-
<data key="fieldName">line_color</data>
58-
<data key="value">#ff5833</data>
59-
<data key="rgb">rgb(255, 88, 51)</data>
60-
</entity>
6141
<entity name="PageBuilderDividerLineColor_RGB255_087_051" type="pagebuilder_divider_line_color_property">
6242
<data key="name">Line Color</data>
6343
<data key="section">general</data>
6444
<data key="fieldName">line_color</data>
6545
<data key="value">rgb(255, 87, 51)</data>
6646
<data key="rgb">rgb(255, 87, 51)</data>
47+
<data key="editPanelValue">#ff5733</data>
6748
</entity>
6849
<entity name="PageBuilderDividerLineColor_RGBA255_087_051_50" type="pagebuilder_divider_line_color_property">
6950
<data key="name">Line Color</data>
7051
<data key="section">general</data>
7152
<data key="fieldName">line_color</data>
7253
<data key="value">rgba(255, 87, 51, 0.5)</data>
7354
<data key="rgb">rgba(255, 87, 51, 0.5)</data>
55+
<data key="editPanelValue">#ff5733</data>
7456
</entity>
7557
<entity name="PageBuilderDividerLineColor_HSL11_100_60" type="pagebuilder_divider_line_color_property">
7658
<data key="name">Line Color</data>
7759
<data key="section">general</data>
7860
<data key="fieldName">line_color</data>
7961
<data key="value">hsl(11, 100%, 60%)</data>
8062
<data key="rgb">rgb(255, 88, 51)</data>
63+
<data key="editPanelValue">#ff5833</data>
8164
</entity>
8265
<entity name="PageBuilderDividerLineColor_HSLA11_100_60_50" type="pagebuilder_divider_line_color_property">
8366
<data key="name">Line Color</data>
8467
<data key="section">general</data>
8568
<data key="fieldName">line_color</data>
8669
<data key="value">hsla(11, 100%, 60%, 0.5)</data>
8770
<data key="rgb">rgba(255, 88, 51, 0.5)</data>
71+
<data key="editPanelValue">rgba(255, 88, 51, 0.5)</data>
8872
</entity>
8973
<entity name="PageBuilderDividerLineColor_Invalid" type="pagebuilder_divider_line_color_property">
9074
<data key="name">Line Color</data>
9175
<data key="section">general</data>
9276
<data key="fieldName">line_color</data>
93-
<data key="value">#GGGGGG</data>
94-
<data key="rgb">rgb()</data>
77+
<data key="value">invalid</data>
78+
<data key="errorMessage">Wrong color format. Please specify color in HEX, RGBa, HSVa, HSLa or use color name.</data>
9579
</entity>
9680
<!-- Line Thickness -->
9781
<entity name="PageBuilderDividerLineThickness_Default" type="pagebuilder_divider_line_thickness_property">

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,19 @@
7777
<element name="panelColorSwatch" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//input[@name='{{arg2}}']//..//div[@class='sp-preview']" parameterized="true"/>
7878
<element name="panelColorSwatchColor" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//input[@name='{{arg2}}']//..//div[@class='sp-preview']//div[contains(@style,'{{arg3}}')]" parameterized="true"/>
7979
<element name="colorSwatch" type="button" selector=".sp-preview"/>
80-
<element name="colorPickerWindow" type="button" selector=".sp-container[style]:last-child"/>
81-
<element name="allColorBoxes" type="button" selector=".sp-container[style]:last-child .sp-palette-row:not(.sp-palette-row-selection) [data-color]"/>
82-
<element name="colorBox" type="button" selector=".sp-container[style]:last-child [data-color='{{arg1}}']" parameterized="true"/>
83-
<element name="firstColorBox" type="button" selector=".sp-container[style]:last-child [data-color='rgb(252, 0, 9)']"/>
84-
<element name="activeFavoriteColorBox" type="button" selector=".sp-container[style]:last-child .sp-palette-row.sp-palette-row-selection .sp-thumb-active[data-color='{{arg1}}']" parameterized="true"/>
85-
<element name="colorWheel" type="button" selector=".sp-container[style]:last-child .sp-val"/>
86-
<element name="colorWheelColor" type="button" selector=".sp-container[style]:last-child .sp-color[style='background-color: {{arg1}};']" parameterized="true"/>
87-
<element name="inputField" type="input" selector=".sp-container[style]:last-child .sp-input"/>
88-
<element name="clearColorBtn" type="button" selector=".sp-container[style]:last-child [title='Clear Color Selection']"/>
89-
<element name="hueSlider" type="button" selector=".sp-container[style]:last-child .sp-hue"/>
90-
<element name="lightDarkSlider" type="button" selector=".sp-container[style]:last-child .sp-alpha"/>
91-
<element name="cancelBtn" type="button" selector="//div[contains(@class,'sp-palette') and @style][last()]//a[text()='Cancel']"/>
92-
<element name="applyBtn" type="button" selector="//div[contains(@class,'sp-palette') and @style][last()]//button[text()='Apply']"/>
80+
<element name="colorPickerWindow" type="button" selector=".sp-container:not(.sp-hidden)"/>
81+
<element name="allColorBoxes" type="button" selector=".sp-container:not(.sp-hidden) .sp-palette-row:not(.sp-palette-row-selection) [data-color]"/>
82+
<element name="colorBox" type="button" selector=".sp-container:not(.sp-hidden) [data-color='{{arg1}}']" parameterized="true"/>
83+
<element name="firstColorBox" type="button" selector=".sp-container:not(.sp-hidden) [data-color='rgb(252, 0, 9)']"/>
84+
<element name="activeFavoriteColorBox" type="button" selector=".sp-container:not(.sp-hidden) .sp-palette-row.sp-palette-row-selection .sp-thumb-active[data-color='{{arg1}}']" parameterized="true"/>
85+
<element name="colorWheel" type="button" selector=".sp-container:not(.sp-hidden) .sp-val"/>
86+
<element name="colorWheelColor" type="button" selector=".sp-container:not(.sp-hidden) .sp-color[style='background-color: {{arg1}};']" parameterized="true"/>
87+
<element name="inputField" type="input" selector=".sp-container:not(.sp-hidden) .sp-input"/>
88+
<element name="clearColorBtn" type="button" selector=".sp-container:not(.sp-hidden) [title='Clear Color Selection']"/>
89+
<element name="hueSlider" type="button" selector=".sp-container:not(.sp-hidden) .sp-hue"/>
90+
<element name="lightDarkSlider" type="button" selector=".sp-container:not(.sp-hidden) .sp-alpha"/>
91+
<element name="cancelBtn" type="button" selector="//div[contains(@class,'sp-palette') and not(contains(@class,'sp-hidden'))]//a[text()='Cancel']"/>
92+
<element name="applyBtn" type="button" selector="//div[contains(@class,'sp-palette') and not(contains(@class,'sp-hidden'))]//button[text()='Apply']"/>
9393
</section>
9494
<section name="VisualSelectComponent">
9595
<element name="firstSelection" type="input" selector="//li[@name='{{var1}}']" parameterized="true"/>

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

Lines changed: 32 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
134134
<argument name="contentType" value="PageBuilderDividerContentType"/>
135135
</actionGroup>
136-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor1">
136+
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="validateColor1">
137137
<argument name="property" value="PageBuilderDividerLineColor_Yellow"/>
138138
</actionGroup>
139139
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
@@ -152,7 +152,7 @@
152152
</actionGroup>
153153
<!-- Validate Edit Panel After Save -->
154154
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
155-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor">
155+
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="validateColor">
156156
<argument name="property" value="PageBuilderDividerLineColor_Yellow"/>
157157
</actionGroup>
158158
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
@@ -234,7 +234,7 @@
234234
<!-- Validate Edit Panel After Save -->
235235
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
236236
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor">
237-
<argument name="property" value="PageBuilderDividerLineColor_FF5733Lower"/>
237+
<argument name="property" value="PageBuilderDividerLineColor_FF5733"/>
238238
</actionGroup>
239239
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
240240
<argument name="contentType" value="PageBuilderDividerContentType"/>
@@ -243,7 +243,7 @@
243243
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
244244
<actionGroup ref="validateDivider" stepKey="validateStorefront">
245245
<argument name="page" value="DividerOnStorefront"/>
246-
<argument name="color" value="PageBuilderDividerLineColor_FF5733Lower"/>
246+
<argument name="color" value="PageBuilderDividerLineColor_FF5733"/>
247247
<argument name="thickness" value="PageBuilderDividerLineThickness_Default"/>
248248
<argument name="width" value="PageBuilderDividerLineWidth_Default"/>
249249
</actionGroup>
@@ -295,7 +295,7 @@
295295
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
296296
<argument name="contentType" value="PageBuilderDividerContentType"/>
297297
</actionGroup>
298-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor1">
298+
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="validateColor1">
299299
<argument name="property" value="PageBuilderDividerLineColor_RGB255_087_051"/>
300300
</actionGroup>
301301
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
@@ -314,8 +314,8 @@
314314
</actionGroup>
315315
<!-- Validate Edit Panel After Save -->
316316
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
317-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor">
318-
<argument name="property" value="PageBuilderDividerLineColor_FF5733Lower"/>
317+
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="validateColor">
318+
<argument name="property" value="PageBuilderDividerLineColor_RGB255_087_051"/>
319319
</actionGroup>
320320
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
321321
<argument name="contentType" value="PageBuilderDividerContentType"/>
@@ -395,8 +395,8 @@
395395
</actionGroup>
396396
<!-- Validate Edit Panel After Save -->
397397
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
398-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor">
399-
<argument name="property" value="PageBuilderDividerLineColor_FF5733Lower"/>
398+
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="validateColor">
399+
<argument name="property" value="PageBuilderDividerLineColor_RGBA255_087_051_50"/>
400400
</actionGroup>
401401
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
402402
<argument name="contentType" value="PageBuilderDividerContentType"/>
@@ -457,7 +457,7 @@
457457
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
458458
<argument name="contentType" value="PageBuilderDividerContentType"/>
459459
</actionGroup>
460-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor1">
460+
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="validateColor1">
461461
<argument name="property" value="PageBuilderDividerLineColor_HSL11_100_60"/>
462462
</actionGroup>
463463
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
@@ -476,8 +476,8 @@
476476
</actionGroup>
477477
<!-- Validate Edit Panel After Save -->
478478
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
479-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor">
480-
<argument name="property" value="PageBuilderDividerLineColor_FF5833Lower"/>
479+
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="validateColor">
480+
<argument name="property" value="PageBuilderDividerLineColor_HSL11_100_60"/>
481481
</actionGroup>
482482
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
483483
<argument name="contentType" value="PageBuilderDividerContentType"/>
@@ -538,7 +538,7 @@
538538
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
539539
<argument name="contentType" value="PageBuilderDividerContentType"/>
540540
</actionGroup>
541-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor1">
541+
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="validateColor1">
542542
<argument name="property" value="PageBuilderDividerLineColor_HSLA11_100_60_50"/>
543543
</actionGroup>
544544
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
@@ -557,8 +557,8 @@
557557
</actionGroup>
558558
<!-- Validate Edit Panel After Save -->
559559
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
560-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor">
561-
<argument name="property" value="PageBuilderDividerLineColor_FF5833Lower"/>
560+
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="validateColor">
561+
<argument name="property" value="PageBuilderDividerLineColor_HSL11_100_60"/>
562562
</actionGroup>
563563
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
564564
<argument name="contentType" value="PageBuilderDividerContentType"/>
@@ -605,7 +605,10 @@
605605
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterDividerLineColor">
606606
<argument name="property" value="PageBuilderDividerLineColor_Invalid"/>
607607
</actionGroup>
608-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
608+
<actionGroup ref="saveEditPanelAndValidateFieldErrorGeneralSection" stepKey="validateError">
609+
<argument name="property" value="PageBuilderDividerLineColor_Invalid"/>
610+
</actionGroup>
611+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
609612
<!-- Validate Stage -->
610613
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
611614
<actionGroup ref="validateDivider" stepKey="validateStage">
@@ -614,39 +617,26 @@
614617
<argument name="thickness" value="PageBuilderDividerLineThickness_Default"/>
615618
<argument name="width" value="PageBuilderDividerLineWidth_Default"/>
616619
</actionGroup>
617-
<!-- Validate Edit Panel -->
618-
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
620+
<!-- Set Valid After Invalid Line Color -->
621+
<comment userInput="Set Valid After Invalid Line Color" stepKey="commentSetBackgroundColor2"/>
619622
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
620623
<argument name="contentType" value="PageBuilderDividerContentType"/>
621624
</actionGroup>
622-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor1">
625+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor2">
623626
<argument name="property" value="PageBuilderDividerLineColor_Invalid"/>
624627
</actionGroup>
625-
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
626-
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
627-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
628-
<!-- Validate Stage After Save -->
629-
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
630-
<actionGroup ref="validateDividerWithoutColor" stepKey="validateStage2">
631-
<argument name="page" value="DividerOnStage"/>
632-
<argument name="thickness" value="PageBuilderDividerLineThickness_Default"/>
633-
<argument name="width" value="PageBuilderDividerLineWidth_Default"/>
634-
</actionGroup>
635-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage3">
636-
<argument name="contentType" value="PageBuilderDividerContentType"/>
637-
</actionGroup>
638-
<!-- Validate Edit Panel After Save -->
639-
<comment userInput="Validate Edit Panel After Save" stepKey="commentValidateEditPanel2"/>
640-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateColor">
641-
<argument name="property" value="PageBuilderDividerLineColor_Empty"/>
628+
<actionGroup ref="saveEditPanelAndValidateFieldErrorGeneralSection" stepKey="validateError2">
629+
<argument name="property" value="PageBuilderDividerLineColor_Invalid"/>
642630
</actionGroup>
643-
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
644-
<argument name="contentType" value="PageBuilderDividerContentType"/>
631+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor3">
632+
<argument name="property" value="PageBuilderDividerLineColor_FF5733"/>
645633
</actionGroup>
646-
<!-- Validate Storefront -->
647-
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
648-
<actionGroup ref="validateDividerWithoutColor" stepKey="validateStorefront">
649-
<argument name="page" value="DividerOnStorefront"/>
634+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
635+
<!-- Stage: Check Line Color After Valid Save -->
636+
<comment userInput="Stage: Check Line Color After Valid Save" stepKey="commentStageCheck2"/>
637+
<actionGroup ref="validateDivider" stepKey="validateStage2">
638+
<argument name="page" value="DividerOnStage"/>
639+
<argument name="color" value="PageBuilderDividerLineColor_FF5733"/>
650640
<argument name="thickness" value="PageBuilderDividerLineThickness_Default"/>
651641
<argument name="width" value="PageBuilderDividerLineWidth_Default"/>
652642
</actionGroup>

0 commit comments

Comments
 (0)