Skip to content

Commit 2e6dc4c

Browse files
omiroshnichenkoomiroshnichenko
committed
Merge branch 'develop' of github.com:magento/magento2-page-builder into PB-379
 Conflicts: app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests.xml
2 parents f33a456 + 3233a56 commit 2e6dc4c

File tree

77 files changed

+1795
-1287
lines changed

Some content is hidden

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

77 files changed

+1795
-1287
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,44 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<!-- Appearance -->
12-
<entity name="PageBuilderBannerAppearanceDefaultProperty" type="pagebuilder_banner_appearance_property">
12+
<entity name="PageBuilderBannerAppearanceDefaultProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_Poster instead. Will be removed in PB-413.">
1313
<data key="name">Appearance</data>
1414
<data key="section">appearance_fieldset</data>
1515
<data key="fieldName">appearance</data>
1616
<data key="value">poster</data>
1717
</entity>
18-
<entity name="PageBuilderBannerAppearance_Poster" type="pagebuilder_banner_appearance_property">
18+
<entity name="PageBuilderBannerAppearance_Poster" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_Poster instead. Will be removed in PB-413.">
1919
<data key="name">Appearance</data>
2020
<data key="section">appearance_fieldset</data>
2121
<data key="fieldName">appearance</data>
2222
<data key="value">poster</data>
2323
</entity>
24-
<entity name="PageBuilderBannerCollageLeftProperty" type="pagebuilder_banner_appearance_property">
24+
<entity name="PageBuilderBannerCollageLeftProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_CollageLeft instead. Will be removed in PB-413.">
2525
<data key="name">Appearance</data>
2626
<data key="section">appearance_fieldset</data>
2727
<data key="fieldName">appearance</data>
2828
<data key="value">collage-left</data>
2929
</entity>
30-
<entity name="PageBuilderBannerCollageRightProperty" type="pagebuilder_banner_appearance_property">
30+
<entity name="PageBuilderBannerCollageRightProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_CollageCentered instead. Will be removed in PB-413.">
3131
<data key="name">Appearance</data>
3232
<data key="section">appearance_fieldset</data>
3333
<data key="fieldName">appearance</data>
3434
<data key="value">collage-right</data>
3535
</entity>
36-
<entity name="PageBuilderBannerCollageCenteredProperty" type="pagebuilder_banner_appearance_property">
36+
<entity name="PageBuilderBannerCollageCenteredProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_CollageRight instead. Will be removed in PB-413.">
3737
<data key="name">Appearance</data>
3838
<data key="section">appearance_fieldset</data>
3939
<data key="fieldName">appearance</data>
4040
<data key="value">collage-centered</data>
4141
</entity>
4242
<!-- Minimum Height -->
43-
<entity name="PageBuilderBannerMinimumHeightProperty" type="pagebuilder_banner_minimumHeight_property">
43+
<entity name="PageBuilderBannerMinimumHeightProperty" type="pagebuilder_banner_minimumHeight_property" deprecated="Use PageBuilderMinHeightProperty_500px instead. Will be removed in PB-413.">
4444
<data key="name">Minimum Height</data>
4545
<data key="section">appearance_fieldset</data>
4646
<data key="fieldName">min_height</data>
4747
<data key="value">500</data>
4848
</entity>
49-
<entity name="PageBuilderBannerMinimumHeightDefaultProperty" type="pagebuilder_banner_minimumHeightDefault_property">
49+
<entity name="PageBuilderBannerMinimumHeightDefaultProperty" type="pagebuilder_banner_minimumHeightDefault_property" deprecated="Use PageBuilderMinHeightProperty_300px instead. Will be removed in PB-413.">
5050
<data key="name">Minimum Height</data>
5151
<data key="section">appearance_fieldset</data>
5252
<data key="fieldName">min_height</data>

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

