Skip to content

Commit 01a9fe2

Browse files
anthoulaanthoula
committed
MC-4116: Update slider to use new background images logic
- remove unnecessary padding data - update references to use common padding data
1 parent d96bf84 commit 01a9fe2

7 files changed

+57
-116
lines changed

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

Lines changed: 0 additions & 55 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@
111111
<element name="borderRadius" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
112112
<element name="cssClasses" type="text" selector="(//div[@data-role='slide'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
113113
<element name="margins" type="text" selector="(//div[@data-role='slide'])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
114-
<element name="posterPadding" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'padding: {{arg2}}')]" parameterized="true"/>
115-
<element name="collagePadding" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'padding: {{arg2}}')]" parameterized="true"/>
114+
<element name="posterPadding" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'padding: {{arg2}}px')]" parameterized="true"/>
115+
<element name="collagePadding" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'padding: {{arg2}}px')]" parameterized="true"/>
116116
</section>
117117
<section name="SlideOnBackend">
118118
<element name="all" type="button" selector=".pagebuilder-slide"/>
@@ -169,8 +169,8 @@
169169
<element name="cssClasses" type="text" selector="(//div[@data-role='slide'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
170170
<element name="posterMargins" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
171171
<element name="collageMargins" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
172-
<element name="posterPadding" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'padding: {{arg2}};')]" parameterized="true"/>
173-
<element name="collagePadding" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'padding: {{arg2}};')]" parameterized="true"/>
172+
<element name="posterPadding" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
173+
<element name="collagePadding" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
174174
</section>
175175
<section name="SlideOnConfigurationPanel">
176176
<element name="textArea" type="text" selector="#pagebuilder_slide_form_content"/>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -449,29 +449,29 @@
449449
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
450450
</actionGroup>
451451
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
452-
<argument name="property" value="PageBuilderSlideItemCollageCenterPadding_Unique"/>
452+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
453453
</actionGroup>
454454
<seeElement selector="{{SlideOnBackend.collageAlignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
455455
<seeElement selector="{{SlideOnBackend.collageBorder('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage"/>
456456
<seeElement selector="{{SlideOnBackend.collageBorderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage"/>
457457
<seeElement selector="{{SlideOnBackend.collageBorderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="seeBorderWidthStage"/>
458458
<seeElement selector="{{SlideOnBackend.collageBorderRadius('1', PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeBorderRadiusStage"/>
459459
<seeElement selector="{{SlideOnBackend.collageMargins('1', PageBuilderMarginsPropertyUnique.value)}}" stepKey="seeMarginsStage"/>
460-
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderSlideItemCollageCenterPadding_Unique.desktopValue)}}" stepKey="seePaddingStage"/>
460+
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage"/>
461461
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
462-
<argument name="property" value="PageBuilderSlideItemCollageCenterPadding_Unique"/>
462+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
463463
</actionGroup>
464464
<seeElement selector="{{SlideOnBackend.collageAlignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
465465
<seeElement selector="{{SlideOnBackend.collageBorder('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage2"/>
466466
<seeElement selector="{{SlideOnBackend.collageBorderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage2"/>
467467
<seeElement selector="{{SlideOnBackend.collageBorderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="seeBorderWidthStage2"/>
468468
<seeElement selector="{{SlideOnBackend.collageBorderRadius('1', PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeBorderRadiusStage2"/>
469469
<seeElement selector="{{SlideOnBackend.collageMargins('1', PageBuilderMarginsPropertyUnique.value)}}" stepKey="seeMarginsStage2"/>
470-
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderSlideItemCollageCenterPadding_Unique.desktopValue)}}" stepKey="seePaddingStage2"/>
470+
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage2"/>
471471
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding2">
472-
<argument name="property" value="PageBuilderSlideItemCollageCenterPadding_Unique"/>
472+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
473473
</actionGroup>
474-
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderSlideItemCollageCenterPadding_Unique.desktopValue)}}" stepKey="seePaddingStorefront"/>
474+
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStorefront"/>
475475
</test>
476476
<test name="SlideItemCollageCenterUpdateAllAttributes" extends="SlideItemPosterUpdateAllAttributes">
477477
<annotations>
@@ -490,7 +490,7 @@
490490
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
491491
</actionGroup>
492492
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
493-
<argument name="property" value="PageBuilderSlideItemCollageCenterPadding_Unique"/>
493+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
494494
</actionGroup>
495495
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceStage"/>
496496
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightStage"/>
@@ -501,7 +501,7 @@
501501
<seeElement selector="{{SlideOnBackend.collageBorderRadius('1', PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeBorderRadiusStage"/>
502502
<seeElement selector="{{SlideOnBackend.cssClasses('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeCSSClassesStage"/>
503503
<seeElement selector="{{SlideOnBackend.collageMargins('1', PageBuilderMarginsPropertyUnique.value)}}" stepKey="seeMarginsStage"/>
504-
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderSlideItemCollageCenterPadding_Unique.desktopValue)}}" stepKey="seePaddingStage"/>
504+
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage"/>
505505
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceStage2"/>
506506
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightStage2"/>
507507
<seeElement selector="{{SlideOnBackend.collageAlignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
@@ -510,17 +510,17 @@
510510
<seeElement selector="{{SlideOnBackend.collageBorderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="seeBorderWidthStage2"/>
511511
<seeElement selector="{{SlideOnBackend.collageBorderRadius('1', PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeBorderRadiusStage2"/>
512512
<seeElement selector="{{SlideOnBackend.collageMargins('1', PageBuilderMarginsPropertyUnique.value)}}" stepKey="seeMarginsStage2"/>
513-
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderSlideItemCollageCenterPadding_Unique.desktopValue)}}" stepKey="seePaddingStage2"/>
513+
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage2"/>
514514
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeAppearance">
515515
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
516516
</actionGroup>
517517
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
518-
<argument name="property" value="PageBuilderSlideItemCollageCenterPadding_Unique"/>
518+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
519519
</actionGroup>
520520
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceStorefront"/>
521-
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderSlideItemCollageCenterPadding_Unique.desktopValue)}}" stepKey="seePaddingStorefront"/>
521+
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStorefront"/>
522522
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeMobileAppearanceStorefront"/>
523-
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderSlideItemCollageCenterPadding_Unique.mobileValue)}}" stepKey="seeMobilePaddingStorefront"/>
523+
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seeMobilePaddingStorefront"/>
524524
</test>
525525
<test name="SliderCollageCenterHtmlValueInButtons">
526526
<annotations>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -379,29 +379,29 @@
379379
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
380380
</actionGroup>
381381
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
382-
<argument name="property" value="PageBuilderSlideItemCollageLeftPadding_Unique"/>
382+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
383383
</actionGroup>
384384
<seeElement selector="{{SlideOnBackend.collageAlignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage"/>
385385
<seeElement selector="{{SlideOnBackend.collageBorder('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage"/>
386386
<seeElement selector="{{SlideOnBackend.collageBorderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage"/>
387387
<seeElement selector="{{SlideOnBackend.collageBorderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="seeBorderWidthStage"/>
388388
<seeElement selector="{{SlideOnBackend.collageBorderRadius('1', PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeBorderRadiusStage"/>
389389
<seeElement selector="{{SlideOnBackend.collageMargins('1', PageBuilderMarginsPropertyUnique.value)}}" stepKey="seeMarginsStage"/>
390-
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderSlideItemCollageLeftPadding_Unique.desktopValue)}}" stepKey="seePaddingStage"/>
390+
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage"/>
391391
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
392-
<argument name="property" value="PageBuilderSlideItemCollageLeftPadding_Unique"/>
392+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
393393
</actionGroup>
394394
<seeElement selector="{{SlideOnBackend.collageAlignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
395395
<seeElement selector="{{SlideOnBackend.collageBorder('1', PageBuilderAdvancedBorderPropertyDouble.value)}}" stepKey="seeBorderStage2"/>
396396
<seeElement selector="{{SlideOnBackend.collageBorderColor('1', PageBuilderAdvancedBorderColorProperty_green.rgb)}}" stepKey="seeBorderColorStage2"/>
397397
<seeElement selector="{{SlideOnBackend.collageBorderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="seeBorderWidthStage2"/>
398398
<seeElement selector="{{SlideOnBackend.collageBorderRadius('1', PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeBorderRadiusStage2"/>
399399
<seeElement selector="{{SlideOnBackend.collageMargins('1', PageBuilderMarginsPropertyUnique.value)}}" stepKey="seeMarginsStage2"/>
400-
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderSlideItemCollageLeftPadding_Unique.desktopValue)}}" stepKey="seePaddingStage2"/>
400+
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage2"/>
401401
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding2">
402-
<argument name="property" value="PageBuilderSlideItemCollageLeftPadding_Unique"/>
402+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
403403
</actionGroup>
404-
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderSlideItemCollageLeftPadding_Unique.desktopValue)}}" stepKey="seePaddingStorefront"/>
404+
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStorefront"/>
405405
</test>
406406
<test name="SlideItemCollageLeftUpdateAllAttributes" extends="SlideItemPosterUpdateAllAttributes">
407407
<annotations>
@@ -420,7 +420,7 @@
420420
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
421421
</actionGroup>
422422
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
423-
<argument name="property" value="PageBuilderSlideItemCollageLeftPadding_Unique"/>
423+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
424424
</actionGroup>
425425
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="seeAppearanceStage"/>
426426
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightStage"/>
@@ -431,7 +431,7 @@
431431
<seeElement selector="{{SlideOnBackend.collageBorderRadius('1', PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeBorderRadiusStage"/>
432432
<seeElement selector="{{SlideOnBackend.cssClasses('1', PageBuilderAdvancedCssClassesPropertyThreeClasses.value)}}" stepKey="seeCSSClassesStage"/>
433433
<seeElement selector="{{SlideOnBackend.collageMargins('1', PageBuilderMarginsPropertyUnique.value)}}" stepKey="seeMarginsStage"/>
434-
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderSlideItemCollageLeftPadding_Unique.desktopValue)}}" stepKey="seePaddingStage"/>
434+
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage"/>
435435
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="seeAppearanceStage2"/>
436436
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderSlideItemMinimumHeight_500.value)}}" stepKey="seeMinimumHeightStage2"/>
437437
<seeElement selector="{{SlideOnBackend.collageAlignment('1', PageBuilderAdvancedAlignmentPropertyCenter.value)}}" stepKey="seeAlignmentStage2"/>
@@ -440,17 +440,17 @@
440440
<seeElement selector="{{SlideOnBackend.collageBorderWidth('1', PageBuilderAdvancedBorderWidthProperty10.value)}}" stepKey="seeBorderWidthStage2"/>
441441
<seeElement selector="{{SlideOnBackend.collageBorderRadius('1', PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="seeBorderRadiusStage2"/>
442442
<seeElement selector="{{SlideOnBackend.collageMargins('1', PageBuilderMarginsPropertyUnique.value)}}" stepKey="seeMarginsStage2"/>
443-
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderSlideItemCollageLeftPadding_Unique.desktopValue)}}" stepKey="seePaddingStage2"/>
443+
<seeElement selector="{{SlideOnBackend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStage2"/>
444444
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeAppearance">
445445
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
446446
</actionGroup>
447447
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
448-
<argument name="property" value="PageBuilderSlideItemCollageLeftPadding_Unique"/>
448+
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
449449
</actionGroup>
450450
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="seeAppearanceStorefront"/>
451-
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderSlideItemCollageLeftPadding_Unique.desktopValue)}}" stepKey="seePaddingStorefront"/>
451+
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seePaddingStorefront"/>
452452
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageLeft.value)}}" stepKey="seeMobileAppearanceStorefront"/>
453-
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderSlideItemCollageLeftPadding_Unique.mobileValue)}}" stepKey="seeMobilePaddingStorefront"/>
453+
<seeElement selector="{{SlideOnFrontend.collagePadding('1', PageBuilderPaddingPropertyUnique.value)}}" stepKey="seeMobilePaddingStorefront"/>
454454
</test>
455455
<test name="SliderCollageLeftHtmlValueInButtons" extends="SliderCollageCenterHtmlValueInButtons">
456456
<annotations>

0 commit comments

Comments
 (0)