Skip to content

Commit a984349

Browse files
cspruiellcspruiell
committed
MC-1047: Fixed background images are broken in collage appearances
 - remove Background Attachment attribute - update MFTF tests
1 parent 7030af0 commit a984349

File tree

9 files changed

+176
-90
lines changed

9 files changed

+176
-90
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@
251251
<data key="fieldName">background_position</data>
252252
<data key="value">Top Left</data>
253253
<data key="styleValue">left top</data>
254+
<data key="optionsList">[Top Left, Top Center, Top Right, Center Left, Center, Center Right, Bottom Left, Bottom Center, Bottom Right]</data>
254255
</entity>
255256
<entity name="PageBuilderBackgroundPosition_TopLeft" type="pagebuilder_background_position_property">
256257
<data key="name">Background Position</data>

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

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<data key="name">Background Position</data>
7272
<data key="section">background</data>
7373
<data key="fieldName">background_position</data>
74-
<data key="value">Top Aligned</data>
74+
<data key="value">Top Left</data>
7575
</entity>
7676
<entity name="PageBuilderSlideBackgroundSizeDefault" type="pagebuilder_slide_property">
7777
<data key="name">Background Size</data>
@@ -85,12 +85,6 @@
8585
<data key="fieldName">background_color</data>
8686
<data key="value">0</data>
8787
</entity>
88-
<entity name="PageBuilderSlideBackgroundAttachmentDefault" type="pagebuilder_slide_property">
89-
<data key="name">Background Attachment</data>
90-
<data key="section">background</data>
91-
<data key="fieldName">background_attachment</data>
92-
<data key="value">Scroll</data>
93-
</entity>
9488
<entity name="PageBuilderSlideItemContent1" type="pagebuilder_slide_property">
9589
<data key="name">Content</data>
9690
<data key="section">general</data>
@@ -470,38 +464,20 @@
470464
<data key="name">Background Position</data>
471465
<data key="section">background</data>
472466
<data key="fieldName">background_position</data>
473-
<data key="value">Top Aligned</data>
467+
<data key="value">Top Left</data>
474468
</entity>
475469
<entity name="PageBuilderSlideBackgroundPositionCenteredProperty" type="pagebuilder_Slide_background_position_property">
476470
<data key="name">Background Position</data>
477471
<data key="section">background</data>
478472
<data key="fieldName">background_position</data>
479-
<data key="value">Centered</data>
473+
<data key="value">Center</data>
480474
</entity>
481475
<entity name="PageBuilderSlideBackgroundRepeatDefaultProperty" type="pagebuilder_Slide_background_repeat_property">
482476
<data key="name">Background Repeat</data>
483477
<data key="section">background</data>
484478
<data key="fieldName">background_repeat</data>
485479
<data key="value">0</data>
486480
</entity>
487-
<entity name="PageBuilderSlideBackgroundAttachmentDefaultProperty" type="pagebuilder_Slide_background_attach_property">
488-
<data key="name">Background Attachment</data>
489-
<data key="section">background</data>
490-
<data key="fieldName">background_attachment</data>
491-
<data key="value">Scroll</data>
492-
</entity>
493-
<entity name="PageBuilderSlideBackgroundAttachmentScrollProperty" type="pagebuilder_Slide_background_attach_property">
494-
<data key="name">Background Attachment</data>
495-
<data key="section">background</data>
496-
<data key="fieldName">background_attachment</data>
497-
<data key="value">Scroll</data>
498-
</entity>
499-
<entity name="PageBuilderSlideBackgroundAttachmentFixedProperty" type="pagebuilder_Slide_background_attach_property">
500-
<data key="name">Background Attachment</data>
501-
<data key="section">background</data>
502-
<data key="fieldName">background_attachment</data>
503-
<data key="value">Fixed</data>
504-
</entity>
505481
<entity name="PageBuilderSlideWhiteOverlayColorProperty" type="pagebuilder_Slide_overlay_color_property">
506482
<data key="name">Overlay Color</data>
507483
<data key="section">general</data>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,10 @@
9191
<element name="collageBackgroundPosition" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='magento'][style*='background-position: center center;']"/>
9292
<element name="collageBackgroundSize" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='magento'][style*='background-size: cover;']"/>
9393
<element name="collageBackgroundRepeat" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='magento'][style*='background-repeat: repeat;']"/>
94-
<element name="collageBackgroundAttachment" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='magento'][style*='background-attachment: scroll;']"/>
9594
<element name="collageMobileBackgroundColor" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo'][style*='background-color: rgb(255, 255, 255);']"/>
9695
<element name="collageMobileBackgroundPosition" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo'][style*='background-position: center center;']"/>
9796
<element name="collageMobileBackgroundSize" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo'][style*='background-size: cover;']"/>
9897
<element name="collageMobileBackgroundRepeat" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo'][style*='background-repeat: repeat;']"/>
99-
<element name="collageMobileBackgroundAttachment" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo'][style*='background-attachment: scroll;']"/>
10098
<element name="posterMobileWithMobileImage" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo']"/>
10199
<element name="collageMinHeightMobile" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='min-height: {{arg1}}px'][style*='magento']" parameterized="true"/>
102100
<element name="collageOverlay" type="button" selector=".pagebuilder-overlay[style*='rgba(255, 255, 255, 0.7)']"/>
@@ -151,7 +149,6 @@
151149
<element name="collageBackgroundPosition" type="button" selector="div[style*='magento'][style*='background-position: center center;']"/>
152150
<element name="collageBackgroundSize" type="button" selector="div[style*='magento'][style*='background-size: cover;']"/>
153151
<element name="collageBackgroundRepeat" type="button" selector="div[style*='magento'][style*='background-repeat: repeat;']"/>
154-
<element name="collageBackgroundAttachment" type="button" selector="div[style*='magento'][style*='background-attachment: scroll;']"/>
155152
<element name="collageMargin" type="button" selector="div[style*='1px 2px 3px 4px'][style*='magento']"/>
156153
<element name="collageMinHeight" type="button" selector="div[style*='min-height: {{arg1}}px'][style*='magento']" parameterized="true"/>
157154
<element name="collageAlignment" type="button" selector="div[style*='text-align: center'][style*='magento']"/>

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@
8080
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="clickOnBackgroundRepeatProperty">
8181
<argument name="property" value="PageBuilderSlideBackgroundRepeatDefaultProperty"/>
8282
</actionGroup>
83-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBackgroundAttachmentScrollProperty">
84-
<argument name="property" value="PageBuilderSlideBackgroundAttachmentScrollProperty"/>
85-
</actionGroup>
8683
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
8784
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>
8885
</actionGroup>
@@ -131,7 +128,6 @@
131128
<seeElement selector="{{SlideOnBackend.collageBackgroundPosition}}" stepKey="verifyCollageBackgroundPositionInAdmin"/>
132129
<seeElement selector="{{SlideOnBackend.collageBackgroundSize}}" stepKey="verifyCollageBackgroundSizeInAdmin"/>
133130
<seeElement selector="{{SlideOnBackend.collageBackgroundRepeat}}" stepKey="verifyCollageBackgroundRepeatInAdmin"/>
134-
<seeElement selector="{{SlideOnBackend.collageBackgroundAttachment}}" stepKey="verifyCollageBackgroundAttachmentInAdmin"/>
135131
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
136132
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
137133
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel">
@@ -160,9 +156,6 @@
160156
<actionGroup ref="seeOptionIsCheckedSlideOutProperty" stepKey="seeOnBackgroundRepeatOnForm">
161157
<argument name="property" value="PageBuilderSlideBackgroundRepeatDefaultProperty"/>
162158
</actionGroup>
163-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="seeBackgroundAttachmentScrollOnForm">
164-
<argument name="property" value="PageBuilderSlideBackgroundAttachmentScrollProperty"/>
165-
</actionGroup>
166159
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
167160
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeAdvancedBorderProperty">
168161
<argument name="property" value="PageBuilderAdvancedBorderPropertyDotted"/>
@@ -212,7 +205,6 @@
212205
<seeElement selector="{{SlideOnFrontend.collageBackgroundPosition}}" stepKey="verifyFrontendCollageBackgroundPosition"/>
213206
<seeElement selector="{{SlideOnFrontend.collageBackgroundSize}}" stepKey="verifyFrontendCollageBackgroundSize"/>
214207
<seeElement selector="{{SlideOnFrontend.collageBackgroundRepeat}}" stepKey="verifyFrontendCollageBackgroundRepeat"/>
215-
<seeElement selector="{{SlideOnFrontend.collageBackgroundAttachment}}" stepKey="verifyFrontendCollageBackgroundAttachment"/>
216208
<!-- Validate settings on frontend mobile -->
217209
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
218210
<waitForElementVisible time="3" selector="{{SlideOnFrontend.collageMobileWithMobileImage}}" stepKey="waitForCollageInFrontendMobileWithMobileImage"/>
@@ -221,7 +213,6 @@
221213
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundPosition}}" stepKey="verifyFrontendCollageMobileBackgroundPosition"/>
222214
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundSize}}" stepKey="verifyFrontendCollageMobileBackgroundSize"/>
223215
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundRepeat}}" stepKey="verifyFrontendCollageMobileBackgroundRepeat"/>
224-
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundAttachment}}" stepKey="verifyFrontendCollageMobileBackgroundAttachment"/>
225216
<resizeWindow width="1000" height="1000" stepKey="resizeWindowToDesktop"/>
226217
<click selector="{{SlideOnFrontend.linkUrl(PageBuilderSlideLinkExternalUrlProperty.value)}}" stepKey="clickLinkUrl"/>
227218
<amOnPage url="{{PageBuilderSlideLinkExternalUrlProperty.value}}" stepKey="amOnLinkPage"/>

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@
8080
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="clickOnBackgroundRepeatProperty">
8181
<argument name="property" value="PageBuilderSlideBackgroundRepeatDefaultProperty"/>
8282
</actionGroup>
83-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBackgroundAttachmentScrollProperty">
84-
<argument name="property" value="PageBuilderSlideBackgroundAttachmentScrollProperty"/>
85-
</actionGroup>
8683
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
8784
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>
8885
</actionGroup>
@@ -134,7 +131,6 @@
134131
<seeElement selector="{{SlideOnBackend.collageBackgroundPosition}}" stepKey="verifyCollageBackgroundPositionInAdmin"/>
135132
<seeElement selector="{{SlideOnBackend.collageBackgroundSize}}" stepKey="verifyCollageBackgroundSizeInAdmin"/>
136133
<seeElement selector="{{SlideOnBackend.collageBackgroundRepeat}}" stepKey="verifyCollageBackgroundRepeatInAdmin"/>
137-
<seeElement selector="{{SlideOnBackend.collageBackgroundAttachment}}" stepKey="verifyCollageBackgroundAttachmentInAdmin"/>
138134
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
139135
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
140136
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel">
@@ -164,9 +160,6 @@
164160
<actionGroup ref="seeOptionIsCheckedSlideOutProperty" stepKey="seeOnBackgroundRepeatOnForm">
165161
<argument name="property" value="PageBuilderSlideBackgroundRepeatDefaultProperty"/>
166162
</actionGroup>
167-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="seeBackgroundAttachmentScrollOnForm">
168-
<argument name="property" value="PageBuilderSlideBackgroundAttachmentScrollProperty"/>
169-
</actionGroup>
170163
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
171164
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seePaddingLeftOnForm">
172165
<argument name="property" value="PageBuilderSlideCollageLeftProperty"/>
@@ -219,7 +212,6 @@
219212
<seeElement selector="{{SlideOnFrontend.collageBackgroundPosition}}" stepKey="verifyFrontendCollageBackgroundPosition"/>
220213
<seeElement selector="{{SlideOnFrontend.collageBackgroundSize}}" stepKey="verifyFrontendCollageBackgroundSize"/>
221214
<seeElement selector="{{SlideOnFrontend.collageBackgroundRepeat}}" stepKey="verifyFrontendCollageBackgroundRepeat"/>
222-
<seeElement selector="{{SlideOnFrontend.collageBackgroundAttachment}}" stepKey="verifyFrontendCollageBackgroundAttachment"/>
223215
<!-- Validate settings on frontend mobile -->
224216
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
225217
<waitForElementVisible time="3" selector="{{SlideOnFrontend.collageMobileWithMobileImage}}" stepKey="waitForCollageInFrontendMobileWithMobileImage"/>
@@ -228,7 +220,6 @@
228220
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundPosition}}" stepKey="verifyFrontendCollageMobileBackgroundPosition"/>
229221
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundSize}}" stepKey="verifyFrontendCollageMobileBackgroundSize"/>
230222
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundRepeat}}" stepKey="verifyFrontendCollageMobileBackgroundRepeat"/>
231-
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundAttachment}}" stepKey="verifyFrontendCollageMobileBackgroundAttachment"/>
232223
<resizeWindow width="1000" height="1000" stepKey="resizeWindowToDesktop"/>
233224
<click selector="{{SlideOnFrontend.linkUrl(PageBuilderSlideLinkExternalUrlProperty.value)}}" stepKey="clickLinkUrl"/>
234225
<amOnPage url="{{PageBuilderSlideLinkExternalUrlProperty.value}}" stepKey="amOnLinkPage"/>

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@
8080
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="clickOnBackgroundRepeatProperty">
8181
<argument name="property" value="PageBuilderSlideBackgroundRepeatDefaultProperty"/>
8282
</actionGroup>
83-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBackgroundAttachmentScrollProperty">
84-
<argument name="property" value="PageBuilderSlideBackgroundAttachmentScrollProperty"/>
85-
</actionGroup>
8683
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
8784
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>
8885
</actionGroup>
@@ -128,7 +125,6 @@
128125
<seeElement selector="{{SlideOnBackend.collageBackgroundPosition}}" stepKey="verifyCollageBackgroundPositionInAdmin"/>
129126
<seeElement selector="{{SlideOnBackend.collageBackgroundSize}}" stepKey="verifyCollageBackgroundSizeInAdmin"/>
130127
<seeElement selector="{{SlideOnBackend.collageBackgroundRepeat}}" stepKey="verifyCollageBackgroundRepeatInAdmin"/>
131-
<seeElement selector="{{SlideOnBackend.collageBackgroundAttachment}}" stepKey="verifyCollageBackgroundAttachmentInAdmin"/>
132128
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
133129
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
134130
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel">
@@ -158,9 +154,6 @@
158154
<actionGroup ref="seeOptionIsCheckedSlideOutProperty" stepKey="seeOnBackgroundRepeatOnForm">
159155
<argument name="property" value="PageBuilderSlideBackgroundRepeatDefaultProperty"/>
160156
</actionGroup>
161-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="seeBackgroundAttachmentScrollOnForm">
162-
<argument name="property" value="PageBuilderSlideBackgroundAttachmentScrollProperty"/>
163-
</actionGroup>
164157
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection2"/>
165158
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeAppearanceCollageRightOnForm">
166159
<argument name="property" value="PageBuilderSlideCollageRightProperty"/>
@@ -213,7 +206,6 @@
213206
<seeElement selector="{{SlideOnFrontend.collageBackgroundPosition}}" stepKey="verifyFrontendCollageBackgroundPosition"/>
214207
<seeElement selector="{{SlideOnFrontend.collageBackgroundSize}}" stepKey="verifyFrontendCollageBackgroundSize"/>
215208
<seeElement selector="{{SlideOnFrontend.collageBackgroundRepeat}}" stepKey="verifyFrontendCollageBackgroundRepeat"/>
216-
<seeElement selector="{{SlideOnFrontend.collageBackgroundAttachment}}" stepKey="verifyFrontendCollageBackgroundAttachment"/>
217209
<!-- Validate settings on frontend mobile -->
218210
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
219211
<waitForElementVisible time="3" selector="{{SlideOnFrontend.collageMobileWithMobileImage}}" stepKey="waitForCollageInFrontendMobileWithMobileImage"/>
@@ -222,7 +214,6 @@
222214
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundPosition}}" stepKey="verifyFrontendCollageMobileBackgroundPosition"/>
223215
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundSize}}" stepKey="verifyFrontendCollageMobileBackgroundSize"/>
224216
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundRepeat}}" stepKey="verifyFrontendCollageMobileBackgroundRepeat"/>
225-
<seeElement selector="{{SlideOnFrontend.collageMobileBackgroundAttachment}}" stepKey="verifyFrontendCollageMobileBackgroundAttachment"/>
226217
<resizeWindow width="1000" height="1000" stepKey="resizeWindowToDesktop"/>
227218
<click selector="{{SlideOnFrontend.linkUrl(PageBuilderSlideLinkExternalUrlProperty.value)}}" stepKey="clickLinkUrl"/>
228219
<amOnPage url="{{PageBuilderSlideLinkExternalUrlProperty.value}}" stepKey="amOnLinkPage"/>

0 commit comments

Comments
 (0)