Lines changed: 105 additions & 103 deletions
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<stories value="CMS Block"/>
7070
<title value="Verify PageBuilder does not appear when disabled in CMS Block"/>
7171
<description value="This test is intended to ensure that PageBuilder does not appear when disabled for CMS Block."/>
72-
<severity value="CRITICAL"/>
72+
<severity value="AVERAGE"/>
7373
<useCaseId value="MC-3328"/>
7474
<testCaseId value="MC-13768"/>
7575
<group value="pagebuilder"/>

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<stories value="CMS Block"/>
1515
<title value="Admin should be able to see PageBuilder on CMS Block Page after enable PageBuilder and disable WYSIWYG from Configuration"/>
1616
<description value="Admin should be able to see PageBuilder on CMS Block Page after enable PageBuilder and disable WYSIWYG from Configuration"/>
17-
<severity value="CRITICAL"/>
17+
<severity value="BLOCKER"/>
1818
<useCaseId value="MAGETWO-86314"/>
1919
<testCaseId value="MC-2406"/>
2020
<group value="pagebuilder"/>
@@ -57,7 +57,7 @@
5757
<stories value="CMS Block"/>
5858
<title value="Add and Edit Row, Column, and Slider to PageBuilder in CMS Block"/>
5959
<description value="This test is intended to ensure that basic adding and editing of multiple content types work correctly in the CMS Block area of PageBuilder."/>
60-
<severity value="CRITICAL"/>
60+
<severity value="BLOCKER"/>
6161
<useCaseId value="MC-3328"/>
6262
<testCaseId value="MC-13737"/>
6363
<group value="pagebuilder"/>
@@ -128,7 +128,7 @@
128128
<stories value="CMS Block"/>
129129
<title value="Verify that user can move content types from on-hover option menus in CMS Block"/>
130130
<description value="This test is intended to ensure that users can move content types from the on-hover option menus within the PageBuilder stage for CMS Block."/>
131-
<severity value="CRITICAL"/>
131+
<severity value="MAJOR"/>
132132
<useCaseId value="MC-3328"/>
133133
<testCaseId value="MC-13748"/>
134134
<group value="pagebuilder"/>
@@ -191,7 +191,7 @@
191191
<stories value="CMS Block"/>
192192
<title value="Verify that user can move content types from on-hover option menus in CMS Block"/>
193193
<description value="This test is intended to ensure that users can move content types from the on-hover option menus within the PageBuilder stage for CMS Block."/>
194-
<severity value="CRITICAL"/>
194+
<severity value="BLOCKER"/>
195195
<useCaseId value="MC-3328"/>
196196
<testCaseId value="MC-13751"/>
197197
<group value="pagebuilder"/>
@@ -253,7 +253,7 @@
253253
<stories value="CMS Block"/>
254254
<title value="Verify that user can duplicate content types from on-hover option menus in CMS Block"/>
255255
<description value="This test is intended to ensure that users can duplicate content types from the on-hover option menus within the PageBuilder stage for CMS Block."/>
256-
<severity value="CRITICAL"/>
256+
<severity value="MAJOR"/>
257257
<useCaseId value="MC-3328"/>
258258
<testCaseId value="MC-13752"/>
259259
<group value="pagebuilder"/>
@@ -380,7 +380,7 @@
380380
<stories value="CMS Block"/>
381381
<title value="Verify that user can add child content types from on-hover option menus in CMS Block"/>
382382
<description value="This test is intended to ensure that users can add child content types from the on-hover option menus within the PageBuilder stage for CMS Block."/>
383-
<severity value="CRITICAL"/>
383+
<severity value="BLOCKER"/>
384384
<useCaseId value="MC-3328"/>
385385
<testCaseId value="MC-13757"/>
386386
<group value="pagebuilder"/>
@@ -440,7 +440,7 @@
440440
<stories value="CMS Block"/>
441441
<title value="Verify that user can edit content types from on-hover option menus in CMS Block"/>
442442
<description value="This test is intended to ensure that users can edit content types from the on-hover option menus within the PageBuilder stage for CMS Block."/>
443-
<severity value="CRITICAL"/>
443+
<severity value="BLOCKER"/>
444444
<useCaseId value="MC-3328"/>
445445
<testCaseId value="MC-13759"/>
446446
<group value="pagebuilder"/>
@@ -500,7 +500,7 @@
500500
<stories value="CMS Block"/>
501501
<title value="Verify that user can duplicate content types from on-hover option menus in CMS Block"/>
502502
<description value="This test is intended to ensure that users can duplicate content types from the on-hover option menus within the PageBuilder stage for CMS Block."/>
503-
<severity value="CRITICAL"/>
503+
<severity value="MAJOR"/>
504504
<useCaseId value="MC-3328"/>
505505
<testCaseId value="MC-13760"/>
506506
<group value="pagebuilder"/>
@@ -624,7 +624,7 @@
624624
<stories value="CMS Block"/>
625625
<title value="Verify that user can move Button Items in CMS Block"/>
626626
<description value="This test is intended to ensure that users can move Button Items within the PageBuilder stage for CMS Block."/>
627-
<severity value="CRITICAL"/>
627+
<severity value="MAJOR"/>
628628
<useCaseId value="MC-3328"/>
629629
<testCaseId value="MC-13763"/>
630630
<group value="pagebuilder"/>
@@ -678,7 +678,7 @@
678678
<stories value="CMS Block"/>
679679
<title value="Verify that user can move Slide Items in CMS Block"/>
680680
<description value="This test is intended to ensure that users can move Slide Items within the PageBuilder stage for CMS Block."/>
681-
<severity value="CRITICAL"/>
681+
<severity value="MAJOR"/>
682682
<useCaseId value="MC-3328"/>
683683
<testCaseId value="MC-13764"/>
684684
<group value="pagebuilder"/>
@@ -734,7 +734,7 @@
734734
<stories value="CMS Block"/>
735735
<title value="Verify that user can move Tab Items in CMS Block"/>
736736
<description value="This test is intended to ensure that users can move Tab Items within the PageBuilder stage for CMS Block."/>
737-
<severity value="CRITICAL"/>
737+
<severity value="MAJOR"/>
738738
<useCaseId value="MC-3328"/>
739739
<testCaseId value="MC-13765"/>
740740
<group value="pagebuilder"/>
@@ -788,7 +788,7 @@
788788
<stories value="CMS Block"/>
789789
<title value="Verify that full-screen mode covers entire screen in CMS Block"/>
790790
<description value="This test is to ensure that the PageBuilder full-screen mode covers the entire screen when opened for CMS Block."/>
791-
<severity value="CRITICAL"/>
791+
<severity value="AVERAGE"/>
792792
<useCaseId value="MC-3328"/>
793793
<testCaseId value="MC-13766"/>
794794
<group value="pagebuilder"/>
@@ -814,7 +814,7 @@
814814
<stories value="CMS Block"/>
815815
<title value="Left panel is full-height and works in full-screen mode in CMS Block"/>
816816
<description value="This test is to ensure that the PageBuilder left panel works and grows to span the full height of the viewport in full-screen mode when opened for CMS Block."/>
817-
<severity value="CRITICAL"/>
817+
<severity value="AVERAGE"/>
818818
<useCaseId value="MC-3328"/>
819819
<testCaseId value="MC-13767"/>
820820
<group value="pagebuilder"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<stories value="CMS Page"/>
118118
<title value="Verify PageBuilder does not appear when disabled in CMS Page"/>
119119
<description value="This test is intended to ensure that PageBuilder does not appear when disabled for CMS Page."/>
120-
<severity value="CRITICAL"/>
120+
<severity value="AVERAGE"/>
121121
<useCaseId value="MC-5773"/>
122122
<testCaseId value="MC-14965"/>
123123
<group value="pagebuilder"/>

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<stories value="CMS Page"/>
1515
<title value="Admin should be able to see PageBuilder on CMS Page after enable PageBuilder and WYSIWYG from Configuration"/>
1616
<description value="Admin should be able to see PageBuilder on CMS Page after enable PageBuilder and WYSIWYG from Configuration"/>
17-
<severity value="CRITICAL"/>
17+
<severity value="BLOCKER"/>
1818
<useCaseId value="MAGETWO-86314"/>
1919
<testCaseId value="MC-2407"/>
2020
<group value="pagebuilder"/>
@@ -57,11 +57,16 @@
5757
</test>
5858
<test name="AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest">
5959
<annotations>
60+
<features value="PageBuilder"/>
6061
<stories value="CMS Page"/>
61-
<description value="Admin should be able to configure the default layout for CMS Page from System Configuration using Page Builder's full width layouts"/>
62+
<title value="Verify Default Layout for Catalog Category"/>
63+
<description value="Admin should be able to configure the default layout for CMS Page from System Configuration, verify the default is updated to the Page Builder's default layout"/>
64+
<severity value="AVERAGE"/>
6265
<useCaseId value="MC-936"/>
6366
<testCaseId value="MC-3106"/>
6467
<group value="pagebuilder"/>
68+
<group value="pagebuilder-layout"/>
69+
<group value="pagebuilder-fullwidth"/>
6570
<group value="pagebuilder-cms-page"/>
6671
</annotations>
6772
<!-- PageBuilder is enabled so check default is full width -->
@@ -76,7 +81,7 @@
7681
<stories value="CMS Page"/>
7782
<title value="Create CMS Page with full page layout"/>
7883
<description value="Create CMS Page with full page layout"/>
79-
<severity value="MAJOR"/>
84+
<severity value="BLOCKER"/>
8085
<useCaseId value="MC-936"/>
8186
<testCaseId value="MC-3092"/>
8287
<group value="pagebuilder"/>
@@ -121,8 +126,8 @@
121126
<argument name="layoutOption" value="PageBuilderFullWidthLayout.cms"/>
122127
</actionGroup>
123128
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
124-
<!-- Check that description is full width on storefront -->
125-
<comment userInput="Check that description is full width on storefront" stepKey="commentSeeDescriptionFullWidth"/>
129+
<!-- Check that content is full width on storefront -->
130+
<comment userInput="Check that content is full width on storefront" stepKey="commentSeeDescriptionFullWidth"/>
126131
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
127132
<argument name="contentType" value="PageBuilderRowContentType"/>
128133
</actionGroup>
@@ -134,7 +139,7 @@
134139
<stories value="CMS Page"/>
135140
<title value="Create CMS Page with invalid full page layout"/>
136141
<description value="Create CMS Page with invalid full page layout"/>
137-
<severity value="MAJOR"/>
142+
<severity value="AVERAGE"/>
138143
<useCaseId value="MC-936"/>
139144
<testCaseId value="MC-3171"/>
140145
<group value="pagebuilder"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<stories value="Catalog Category"/>
3030
<title value="Verify PageBuilder Does Not Appear When Disabled"/>
3131
<description value="This test is intended to ensure that PageBuilder does not appear when disabled for Catalog Category."/>
32-
<severity value="CRITICAL"/>
32+
<severity value="AVERAGE"/>
3333
<useCaseId value="MC-5773"/>
3434
<testCaseId value="MC-14961"/>
3535
<group value="pagebuilder"/>

0 commit comments

Comments
 (0)