Skip to content

Commit 621e113

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'origin/MC-4057-fix-attached-mftf-skipped-tests' into cms-team-1-delivery
2 parents c3a34d3 + eed472b commit 621e113

10 files changed

+374
-109
lines changed

‎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/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)