Skip to content

Commit 0c8c972

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'develop' into MC-4014-performance
# Conflicts: # app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/preview.js # app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/preview.js # app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/image/preview.js # app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/preview.js # app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/preview.js # app/code/Magento/PageBuilder/view/adminhtml/web/js/stage.js # app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts # ts-errors.json
2 parents 7dc83ba + 5da3bf7 commit 0c8c972

File tree

173 files changed

+3796
-2217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+3796
-2217
lines changed

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,6 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="validateBackgroundAttributes">
12-
<arguments>
13-
<argument name="section"/>
14-
<argument name="backgroundColor"/>
15-
<argument name="backgroundImage"/>
16-
<argument name="backgroundPosition" defaultValue="PageBuilderBackgroundPosition_Default"/>
17-
<argument name="backgroundSize" defaultValue="PageBuilderBackgroundSize_Default"/>
18-
<argument name="backgroundRepeat" defaultValue="PageBuilderBackgroundRepeat_Default"/>
19-
<argument name="backgroundAttachment" defaultValue="PageBuilderBackgroundAttachment_Default"/>
20-
<argument name="index" defaultValue="1" type="string"/>
21-
</arguments>
22-
<waitForElementVisible selector="{{section.base(index)}}" stepKey="waitForBaseElement"/>
23-
<waitForElementVisible selector="{{section.backgroundColor(index, backgroundColor.rgb)}}" stepKey="waitForBackgroundColor"/>
24-
<waitForElementVisible selector="{{section.backgroundImage(index, backgroundImage.fileName)}}" stepKey="waitForBackgroundImage"/>
25-
<waitForElementVisible selector="{{section.backgroundPosition(index, backgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
26-
<waitForElementVisible selector="{{section.backgroundSize(index, backgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
27-
<waitForElementVisible selector="{{section.backgroundRepeat(index, backgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
28-
<waitForElementVisible selector="{{section.backgroundAttachment(index, backgroundAttachment.value)}}" stepKey="waitForBackgroundAttachment"/>
29-
</actionGroup>
3011
<actionGroup name="validateBackgroundAttributesWithNoImageOrColor">
3112
<arguments>
3213
<argument name="section"/>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,17 @@
100100
<data key="fieldName">appearance</data>
101101
<data key="value">collage-right</data>
102102
</entity>
103+
<!-- Box Shadow -->
104+
<entity name="PageBuilderBoxShadowProperty_Default" type="pagebuilder_box_shadow_property">
105+
<data key="name">Box Shadow</data>
106+
<data key="value">rgba(153, 153, 153, 0.3) 0px 0px 0px 1px</data>
107+
</entity>
108+
<entity name="PageBuilderBoxShadowProperty_No_Box_Shadow" type="pagebuilder_box_shadow_property">
109+
<data key="name">Box Shadow</data>
110+
<data key="value">rgba(153, 153, 153, 0) 0px 0px 0px 1px</data>
111+
</entity>
112+
<entity name="PageBuilderBoxShadowOnHoverProperty_Default" type="pagebuilder_box_shadow_property">
113+
<data key="name">Box Shadow</data>
114+
<data key="value">rgb(153, 153, 153) 0px 0px 0px 1px</data>
115+
</entity>
103116
</entities>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
<data key="name">Products</data>
130130
<data key="section">Add Content</data>
131131
<data key="role">products</data>
132+
<data key="editPanelName">Products</data>
132133
<data key="pageNamePrefix">products</data>
133134
</entity>
134135
</entities>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<element name="rowH2ChildWidthJS" type="text" selector="document.querySelectorAll('div[data-appearance~=\'{{arg1}}\'] .element-children')[{{arg2}}].clientWidth" parameterized="true"/>
3737
<element name="appearanceContained" type="text" selector="(//div[@data-role='row'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
3838
<element name="appearanceFullWidthFullBleed" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
39-
4039
<!-- Background Configuration -->
4140
<element name="backgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
4241
<element name="noBackgroundColor" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][not(contains(@style,'background-color:'))]" parameterized="true"/>
@@ -67,6 +66,11 @@
6766
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
6867
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-row')])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
6968
</section>
69+
<section name="RowOnStage_Contained_Invalid">
70+
<element name="border" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
71+
<element name="borderColor" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
72+
<element name="borderWidth" type="text" selector="(//div[@data-role='row'])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
73+
</section>
7074
<section name="RowOnStorefront">
7175
<element name="base" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div" parameterized="true"/>
7276
<element name="baseJS" type="text" selector="document.querySelectorAll('[data-role=row] > div')[{{arg1}} - 1]" parameterized="true"/>

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,10 +1042,15 @@
10421042
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsIntoStage">
10431043
<argument name="contentType" value="PageBuilderButtonsContentType"/>
10441044
</actionGroup>
1045+
<actionGroup ref="addButton" stepKey="addButton" />
10451046
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton1">
10461047
<argument name="text" value="PageBuilderButtonItemText_First"/>
10471048
<argument name="index" value="1"/>
10481049
</actionGroup>
1050+
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton2">
1051+
<argument name="text" value="PageBuilderButtonItemText_Second"/>
1052+
<argument name="index" value="2"/>
1053+
</actionGroup>
10491054
<actionGroup ref="hideContentType" stepKey="hideContentType">
10501055
<argument name="section" value="ButtonGroupOnStage"/>
10511056
<argument name="contentType" value="PageBuilderButtonsContentType"/>
@@ -1056,10 +1061,12 @@
10561061
<comment userInput="Validate content type remains disabled after save" stepKey="commentValidateHiddenStage"/>
10571062
<seeElement selector="{{ButtonGroupOnStage.hidden('1')}}" stepKey="waitForContentTypeHidden" />
10581063
<seeElement selector="{{ButtonItemOnStage.hidden('1')}}" stepKey="waitForContentTypeHiddenButtonItem" />
1064+
<seeElement selector="{{ButtonItemOnStage.hidden('2')}}" stepKey="waitForContentTypeHiddenButtonItem2" />
10591065
<!-- Verify we cannot interact with the internal button after save -->
10601066
<comment userInput="Verify we cannot interact with the internal button after save" stepKey="commentVerifyButtonItemIsDisabledAfterSave"/>
10611067
<seeElementInDOM selector="{{ButtonItemOnStage.optionsMenu('1')}}" stepKey="seeDomButtonItemOptionsMenu"/>
10621068
<dontSeeElement selector="{{ButtonItemOnStage.optionsMenu('1')}}" stepKey="dontSeeButtonItemOptionsMenu"/>
1069+
<dontSeeElement selector="{{ButtonItemOnStage.optionsMenu('2')}}" stepKey="dontSeeButtonItem2OptionsMenu"/>
10631070
<!-- Validate store front -->
10641071
<comment userInput="Validate content type is disabled on storefront" stepKey="commentValidateHiddenStorefront"/>
10651072
<openNewTab stepKey="openNewTab" />
@@ -1071,6 +1078,7 @@
10711078
<seeElementInDOM selector="{{ButtonGroupOnStorefront.hidden('1')}}" stepKey="waitForHiddenElement" />
10721079
<waitForElement selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonItemNotVisible" />
10731080
<dontSeeElement selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="dontSeeButtonItem" />
1081+
<dontSeeElement selector="{{ButtonItemOnStorefront.base('2')}}" stepKey="dontSeeButtonItem2" />
10741082
<!-- Set content to visible in admin -->
10751083
<comment userInput="Set content to visible in admin" stepKey="commentSetContentToVisibleAdmin"/>
10761084
<switchToNextTab stepKey="switchBackToAdmin" />
@@ -1090,5 +1098,33 @@
10901098
<dontSeeElementInDOM selector="{{ButtonGroupOnStorefront.hidden('1')}}" stepKey="dontSeeHiddenElement"/>
10911099
<seeElement selector="{{ButtonGroupOnStorefront.base('1')}}" stepKey="waitForButtonGroupVisible" />
10921100
<seeElement selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonItemVisible" />
1101+
<seeElement selector="{{ButtonItemOnStorefront.base('2')}}" stepKey="waitForButtonItem2Visible" />
1102+
</test>
1103+
<test name="ValidateShowHideOnButtonsOnStackedAppearance" extends="ValidateShowHideOnButtons">
1104+
<annotations>
1105+
<features value="PageBuilder"/>
1106+
<stories value="Buttons"/>
1107+
<title value="Button Group - Buttons has hide show capabilities on stacked appearance"/>
1108+
<description value="A user is able to hide and show the buttons successfully when using stacked appearance"/>
1109+
<severity value="CRITICAL"/>
1110+
<useCaseId value="MC-4093"/>
1111+
<testCaseId value="MC-4230"/>
1112+
<group value="pagebuilder"/>
1113+
<group value="pagebuilder-buttons"/>
1114+
<group value="pagebuilder-buttonItem"/>
1115+
<group value="pagebuilder-hideShow"/>
1116+
</annotations>
1117+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu" after="dragButtonsIntoStage">
1118+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1119+
</actionGroup>
1120+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage" after="unFocusOptionMenu">
1121+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1122+
</actionGroup>
1123+
<!-- Select Stacked Appearance -->
1124+
<comment userInput="Select Stacked Appearances" stepKey="commentSelectStackedAppearance" after="openEditMenuOnStage"/>
1125+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance" after="commentSelectStackedAppearance">
1126+
<argument name="property" value="PageBuilderButtonGroupAppearance_Stacked"/>
1127+
</actionGroup>
1128+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1" after="enterAppearance"/>
10931129
</test>
10941130
</tests>

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@
525525
<title value="Can close the edit panel"/>
526526
<description value="A user should be able to open the edit form on an added column."/>
527527
<severity value="CRITICAL"/>
528-
<useCaseId value="MAGETWO-66176"/>
528+
<useCaseId value="MC-1954"/>
529529
<testCaseId value="MC-2582"/>
530530
<group value="pagebuilder"/>
531531
<group value="pagebuilder-column"/>
@@ -620,13 +620,10 @@
620620
<title value="Column appearance settings show on frontend"/>
621621
<description value="Validate column appearance settings appear on the frontend"/>
622622
<severity value="CRITICAL"/>
623-
<useCaseId value="MAGETWO-66176"/>
623+
<useCaseId value="MC-1954"/>
624624
<testCaseId value="MC-2383"/>
625625
<group value="pagebuilder"/>
626626
<group value="pagebuilder-column"/>
627-
<skip>
628-
<issueId value="MC-4057"/>
629-
</skip>
630627
</annotations>
631628
<before>
632629
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -636,12 +633,14 @@
636633
<after>
637634
<actionGroup ref="logout" stepKey="logout"/>
638635
</after>
636+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop"/>
639637
<actionGroup ref="dragContentTypeToContainer" stepKey="dragFirstTwoColumns">
640638
<argument name="contentType" value="PageBuilderColumnContentType"/>
641639
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
642640
<argument name="containerTargetIndex" value="1"/>
643641
<argument name="contentTypeIndex" value="1"/>
644642
</actionGroup>
643+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop2"/>
645644
<actionGroup ref="dragContentTypeToContainer" stepKey="dragThirdColumn">
646645
<argument name="contentType" value="PageBuilderColumnContentType"/>
647646
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -697,13 +696,10 @@
697696
<title value="Column settings appear on the column form after page save"/>
698697
<description value="Validate selected column settings appear on the form after page save"/>
699698
<severity value="CRITICAL"/>
700-
<useCaseId value="MAGETWO-66176"/>
699+
<useCaseId value="MC-1954"/>
701700
<testCaseId value="MC-2384"/>
702701
<group value="pagebuilder"/>
703702
<group value="pagebuilder-column"/>
704-
<skip>
705-
<issueId value="MC-4057"/>
706-
</skip>
707703
</annotations>
708704
<before>
709705
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -725,6 +721,7 @@
725721
</actionGroup>
726722
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForFirstColumn">
727723
<argument name="contentType" value="PageBuilderColumnContentType"/>
724+
<argument name="contentTypeIndex" value="1"/>
728725
</actionGroup>
729726
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
730727
<argument name="property" value="PageBuilderMinHeightProperty_500"/>
@@ -750,9 +747,9 @@
750747
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
751748
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
752749
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
753-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForSecondColumn">
750+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForFirstColumnAfterSave">
754751
<argument name="contentType" value="PageBuilderColumnContentType"/>
755-
<argument name="contentTypeIndex" value="2"/>
752+
<argument name="contentTypeIndex" value="1"/>
756753
</actionGroup>
757754
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="PageBuilderMinHeightProperty_500">
758755
<argument name="property" value="PageBuilderMinHeightProperty_500"/>
@@ -781,7 +778,7 @@
781778
<title value="Upload and preview an image for column background style"/>
782779
<description value="Upload an image file to edit column form and see a preview in the admin panel"/>
783780
<severity value="CRITICAL"/>
784-
<useCaseId value="MAGETWO-66176"/>
781+
<useCaseId value="MC-1954"/>
785782
<testCaseId value="MC-2395"/>
786783
<group value="pagebuilder"/>
787784
<group value="pagebuilder-column"/>
@@ -814,7 +811,7 @@
814811
<title value="Column background color is preserved on edit"/>
815812
<description value="Validate column background color is preserved on edit"/>
816813
<severity value="CRITICAL"/>
817-
<useCaseId value="MAGETWO-66176"/>
814+
<useCaseId value="MC-1954"/>
818815
<testCaseId value="MC-2401"/>
819816
<group value="pagebuilder"/>
820817
<group value="pagebuilder-column"/>

0 commit comments

Comments
 (0)