Skip to content

Commit 5657919

Browse files
cspruiellcspruiell
committed
MC-1047: Fixed background images are broken in collage appearances
 - fix selectors for mobile images - update action groups for setting background size
1 parent 49e8833 commit 5657919

File tree

5 files changed

+30
-25
lines changed

5 files changed

+30
-25
lines changed

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@
6666
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
6767
</actionGroup>
6868
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachMobileImageFile">
69-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
69+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
7070
</actionGroup>
7171
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorFFFFFFProperty">
7272
<argument name="property" value="PageBuilderBackgroundColor_Hex_White"/>
7373
</actionGroup>
7474
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBackgroundPositionCenteredProperty">
7575
<argument name="property" value="PageBuilderBackgroundPosition_Center"/>
7676
</actionGroup>
77-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBackgroundSizeCoverProperty">
77+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectBackgroundSizeCoverProperty">
7878
<argument name="property" value="PageBuilderBackgroundSize_Cover"/>
7979
</actionGroup>
8080
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="clickOnBackgroundRepeatProperty">
@@ -147,6 +147,12 @@
147147
<actionGroup ref="seeInFieldSlideOutPropertyAlternate" stepKey="seeBackgroundColorFFFFFFOnForm">
148148
<argument name="property" value="PageBuilderBackgroundColor_Hex_White"/>
149149
</actionGroup>
150+
<actionGroup ref="seeImageUploadedOnSlideOut" stepKey="seeBackgroundImageOnForm">
151+
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
152+
</actionGroup>
153+
<actionGroup ref="seeImageUploadedOnSlideOut" stepKey="seeBackgroundMobileImageOnForm">
154+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
155+
</actionGroup>
150156
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="seeBackgroundPositionCenteredOnForm">
151157
<argument name="property" value="PageBuilderBackgroundPosition_Center"/>
152158
</actionGroup>
@@ -257,7 +263,7 @@
257263
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
258264
</actionGroup>
259265
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
260-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
266+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
261267
</actionGroup>
262268
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
263269
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>
@@ -417,7 +423,7 @@
417423
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
418424
</actionGroup>
419425
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachMobileImageFile">
420-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
426+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
421427
</actionGroup>
422428
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
423429
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>
@@ -512,7 +518,7 @@
512518
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
513519
</actionGroup>
514520
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
515-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
521+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
516522
</actionGroup>
517523
<!-- fill button fields -->
518524
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
@@ -635,7 +641,7 @@
635641
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
636642
</actionGroup>
637643
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
638-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
644+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
639645
</actionGroup>
640646
<actionGroup ref="selectSlideOutPanelField" stepKey="enterSlideOverlayShowOnHover">
641647
<argument name="property" value="PageBuilderSlideShowContentOverlayOnHoverProperty"/>
@@ -754,7 +760,7 @@
754760
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
755761
</actionGroup>
756762
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
757-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
763+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
758764
</actionGroup>
759765
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
760766
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>
@@ -844,7 +850,7 @@
844850
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
845851
</actionGroup>
846852
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
847-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
853+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
848854
</actionGroup>
849855
<actionGroup ref="selectSlideOutPanelField" stepKey="enterSlideOverlayShowOnHover">
850856
<argument name="property" value="PageBuilderSlideShowContentOverlayOnHoverProperty"/>
@@ -945,7 +951,7 @@
945951
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
946952
</actionGroup>
947953
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
948-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
954+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
949955
</actionGroup>
950956
<actionGroup ref="selectSlideOutPanelField" stepKey="selectSlideButtonShowOnHover">
951957
<argument name="property" value="PageBuilderSlideShowButtonOnHoverProperty"/>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBackgroundPositionCenteredProperty">
7575
<argument name="property" value="PageBuilderBackgroundPosition_Center"/>
7676
</actionGroup>
77-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBackgroundSizeCoverProperty">
77+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectBackgroundSizeCoverProperty">
7878
<argument name="property" value="PageBuilderBackgroundSize_Cover"/>
7979
</actionGroup>
8080
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="clickOnBackgroundRepeatProperty">
@@ -267,7 +267,7 @@
267267
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
268268
</actionGroup>
269269
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
270-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
270+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
271271
</actionGroup>
272272
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
273273
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>
@@ -522,7 +522,7 @@
522522
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
523523
</actionGroup>
524524
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
525-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
525+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
526526
</actionGroup>
527527
<!-- fill button fields -->
528528
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
@@ -645,7 +645,7 @@
645645
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
646646
</actionGroup>
647647
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
648-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
648+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
649649
</actionGroup>
650650
<actionGroup ref="selectSlideOutPanelField" stepKey="selectSlideButtonShowOnHover">
651651
<argument name="property" value="PageBuilderSlideShowButtonOnHoverProperty"/>
@@ -758,7 +758,7 @@
758758
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
759759
</actionGroup>
760760
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
761-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
761+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
762762
</actionGroup>
763763
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
764764
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>
@@ -848,7 +848,7 @@
848848
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
849849
</actionGroup>
850850
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
851-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
851+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
852852
</actionGroup>
853853
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
854854
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>
@@ -949,7 +949,7 @@
949949
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
950950
</actionGroup>
951951
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderMobileFile">
952-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
952+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
953953
</actionGroup>
954954
<actionGroup ref="selectSlideOutPanelField" stepKey="selectSlideButtonShowOnHover">
955955
<argument name="property" value="PageBuilderSlideShowButtonOnHoverProperty"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,15 @@
6666
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
6767
</actionGroup>
6868
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachMobileImageFile">
69-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
69+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
7070
</actionGroup>
7171
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorFFFFFFProperty">
7272
<argument name="property" value="PageBuilderBackgroundColor_Hex_White"/>
7373
</actionGroup>
7474
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBackgroundPositionCenteredProperty">
7575
<argument name="property" value="PageBuilderBackgroundPosition_Center"/>
7676
</actionGroup>
77-
<actionGroup ref="selectSlideOutPanelField" stepKey="selectBackgroundSizeCoverProperty">
77+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectBackgroundSizeCoverProperty">
7878
<argument name="property" value="PageBuilderBackgroundSize_Cover"/>
7979
</actionGroup>
8080
<actionGroup ref="clickSlideOutPanelFieldGeneral" stepKey="clickOnBackgroundRepeatProperty">
@@ -421,7 +421,7 @@
421421
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
422422
</actionGroup>
423423
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachMobileImageFile">
424-
<argument name="property" value="PageBuilderBackgroundImage_GIF"/>
424+
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
425425
</actionGroup>
426426
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
427427
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_slide_form.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,9 @@
9898
</fieldset>
9999
<fieldset name="background" sortOrder="30">
100100
<field name="background_attachment">
101-
<argument name="data" xsi:type="array">
102-
<item name="config" xsi:type="array">
103-
<item name="visible" xsi:type="boolean">false</item>
104-
</item>
105-
</argument>
101+
<settings>
102+
<visible>false</visible>
103+
</settings>
106104
</field>
107105
</fieldset>
108106
<fieldset name="general" sortOrder="40">

‎dev/tests/static/testsuite/Magento/Test/Integrity/Xml/ExtendsBaseFormTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ private function getXmlFiles(): array
5353
'pagebuilder_base_form.xml' => '',
5454
'pagebuilder_map_location_form.xml' => '',
5555
'pagebuilder_banner_form.xml' => 'pagebuilder_base_form_with_background_attributes',
56-
'pagebuilder_column_form.xml' => 'pagebuilder_base_form_with_background_attributes'
56+
'pagebuilder_column_form.xml' => 'pagebuilder_base_form_with_background_attributes',
57+
'pagebuilder_slide_form.xml' => 'pagebuilder_base_form_with_background_attributes'
5758
];
5859
$componentRegistrar = new ComponentRegistrar();
5960
$modulePath = $componentRegistrar->getPath(ComponentRegistrar::MODULE, 'Magento_PageBuilder');

0 commit comments

Comments
 (0)