Skip to content

Commit 44baefd

Browse files
anthoulaanthoula
committed
Revert "MC-3723: Advanced properties saving when invalid value is specified"
This reverts commit ea34654.
1 parent 46ee369 commit 44baefd

File tree

4 files changed

+35
-29
lines changed

4 files changed

+35
-29
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,12 @@
203203
<data key="fieldName">border_width</data>
204204
<data key="value">10</data>
205205
</entity>
206+
<entity name="PageBuilderAdvancedBorderWidthProperty500" type="pagebuilder_advanced_border_width_property">
207+
<data key="name">Border Width</data>
208+
<data key="section">advanced</data>
209+
<data key="fieldName">border_width</data>
210+
<data key="value">500</data>
211+
</entity>
206212
<entity name="PageBuilderAdvancedBorderWidthProperty_Empty" type="pagebuilder_advanced_border_width_property">
207213
<data key="name">Border Width</data>
208214
<data key="section">advanced</data>
@@ -257,11 +263,11 @@
257263
<data key="fieldName">border_radius</data>
258264
<data key="value">12</data>
259265
</entity>
260-
<entity name="PageBuilderAdvancedBorderRadiusProperty50" type="pagebuilder_advanced_border_radius_property">
266+
<entity name="PageBuilderAdvancedBorderRadiusProperty500" type="pagebuilder_advanced_border_radius_property">
261267
<data key="name">Border Radius</data>
262268
<data key="section">advanced</data>
263269
<data key="fieldName">border_radius</data>
264-
<data key="value">50</data>
270+
<data key="value">500</data>
265271
</entity>
266272
<entity name="PageBuilderAdvancedBorderRadiusProperty_NonNumeric" type="pagebuilder_advanced_border_radius_property">
267273
<data key="name">Border Radius</data>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<element name="tabHeaderItemActive" type="button" selector="//ul[contains(@class, 'tabs-navigation')]/li[{{arg1}}][contains(@class, 'ui-state-active')]" parameterized="true"/>
4444
<element name="tabHeaderItemAdvancedStyles" type="button" selector="(//div[contains(@class,'pagebuilder-tabs')]//descendant::*[contains(@class,'tabs-navigation')]/li[contains(@style, 'border-style: solid; border-radius: 12px; border-color: rgb(0, 0, 0); border-width: 10px; margin-bottom: -10px; margin-left: -10px;')])"/>
4545
<element name="tab1ContentAdvancedStyles" type="button" selector="(//div[contains(@class,'pagebuilder-tabs')]//div[contains(@class,'ui-tabs-panel')])[1]//div[contains(@class, 'pagebuilder-tab-item') and contains(@style, 'text-align: center;') and contains(@style, 'border-style: solid;') and contains(@style, 'border-color: rgb(0, 0, 0);') and contains(@style, 'border-width: 10px;') and contains(@style, 'border-radius: 12px;') and contains(@style, 'margin: 5px;') and contains(@style, 'padding: 5px;')]"/>
46-
<element name="tab2ContentAdvancedStyles" type="button" selector="(//div[contains(@class,'pagebuilder-tabs')]//div[contains(@class,'ui-tabs-panel')])[2]//div[contains(@class, 'pagebuilder-tab-item') and contains(@style, 'text-align: right;') and contains(@style, 'border-style: dotted;') and contains(@style, 'border-color: rgb(255, 0, 0);') and contains(@style, 'border-width: 10px;') and contains(@style, 'border-radius: 50px;') and contains(@style, 'margin: 1px 2px 3px 4px;') and contains(@style, 'padding: 1px 2px 3px 4px;')]"/>
46+
<element name="tab2ContentAdvancedStyles" type="button" selector="(//div[contains(@class,'pagebuilder-tabs')]//div[contains(@class,'ui-tabs-panel')])[2]//div[contains(@class, 'pagebuilder-tab-item') and contains(@style, 'text-align: right;') and contains(@style, 'border-style: dotted;') and contains(@style, 'border-color: rgb(255, 0, 0);') and contains(@style, 'border-width: 500px;') and contains(@style, 'border-radius: 500px;') and contains(@style, 'margin: 1px 2px 3px 4px;') and contains(@style, 'padding: 1px 2px 3px 4px;')]"/>
4747
<element name="empty" type="button" selector="(//div[contains(@class, 'pagebuilder-tabs')]//div[contains(@class, 'pagebuilder-tab-item') and contains(@class, 'empty-container')])"/>
4848
<element name="openOptionsMenu" type="button" selector="(//ul[contains(@class,'tabs-navigation')]//a[contains(@class,'tab-title')])[{{arg1}}]" parameterized="true"/>
4949
<element name="optionsMenu" type="button" selector="(//ul[contains(@class,'tabs-navigation')]//div[contains(@class,'pagebuilder-options-wrapper')])[{{arg1}}]" parameterized="true"/>

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,8 +1319,8 @@
13191319
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
13201320
<argument name="contentType" value="PageBuilderTextContentType"/>
13211321
</actionGroup>
1322-
<!-- Add Border Width: 10 -->
1323-
<comment userInput="Add Border Width: 10" stepKey="commentAddBorderWidth10"/>
1322+
<!-- Add Border Width: 500 -->
1323+
<comment userInput="Add Border Width: 500" stepKey="commentAddBorderWidth500"/>
13241324
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
13251325
<argument name="group" value="PageBuilderTextContentType"/>
13261326
</actionGroup>
@@ -1342,38 +1342,38 @@
13421342
<argument name="property" value="PageBuilderAdvancedBorderPropertySolid"/>
13431343
</actionGroup>
13441344
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderWidth">
1345-
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty10"/>
1345+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty500"/>
13461346
</actionGroup>
13471347
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1348-
<!-- Stage: Check Border Width: 10 -->
1349-
<comment userInput="Stage: Check Border Width: 10" stepKey="commentStageCheck10"/>
1350-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage10">
1348+
<!-- Stage: Check Border Width: 500 -->
1349+
<comment userInput="Stage: Check Border Width: 500" stepKey="commentStageCheck500"/>
1350+
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage500">
13511351
<argument name="page" value="TextOnStage"/>
13521352
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
1353-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
1353+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty500"/>
13541354
<argument name="index" value="1"/>
13551355
</actionGroup>
13561356
<!-- Validate Stage After Save -->
13571357
<comment userInput="Validate Stage After Save" stepKey="commentStageAfterSave"/>
13581358
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
13591359
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
1360-
<!-- Stage: Check Border Width: 10 -->
1361-
<comment userInput="Stage: Check Border Width: 10" stepKey="commentStageCheck102"/>
1362-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage102">
1360+
<!-- Stage: Check Border Width: 500 -->
1361+
<comment userInput="Stage: Check Border Width: 500" stepKey="commentStageCheck5002"/>
1362+
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStage5002">
13631363
<argument name="page" value="TextOnStage"/>
13641364
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
1365-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
1365+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty500"/>
13661366
<argument name="index" value="1"/>
13671367
</actionGroup>
13681368
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
13691369
<argument name="contentType" value="PageBuilderTextContentType"/>
13701370
</actionGroup>
1371-
<!-- Storefront: Check Border Width: 10 -->
1372-
<comment userInput="Storefront: Check Border Width: 500" stepKey="commentStorefrontCheck10"/>
1373-
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStorefront10">
1371+
<!-- Storefront: Check Border Width: 500 -->
1372+
<comment userInput="Storefront: Check Border Width: 500" stepKey="commentStorefrontCheck500"/>
1373+
<actionGroup ref="validateAdvancedStyleWithNoAlignment" stepKey="validateStorefront500">
13741374
<argument name="page" value="TextOnStorefront"/>
13751375
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
1376-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
1376+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty500"/>
13771377
<argument name="index" value="1"/>
13781378
</actionGroup>
13791379
</test>
@@ -2619,10 +2619,10 @@
26192619
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_green"/>
26202620
</actionGroup>
26212621
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderWidth">
2622-
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty10"/>
2622+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty500"/>
26232623
</actionGroup>
26242624
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderRadius">
2625-
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty50"/>
2625+
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty500"/>
26262626
</actionGroup>
26272627
<actionGroup ref="fillSlideOutPanelField" stepKey="enterCSSClasses">
26282628
<argument name="property" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
@@ -2641,8 +2641,8 @@
26412641
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
26422642
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
26432643
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
2644-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
2645-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty50"/>
2644+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty500"/>
2645+
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty500"/>
26462646
<argument name="cssClasses" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
26472647
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
26482648
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
@@ -2657,8 +2657,8 @@
26572657
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
26582658
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
26592659
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
2660-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
2661-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty50"/>
2660+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty500"/>
2661+
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty500"/>
26622662
<argument name="cssClasses" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
26632663
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
26642664
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
@@ -2673,8 +2673,8 @@
26732673
<argument name="alignment" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
26742674
<argument name="border" value="PageBuilderAdvancedBorderPropertySolid"/>
26752675
<argument name="borderColor" value="PageBuilderAdvancedBorderColorProperty_green"/>
2676-
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
2677-
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty50"/>
2676+
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty500"/>
2677+
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty500"/>
26782678
<argument name="cssClasses" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
26792679
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
26802680
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,10 +394,10 @@
394394
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_FF0000"/>
395395
</actionGroup>
396396
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderWidth2">
397-
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty10"/>
397+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty500"/>
398398
</actionGroup>
399399
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBorderRadius2">
400-
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty50"/>
400+
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty500"/>
401401
</actionGroup>
402402
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterCSSClasses2">
403403
<argument name="property" value="PageBuilderAdvancedCssClassesPropertyOneClass"/>
@@ -436,7 +436,7 @@
436436
<waitForElementVisible selector="{{TabOnStorefront.container('2')}}" stepKey="seeNewTabContent"/>
437437
<comment userInput="Verify tab 2 on storefront" stepKey="AC6"/>
438438
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStyles('2', PageBuilderAdvancedAlignmentPropertyRight.value, PageBuilderMarginsPropertyUnique.value, PageBuilderPaddingPropertyUnique.value)}}" stepKey="seeTabHeaderItemAdvancedStylesInStorefront2"/>
439-
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStylesBorder('2', PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_FF0000.rbg, PageBuilderAdvancedBorderWidthProperty10.value, PageBuilderAdvancedBorderRadiusProperty50.value)}}" stepKey="seeTabContentAdvancedStylesBorderInStorefront2"/>
439+
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedStylesBorder('2', PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_FF0000.rbg, PageBuilderAdvancedBorderWidthProperty500.value, PageBuilderAdvancedBorderRadiusProperty500.value)}}" stepKey="seeTabContentAdvancedStylesBorderInStorefront2"/>
440440
<waitForElementVisible selector="{{TabOnStorefront.tabContentAdvancedClass('2', PageBuilderAdvancedCssClassesPropertyOneClass.value)}}" stepKey="seeTabContentClassInStorefront2"/>
441441
</test>
442442
<test name="EditTabNameByClickingOnHeaderInStage">

0 commit comments

Comments
 (0)