Skip to content

Commit b1566a3

Browse files
tjwiebelltjwiebell
committed
Merge remote-tracking branch 'origin/MC-401-remove-advanced-attributes' into MC-506-Tech-Debt-Split-ActionGroup-and-Section-Into-Multiple-Files
2 parents 792b468 + 6f30611 commit b1566a3

File tree

19 files changed

+214
-71
lines changed

19 files changed

+214
-71
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,4 +428,19 @@
428428
<waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible" />
429429
<seeElement selector="//li[@name='{{property.value}}' and contains(@class,'active')]" stepKey="alignmentIsSelected" />
430430
</actionGroup>
431+
<actionGroup name="validateAdvancedStyleWithNoConfiguration">
432+
<arguments>
433+
<argument name="page" defaultValue=""/>
434+
<argument name="index" defaultValue="1" type="string"/>
435+
</arguments>
436+
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForElementVisible"/>
437+
<waitForElementVisible selector="{{page.noAlignment(index)}}" stepKey="waitForAlignmentVisible"/>
438+
<waitForElementVisible selector="{{page.noBorder(index)}}" stepKey="waitForBorderVisible"/>
439+
<waitForElementVisible selector="{{page.noBorderColor(index)}}" stepKey="waitForBorderColorVisible"/>
440+
<waitForElementVisible selector="{{page.noBorderWidth(index)}}" stepKey="waitForBorderWidthVisible"/>
441+
<waitForElementVisible selector="{{page.noBorderRadius(index)}}" stepKey="waitForBorderRadiusVisible"/>
442+
<waitForElementVisible selector="{{page.noCssClasses(index)}}" stepKey="waitForCSSClassesVisible"/>
443+
<waitForElementVisible selector="{{page.noMargins(index)}}" stepKey="waitForMarginVisible"/>
444+
<waitForElementVisible selector="{{page.noPadding(index)}}" stepKey="waitForPaddingVisible"/>
445+
</actionGroup>
431446
</actionGroups>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,12 @@
208208
<data key="fieldName">border_width</data>
209209
<data key="value">500</data>
210210
</entity>
211+
<entity name="PageBuilderAdvancedBorderWidthProperty_Empty" type="pagebuilder_advanced_border_width_property">
212+
<data key="name">Border Width</data>
213+
<data key="section">advanced</data>
214+
<data key="fieldName">border_width</data>
215+
<data key="value"/>
216+
</entity>
211217
<entity name="PageBuilderAdvancedBorderWidthPropertyInvalid" type="pagebuilder_advanced_border_width_property">
212218
<data key="name">Border Width</data>
213219
<data key="section">advanced</data>

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

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2423,4 +2423,123 @@
24232423
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
24242424
</actionGroup>
24252425
</test>
2426+
<test name="AdvancedConfigurationRemoveAllAttributes">
2427+
<annotations>
2428+
<features value="PageBuilder"/>
2429+
<stories value="Advanced Configuration"/>
2430+
<title value="Advanced Configuration - Remove - All Attributes"/>
2431+
<description value="Tests that all attributes are removed on Stage and Storefront for Text"/>
2432+
<severity value="AVERAGE"/>
2433+
<testCaseId value="MC-2319"/>
2434+
<useCaseId value="MC-401"/>
2435+
<group value="pagebuilder"/>
2436+
<group value="pagebuilder-advancedConfig"/>
2437+
</annotations>
2438+
<before>
2439+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2440+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2441+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2442+
</before>
2443+
<after>
2444+
<actionGroup ref="logout" stepKey="logout"/>
2445+
</after>
2446+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
2447+
<argument name="contentType" value="PageBuilderTextContentType"/>
2448+
</actionGroup>
2449+
<!-- Add Text To Stage -->
2450+
<comment userInput="Add Text To Stage" stepKey="commentAddText"/>
2451+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage">
2452+
<argument name="contentType" value="PageBuilderTextContentType"/>
2453+
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
2454+
<argument name="containerTargetIndex" value="1"/>
2455+
<argument name="contentTypeIndex" value="1"/>
2456+
</actionGroup>
2457+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
2458+
<argument name="contentType" value="PageBuilderTextContentType"/>
2459+
<argument name="contentTypeIndex" value="1"/>
2460+
</actionGroup>
2461+
<actionGroup ref="addTextToTinyMCE" stepKey="enterText">
2462+
<argument name="property" value="PageBuilderTextContentType"/>
2463+
</actionGroup>
2464+
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
2465+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAlignmentCenter">
2466+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyCenter"/>
2467+
</actionGroup>
2468+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="selectBorder">
2469+
<argument name="property" value="PageBuilderAdvancedBorderPropertySolid"/>
2470+
</actionGroup>
2471+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderColor">
2472+
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_green"/>
2473+
</actionGroup>
2474+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderWidth">
2475+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty10"/>
2476+
</actionGroup>
2477+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderRadius">
2478+
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty12"/>
2479+
</actionGroup>
2480+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterCSSClasses">
2481+
<argument name="property" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
2482+
</actionGroup>
2483+
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins">
2484+
<argument name="property" value="PageBuilderMarginsPropertyUnique"/>
2485+
</actionGroup>
2486+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
2487+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
2488+
</actionGroup>
2489+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
2490+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
2491+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
2492+
<!-- Clear Advanced Configuration Section -->
2493+
<comment userInput="Clear Advanced Configuration Section" stepKey="commentClearAdvancedConfigurationSection"/>
2494+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage2">
2495+
<argument name="contentType" value="PageBuilderTextContentType"/>
2496+
<argument name="contentTypeIndex" value="1"/>
2497+
</actionGroup>
2498+
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
2499+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAlignmentDefault">
2500+
<argument name="property" value="PageBuilderAdvancedAlignmentPropertyDefault"/>
2501+
</actionGroup>
2502+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="selectBorderDefault">
2503+
<argument name="property" value="PageBuilderAdvancedBorderPropertyDefault"/>
2504+
</actionGroup>
2505+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderColorEmpty">
2506+
<argument name="property" value="PageBuilderAdvancedBorderColorProperty_Empty"/>
2507+
</actionGroup>
2508+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderWidthEmpty">
2509+
<argument name="property" value="PageBuilderAdvancedBorderWidthProperty_Empty"/>
2510+
</actionGroup>
2511+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBorderRadiusEmpty">
2512+
<argument name="property" value="PageBuilderAdvancedBorderRadiusProperty_Empty"/>
2513+
</actionGroup>
2514+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterCSSClassesEmpty">
2515+
<argument name="property" value="PageBuilderAdvancedCssClassesProperty_Empty"/>
2516+
</actionGroup>
2517+
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMarginsEmpty">
2518+
<argument name="property" value="PageBuilderMarginsProperty_Empty"/>
2519+
</actionGroup>
2520+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPaddingEmpty">
2521+
<argument name="property" value="PageBuilderPaddingProperty_Empty"/>
2522+
</actionGroup>
2523+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
2524+
<!-- Stage: Check All Attributes -->
2525+
<comment userInput="Stage: Check All Attributes" stepKey="commentStageCheck2"/>
2526+
<actionGroup ref="validateAdvancedStyleWithNoConfiguration" stepKey="validateStage3">
2527+
<argument name="page" value="TextOnStage"/>
2528+
</actionGroup>
2529+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
2530+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
2531+
<!-- Stage: Check All Attributes -->
2532+
<comment userInput="Validate Stage After Save" stepKey="commentStageAfterSave3"/>
2533+
<actionGroup ref="validateAdvancedStyleWithNoConfiguration" stepKey="validateStage4">
2534+
<argument name="page" value="TextOnStage"/>
2535+
</actionGroup>
2536+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
2537+
<argument name="contentType" value="PageBuilderTextContentType"/>
2538+
</actionGroup>
2539+
<!-- Storefront: Check All Attributes -->
2540+
<comment userInput="Storefront: Check All Attributes" stepKey="commentStorefrontCheck"/>
2541+
<actionGroup ref="validateAdvancedStyleWithNoConfiguration" stepKey="validateStorefront">
2542+
<argument name="page" value="TextOnStorefront"/>
2543+
</actionGroup>
2544+
</test>
24262545
</tests>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -678,10 +678,9 @@
678678
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
679679
<!-- Validate Stage -->
680680
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
681-
<actionGroup ref="validateDivider" stepKey="validateStage">
681+
<actionGroup ref="validateDividerWithoutThickness" stepKey="validateStage">
682682
<argument name="page" value="DividerOnStage"/>
683683
<argument name="color" value="PageBuilderDividerLineColor_Default"/>
684-
<argument name="thickness" value="PageBuilderDividerLineThickness_Default"/>
685684
<argument name="width" value="PageBuilderDividerLineWidth_Default"/>
686685
</actionGroup>
687686
<!-- Validate Edit Panel -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@
754754
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
755755
<waitForElementVisible selector="{{DividerOnStage.base('1')}}" stepKey="waitForElementVisible"/>
756756
<waitForElementVisible selector="{{DividerOnStage.noColor('1')}}" stepKey="waitForColorVisible"/>
757-
<waitForElementVisible selector="{{DividerOnStage.thickness('1', PageBuilderDividerLineThickness_Default.value)}}" stepKey="waitForThicknessVisible"/>
757+
<waitForElementVisible selector="{{DividerOnStage.noThickness('1')}}" stepKey="waitForThicknessVisible"/>
758758
<waitForElementVisible selector="{{DividerOnStage.noWidth('1')}}" stepKey="waitForWidthVisible"/>
759759
</test>
760760
</tests>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/row/converter/style/margins-and-paddings.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/converter/style/margins-and-paddings.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/style/border-style.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/style/border-width.js

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/style/margins-and-paddings.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)