Skip to content

Commit 907b592

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'origin/MC-3723-advanced-fields' into cms-team-1-delivery
2 parents 5556b50 + 18e7375 commit 907b592

File tree

8 files changed

+1058
-809
lines changed

8 files changed

+1058
-809
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,23 @@
1919
<fillField selector="{{AdvancedForm.advancedMarginBottom}}" userInput="{{property.marginBottom}}" stepKey="fillMarginBottomField"/>
2020
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
2121
</actionGroup>
22+
<actionGroup name="fillSlideOutPanelSingleFieldMarginsOrPadding">
23+
<arguments>
24+
<argument name="field" type="string"/>
25+
<argument name="value" type="string"/>
26+
</arguments>
27+
<waitForElement selector="{{AdvancedForm.advancedMarginsOrPaddingField(field)}}" stepKey="waitForElement"/>
28+
<fillField selector="{{AdvancedForm.advancedMarginsOrPaddingField(field)}}" userInput="{{value}}" stepKey="fillFieldMarginOrPadding"/>
29+
</actionGroup>
30+
<actionGroup name="validateMarginsOrPaddingError">
31+
<arguments>
32+
<argument name="property"/>
33+
<argument name="errorMessage" type="string"/>
34+
</arguments>
35+
<waitForElementVisible selector="{{EditPanelForm.panelSectionError(property.section)}}" stepKey="waitForSectionChangedIcon"/>
36+
<seeElement selector="{{EditPanelForm.panelSectionError(property.section)}}" stepKey="seeElementSectionChangedIcon"/>
37+
<see userInput="{{errorMessage}}" selector="{{AdvancedForm.advancedMarginAndPaddingErrorMessage}}" stepKey="seeErrorMessage"/>
38+
</actionGroup>
2239
<actionGroup name="fillSlideOutPanelFieldPadding">
2340
<arguments>
2441
<argument name="property" defaultValue=""/>

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

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,19 @@
215215
<data key="fieldName">border_width</data>
216216
<data key="value"/>
217217
</entity>
218-
<entity name="PageBuilderAdvancedBorderWidthPropertyInvalid" type="pagebuilder_advanced_border_width_property">
218+
<entity name="PageBuilderAdvancedBorderWidthProperty_NonNumeric" type="pagebuilder_advanced_border_width_property">
219219
<data key="name">Border Width</data>
220220
<data key="section">advanced</data>
221221
<data key="fieldName">border_width</data>
222222
<data key="value">garbage</data>
223+
<data key="errorMessage">Please enter a valid number in this field.</data>
224+
</entity>
225+
<entity name="PageBuilderAdvancedBorderWidthProperty_Negative" type="pagebuilder_advanced_border_width_property">
226+
<data key="name">Border Width</data>
227+
<data key="section">advanced</data>
228+
<data key="fieldName">border_width</data>
229+
<data key="value">-1</data>
230+
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
223231
</entity>
224232
<!-- Border Radius -->
225233
<entity name="PageBuilderAdvancedBorderRadiusDefaultProperty" type="pagebuilder_advanced_border_radius_property">
@@ -254,11 +262,19 @@
254262
<data key="fieldName">border_radius</data>
255263
<data key="value">500</data>
256264
</entity>
257-
<entity name="PageBuilderAdvancedBorderRadiusPropertyInvalid" type="pagebuilder_advanced_border_radius_property">
265+
<entity name="PageBuilderAdvancedBorderRadiusProperty_NonNumeric" type="pagebuilder_advanced_border_radius_property">
258266
<data key="name">Border Radius</data>
259267
<data key="section">advanced</data>
260268
<data key="fieldName">border_radius</data>
261269
<data key="value">garbage</data>
270+
<data key="errorMessage">Please enter a valid number in this field.</data>
271+
</entity>
272+
<entity name="PageBuilderAdvancedBorderRadiusProperty_Negative" type="pagebuilder_advanced_border_radius_property">
273+
<data key="name">Border Radius</data>
274+
<data key="section">advanced</data>
275+
<data key="fieldName">border_radius</data>
276+
<data key="value">-1</data>
277+
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
262278
</entity>
263279
<!-- CSS Classes -->
264280
<entity name="PageBuilderAdvancedCssClassesDefaultProperty" type="pagebuilder_advanced_css_classes_property">
@@ -349,14 +365,15 @@
349365
<data key="marginBottom">3</data>
350366
<data key="marginLeft">4</data>
351367
</entity>
352-
<entity name="PageBuilderMarginsPropertyInvalid" type="pagebuilder_margins_property">
368+
<entity name="PageBuilderMarginsProperty_NonNumeric" type="pagebuilder_margins_property">
353369
<data key="name">Margins and Padding</data>
354370
<data key="section">advanced</data>
355371
<data key="fieldName">margins_and_padding</data>
356372
<data key="marginTop">garbage</data>
357373
<data key="marginRight">garbage</data>
358374
<data key="marginBottom">garbage</data>
359375
<data key="marginLeft">garbage</data>
376+
<data key="errorMessage">Please enter a valid number in this field.</data>
360377
</entity>
361378
<entity name="PageBuilderMarginsPropertyRowDefault" type="pagebuilder_margins_property">
362379
<data key="name">Margins and Padding</data>
@@ -528,4 +545,15 @@
528545
<data key="paddingBottom">0</data>
529546
<data key="paddingLeft">0</data>
530547
</entity>
548+
<entity name="PageBuilderAdvancedMarginsAndPaddingBoundaryData" type="pagebuilder_advanced_margins_and_padding_property">
549+
<data key="name">Margins and Padding</data>
550+
<data key="section">advanced</data>
551+
<data key="fieldName">margins_and_padding</data>
552+
<data key="invalidString">garbage</data>
553+
<data key="invalidMin">-1000</data>
554+
<data key="invalidMax">1000</data>
555+
<data key="invalidStringError">Please enter a valid number in this field.</data>
556+
<data key="invalidMinError">Please enter a value greater than or equal to -999.</data>
557+
<data key="invalidMaxError">Please enter a value less than or equal to 999.</data>
558+
</entity>
531559
</entities>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<element name="marginNote" type="input" selector="//div[@data-index='margins_and_padding']//span[.='Margin']"/>
6363
<element name="paddingNote" type="input" selector="//div[@data-index='margins_and_padding']//span[.='Padding']"/>
6464
<element name="advancedMarginsAndPadding" type="input" selector="//input[@name='margins_and_padding']"/>
65+
<element name="advancedMarginsOrPaddingField" type="input" selector="//input[@name='{{arg1}}']" parameterized="true"/>
6566
<element name="advancedMarginTop" type="input" selector="//input[@name='marginTop']"/>
6667
<element name="advancedMarginRight" type="input" selector="//input[@name='marginRight']"/>
6768
<element name="advancedMarginBottom" type="input" selector="//input[@name='marginBottom']"/>
@@ -71,6 +72,7 @@
7172
<element name="advancedPaddingBottom" type="input" selector="//input[@name='paddingBottom']"/>
7273
<element name="advancedPaddingLeft" type="input" selector="//input[@name='paddingLeft']"/>
7374
<element name="advancedMarginAndPaddingPlaceholderText" type="input" selector="//input[@name='{{arg1}}' and @placeholder='{{arg2}}']" parameterized="true"/>
75+
<element name="advancedMarginAndPaddingErrorMessage" type="button" selector="//div[@data-index='margins_and_padding']/descendant::label[not(contains(@style,'display: none;'))][2]"/>
7476
</section>
7577
<section name="ColorPicker">
7678
<element name="panelEmptyColorSwatch" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//input[@name='{{arg2}}']//..//div[contains(@class,'sp-clear-display')]" parameterized="true"/>

0 commit comments

Comments
 (0)