Skip to content

Commit ea22499

Browse files
jilu1jilu1
committed
Merge remote-tracking branch 'upstream/develop' into MQE-1957
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryUploadImageToCategoryTest.xml # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowWithBordersAndPaddingEqualToMinHeightTest.xml
2 parents 08c55ed + 725d223 commit ea22499

File tree

7 files changed

+1
-273
lines changed

7 files changed

+1
-273
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightEqualToMinHeightActionGroup.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

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

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11-
<!-- Appearance -->
12-
<entity name="PageBuilderBannerAppearanceDefaultProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_Poster instead. Will be removed in PB-413.">
13-
<data key="name">Appearance</data>
14-
<data key="section">appearance_fieldset</data>
15-
<data key="fieldName">appearance</data>
16-
<data key="value">poster</data>
17-
</entity>
18-
<entity name="PageBuilderBannerAppearance_Poster" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_Poster instead. Will be removed in PB-413.">
19-
<data key="name">Appearance</data>
20-
<data key="section">appearance_fieldset</data>
21-
<data key="fieldName">appearance</data>
22-
<data key="value">poster</data>
23-
</entity>
24-
<entity name="PageBuilderBannerCollageLeftProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_CollageLeft instead. Will be removed in PB-413.">
25-
<data key="name">Appearance</data>
26-
<data key="section">appearance_fieldset</data>
27-
<data key="fieldName">appearance</data>
28-
<data key="value">collage-left</data>
29-
</entity>
30-
<entity name="PageBuilderBannerCollageRightProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_CollageCentered instead. Will be removed in PB-413.">
31-
<data key="name">Appearance</data>
32-
<data key="section">appearance_fieldset</data>
33-
<data key="fieldName">appearance</data>
34-
<data key="value">collage-right</data>
35-
</entity>
36-
<entity name="PageBuilderBannerCollageCenteredProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_CollageRight instead. Will be removed in PB-413.">
37-
<data key="name">Appearance</data>
38-
<data key="section">appearance_fieldset</data>
39-
<data key="fieldName">appearance</data>
40-
<data key="value">collage-centered</data>
41-
</entity>
42-
<!-- Minimum Height -->
43-
<entity name="PageBuilderBannerMinimumHeightProperty" type="pagebuilder_banner_minimumHeight_property" deprecated="Use PageBuilderMinHeightProperty_500px instead. Will be removed in PB-413.">
44-
<data key="name">Minimum Height</data>
45-
<data key="section">appearance_fieldset</data>
46-
<data key="fieldName">min_height</data>
47-
<data key="value">500</data>
48-
</entity>
49-
<entity name="PageBuilderBannerMinimumHeightDefaultProperty" type="pagebuilder_banner_minimumHeightDefault_property" deprecated="Use PageBuilderMinHeightProperty_300px instead. Will be removed in PB-413.">
50-
<data key="name">Minimum Height</data>
51-
<data key="section">appearance_fieldset</data>
52-
<data key="fieldName">min_height</data>
53-
<data key="value">300</data>
54-
</entity>
5511
<!-- Message Text -->
5612
<entity name="PageBuilderBannerMessageDefaultProperty" type="pagebuilder_banner_message_property">
5713
<data key="name">Message Text</data>

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

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -31,71 +31,7 @@
3131
<data key="value">full-bleed</data>
3232
<data key="warningMessage">Full Bleed appearance will work only with supported layouts.</data>
3333
</entity>
34-
<!-- Background Color -->
35-
<entity name="PageBuilderRowBackgroundColor_Yellow" type="pagebuilder_row_background_color_property" deprecated="Use PageBuilderBackgroundColor_Yellow instead. To be removed in PB-413">
36-
<data key="name">Background Color</data>
37-
<data key="section">background</data>
38-
<data key="fieldName">background_color</data>
39-
<data key="value">#ffff0d</data>
40-
<data key="rgb">rgb(255, 255, 13)</data>
41-
</entity>
42-
<entity name="PageBuilderRowBackgroundColor_CCCCCC" type="pagebuilder_row_background_color_property" deprecated="Use PageBuilderBackgroundColor_Hex_Grey instead. To be removed in PB-413">
43-
<data key="name">Background Color</data>
44-
<data key="section">background</data>
45-
<data key="fieldName">background_color</data>
46-
<data key="value">#cccccc</data>
47-
<data key="rgb">rgb(204, 204, 204)</data>
48-
</entity>
49-
<entity name="PageBuilderRowBackgroundColor_FF0000" type="pagebuilder_row_background_color_property" deprecated="Use PageBuilderBackgroundColor_Red instead. To be removed in PB-413">
50-
<data key="name">Background Color</data>
51-
<data key="section">background</data>
52-
<data key="fieldName">background_color</data>
53-
<data key="value">#ff0000</data>
54-
<data key="rgb">rgb(255, 0, 0)</data>
55-
</entity>
56-
<!-- Background Image -->
57-
<entity name="PageBuilderRowBackgroundImage_Default" type="pagebuilder_row_background_image_property" deprecated="Use PageBuilderBackgroundImage_Default instead. To be removed in PB-413">
58-
<data key="name">Background Image</data>
59-
<data key="section">background</data>
60-
<data key="fieldName">background_image</data>
61-
</entity>
62-
<!-- Background Position -->
63-
<entity name="PageBuilderRowBackgroundPosition_Default" type="pagebuilder_row_background_position_property" deprecated="Use PageBuilderBackgroundPosition_TopLeft instead. To be removed in PB-413">
64-
<data key="name">Background Position</data>
65-
<data key="section">background</data>
66-
<data key="fieldName">background_position</data>
67-
<data key="value">Top Aligned</data>
68-
<data key="styleValue">left top</data>
69-
</entity>
70-
<!-- Background Size -->
71-
<entity name="PageBuilderRowBackgroundSize_Default" type="pagebuilder_row_background_size_property" deprecated="Use PageBuilderBackgroundSize_Cover instead. To be removed in PB-413">
72-
<data key="name">Background Size</data>
73-
<data key="section">background</data>
74-
<data key="fieldName">background_size</data>
75-
<data key="value">cover</data>
76-
</entity>
77-
<!-- Background Repeat -->
78-
<entity name="PageBuilderRowBackgroundRepeat_Default" type="pagebuilder_row_background_repeat_property" deprecated="Use PageBuilderBackgroundRepeat_Disabled instead. To be removed in PB-413">
79-
<data key="name">Background Repeat</data>
80-
<data key="section">background</data>
81-
<data key="fieldName">background_repeat</data>
82-
<data key="value">0</data>
83-
<data key="styleValue">no-repeat</data>
84-
</entity>
85-
<!-- Background Attachment -->
86-
<entity name="PageBuilderRowBackgroundAttachment_Default" type="pagebuilder_row_background_attachment_property" deprecated="Use PageBuilderBackgroundAttachment_Scroll instead. To be removed in PB-413">
87-
<data key="name">Background Attachment</data>
88-
<data key="section">background</data>
89-
<data key="fieldName">background_attachment</data>
90-
<data key="value">scroll</data>
91-
</entity>
9234
<!-- Parallax Enabled -->
93-
<entity name="PageBuilderRowParallax_Default" type="pagebuilder_row_parallax_property" deprecated="Use PageBuilderRowParallax_Disabled instead. To be removed in PB-413">
94-
<data key="name">Enable Parallax Background</data>
95-
<data key="section">parallax_background</data>
96-
<data key="fieldName">enable_parallax</data>
97-
<data key="value">0</data>
98-
</entity>
9935
<entity name="PageBuilderRowParallax_Disabled" type="pagebuilder_row_parallax_property">
10036
<data key="name">Enable Parallax Background</data>
10137
<data key="section">parallax_background</data>
@@ -109,13 +45,6 @@
10945
<data key="value">1</data>
11046
</entity>
11147
<!-- Parallax Speed -->
112-
<entity name="PageBuilderRowParallaxSpeed_Default" type="pagebuilder_row_parallax_speed_property" deprecated="Use PageBuilderRowParallaxSpeed_0_5 instead. To be removed in PB-413">
113-
<data key="name">Parallax Speed</data>
114-
<data key="section">parallax_background</data>
115-
<data key="fieldName">parallax_speed</data>
116-
<data key="value">0.5</data>
117-
<data key="notice">Enter fractional number from -1.0 to 2.0.</data>
118-
</entity>
11948
<entity name="PageBuilderRowParallaxSpeed_0_5" type="pagebuilder_row_parallax_speed_property">
12049
<data key="name">Parallax Speed</data>
12150
<data key="section">parallax_background</data>

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

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -39,38 +39,6 @@
3939
<data key="fieldName">slide_name</data>
4040
<data key="value">&#x3C;img src=x onerror=&#x22;throw &#x27;error&#x27;;&#x22; /&#x3E;</data>
4141
</entity>
42-
<!-- Minimum Height -->
43-
<entity name="PageBuilderSlideItemMinimumHeight_500" deprecated="PageBuilderMinHeightProperty_500px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slide_item_minimum_height_property">
44-
<data key="name">Minimum Height</data>
45-
<data key="section">appearance_fieldset</data>
46-
<data key="fieldName">min_height</data>
47-
<data key="value">500</data>
48-
</entity>
49-
<entity name="PageBuilderSlideItemMinimumHeight_300" deprecated="PageBuilderMinHeightProperty_300px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slide_item_minimum_height_property">
50-
<data key="name">Minimum Height</data>
51-
<data key="section">appearance_fieldset</data>
52-
<data key="fieldName">min_height</data>
53-
<data key="value">300</data>
54-
</entity>
55-
<entity name="PageBuilderSlideItemMinimumHeight_100" deprecated="PageBuilderMinHeightProperty_100px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slide_item_minimum_height_property">
56-
<data key="name">Minimum Height</data>
57-
<data key="section">appearance_fieldset</data>
58-
<data key="fieldName">min_height</data>
59-
<data key="value">100</data>
60-
</entity>
61-
<entity name="PageBuilderSlideItemMinimumHeight_Empty" deprecated="PageBuilderMinHeightProperty_Empty entity should be used instead. Will be removed in PB-413." type="pagebuilder_slide_item_minimum_height_property">
62-
<data key="name">Minimum Height</data>
63-
<data key="section">appearance_fieldset</data>
64-
<data key="fieldName">min_height</data>
65-
<data key="value"/>
66-
</entity>
67-
<!-- Background Color -->
68-
<entity name="PageBuilderSlideItemBackgroundColor_Empty" type="pagebuilder_slide_item_background_color_property" deprecated="Use PageBuilderBackgroundColor_Empty instead. To be removed in PB-413">
69-
<data key="name">Background Color</data>
70-
<data key="section">background</data>
71-
<data key="fieldName">background_color</data>
72-
<data key="stageValue">rgb(250, 250, 250)</data>
73-
</entity>
7442
<!-- Link -->
7543
<entity name="PageBuilderSlideItemLinkURL_Empty" type="pagebuilder_slide_item_link_url_property">
7644
<data key="name">Link</data>

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -87,24 +87,6 @@
8787
<data key="value">true</data>
8888
</entity>
8989
<!-- Minimum Height -->
90-
<entity name="PageBuilderSliderMinHeight_500" deprecated="PageBuilderMinHeightProperty_500px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slider_min_height_property">
91-
<data key="name">Minimum Height</data>
92-
<data key="section">appearance_fieldset</data>
93-
<data key="fieldName">min_height</data>
94-
<data key="value">500</data>
95-
</entity>
96-
<entity name="PageBuilderSliderMinHeight_Default" deprecated="PageBuilderMinHeightProperty_300px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slider_min_height_property">
97-
<data key="name">Minimum Height</data>
98-
<data key="section">appearance_fieldset</data>
99-
<data key="fieldName">min_height</data>
100-
<data key="value">300</data>
101-
</entity>
102-
<entity name="PageBuilderSliderMinHeight_100" deprecated="PageBuilderMinHeightProperty_100px entity should be used instead. Will be removed in PB-413." type="pagebuilder_slider_min_height_property">
103-
<data key="name">Minimum Height</data>
104-
<data key="section">appearance_fieldset</data>
105-
<data key="fieldName">min_height</data>
106-
<data key="value">100</data>
107-
</entity>
10890
<!-- Container Height -->
10991
<entity name="PageBuilderEmptySliderContainerHeight" type="pagebuilder_slider_height_property">
11092
<data key="value">360</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryUploadImageToCategoryTest.xml

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

Comments
 (0)