Skip to content

Commit 983bba1

Browse files
cspruiellcspruiell
committed
MC-5372: Collage Center/Left/Right doesn't work correct in a container smaller than 100% width
 - refactor new action group
1 parent eb63712 commit 983bba1

14 files changed

+132
-233
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBannerActionGroup.xml

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

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup.xml

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -46,84 +46,4 @@
4646
<actionGroup name="inlineEditWYSIWYGFromStageForSlideCollageAppearancesInSmallColumns" extends="inlineEditWYSIWYGFromStage">
4747
<click selector="{{SlideOnBackend.base(index)}}" stepKey="focusOnEditorArea"/>
4848
</actionGroup>
49-
<actionGroup name="validateSlideOverlayAndButtonPoster">
50-
<arguments>
51-
<argument name="column"/>
52-
<argument name="slide"/>
53-
<argument name="slideBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
54-
<argument name="diffThreshold" defaultValue="0" type="string"/>
55-
</arguments>
56-
<executeJS function="return document.querySelector('{{column.columnX('1')}}').clientWidth" stepKey="columnWidth"/>
57-
<executeJS function="return parseInt({{slide.slideJS('1')}}.getBoundingClientRect().width)" stepKey="slideWidth"/>
58-
<executeJS function="return parseInt({$columnWidth} - {{PageBuilderPaddingPropertyColumnDefault.paddingLeft}} - {{PageBuilderPaddingPropertyColumnDefault.paddingRight}})" stepKey="expectedSlideWidth"/>
59-
<executeJS function="return Math.abs({$expectedSlideWidth} - {$slideWidth})" stepKey="slideDiff"/>
60-
<!-- We will allow a 2px offset to account for rounding and any additional threshold that is passed in as an argument -->
61-
<executeJS function="return parseInt({{diffThreshold}} + 2)" stepKey="acceptableOffset"/>
62-
<assertLessThanOrEqual stepKey="assertSlideWidthEqualsColumnWidthLessColumnPaddingAndColumnBorderWidth">
63-
<expectedResult type="variable">acceptableOffset</expectedResult>
64-
<actualResult type="variable">slideDiff</actualResult>
65-
</assertLessThanOrEqual>
66-
<executeJS function="return parseInt({{slide.overlayJS('1')}}.getBoundingClientRect().width)" stepKey="overlayWidth"/>
67-
<executeJS function="return parseInt({$slideWidth} - {{PageBuilderPaddingPropertyDefault.paddingLeft}} - {{PageBuilderPaddingPropertyDefault.paddingRight}} - ({{slideBorderWidth.value}} * 2))" stepKey="expectedOverlayWidth"/>
68-
<executeJS function="return Math.abs({$expectedOverlayWidth} - {$overlayWidth})" stepKey="overlayDiff"/>
69-
<assertLessThanOrEqual stepKey="assertOverlayWidthEqualsSlideWidthLessSlidePaddingAndSlideBorderWidth">
70-
<expectedResult type="variable">acceptableOffset</expectedResult>
71-
<actualResult type="variable">overlayDiff</actualResult>
72-
</assertLessThanOrEqual>
73-
<executeJS function="return parseInt({{slide.contentJS('1')}}.getBoundingClientRect().width)" stepKey="contentWidth"/>
74-
<executeJS function="return parseInt({$overlayWidth} - {{PageBuilderAdvancedMarginsAndPaddingPropertyDefaultSlide.paddingLeft}} - {{PageBuilderAdvancedMarginsAndPaddingPropertyDefaultSlide.paddingRight}})" stepKey="expectedContentWidth"/>
75-
<executeJS function="return Math.abs({$expectedContentWidth} - {$contentWidth})" stepKey="contentDiff"/>
76-
<assertLessThanOrEqual stepKey="assertContentWidthEqualsOverlayWidthLessPadding">
77-
<expectedResult type="variable">acceptableOffset</expectedResult>
78-
<actualResult type="variable">contentDiff</actualResult>
79-
</assertLessThanOrEqual>
80-
<executeJS function="return parseInt({{slide.buttonJS('1')}}.getBoundingClientRect().width)" stepKey="buttonWidth"/>
81-
<!-- wysiwyg content may shrink smaller, but buttons will never be smaller than 36px (17px padding + 1px border) -->
82-
<executeJS function="return Math.max(36, {$expectedContentWidth})" stepKey="expectedButtonWidth"/>
83-
<executeJS function="return Math.abs({$expectedButtonWidth} - {$buttonWidth})" stepKey="buttonDiff"/>
84-
<assertLessThanOrEqual stepKey="assertButtonWidthEqualsOverlayWidthLessPadding">
85-
<expectedResult type="variable">acceptableOffset</expectedResult>
86-
<actualResult type="variable">buttonDiff</actualResult>
87-
</assertLessThanOrEqual>
88-
</actionGroup>
89-
<actionGroup name="validateSlideOverlayAndButtonCollage">
90-
<arguments>
91-
<argument name="column"/>
92-
<argument name="slide"/>
93-
<argument name="slideBorderWidth" defaultValue="PageBuilderAdvancedBorderWidthProperty0"/>
94-
<argument name="diffThreshold" defaultValue="0" type="string"/>
95-
</arguments>
96-
<executeJS function="return document.querySelector('{{column.columnX('1')}}').clientWidth" stepKey="columnWidth"/>
97-
<executeJS function="return parseInt({{slide.slideJS('1')}}.getBoundingClientRect().width)" stepKey="slideWidth"/>
98-
<executeJS function="return parseInt({$columnWidth} - {{PageBuilderPaddingPropertyColumnDefault.paddingLeft}} - {{PageBuilderPaddingPropertyColumnDefault.paddingRight}})" stepKey="expectedSlideWidth"/>
99-
<executeJS function="return Math.abs({$expectedSlideWidth} - {$slideWidth})" stepKey="slideDiff"/>
100-
<!-- We will allow a 2px offset to account for rounding and any additional threshold that is passed in as an argument -->
101-
<executeJS function="return parseInt({{diffThreshold}} + 2)" stepKey="acceptableOffset"/>
102-
<assertLessThanOrEqual stepKey="assertSlideWidthEqualsColumnWidthLessColumnPaddingAndColumnBorderWidth">
103-
<expectedResult type="variable">acceptableOffset</expectedResult>
104-
<actualResult type="variable">slideDiff</actualResult>
105-
</assertLessThanOrEqual>
106-
<executeJS function="return parseInt({{slide.overlayJS('1')}}.getBoundingClientRect().width)" stepKey="overlayWidth"/>
107-
<executeJS function="return parseInt({$slideWidth} - {{PageBuilderAdvancedMarginsAndPaddingPropertyDefaultSlide.paddingLeft}} - {{PageBuilderAdvancedMarginsAndPaddingPropertyDefaultSlide.paddingRight}} - ({{slideBorderWidth.value}} * 2))" stepKey="expectedOverlayWidth"/>
108-
<executeJS function="return Math.abs({$expectedOverlayWidth} - {$overlayWidth})" stepKey="overlayDiff"/>
109-
<assertLessThanOrEqual stepKey="assertOverlayWidthEqualsSlideWidthLessSlidePaddingAndSlideBorderWidth">
110-
<expectedResult type="variable">acceptableOffset</expectedResult>
111-
<actualResult type="variable">overlayDiff</actualResult>
112-
</assertLessThanOrEqual>
113-
<executeJS function="return parseInt({{slide.contentJS('1')}}.getBoundingClientRect().width)" stepKey="contentWidth"/>
114-
<executeJS function="return parseInt({$overlayWidth} - {{PageBuilderPaddingPropertyOverlayDefault.paddingLeft}} - {{PageBuilderPaddingPropertyOverlayDefault.paddingRight}})" stepKey="expectedContentWidth"/>
115-
<executeJS function="return Math.abs({$expectedContentWidth} - {$contentWidth})" stepKey="contentDiff"/>
116-
<assertLessThanOrEqual stepKey="assertContentWidthEqualsOverlayWidthLessPadding">
117-
<expectedResult type="variable">acceptableOffset</expectedResult>
118-
<actualResult type="variable">contentDiff</actualResult>
119-
</assertLessThanOrEqual>
120-
<executeJS function="return parseInt({{slide.buttonJS('1')}}.getBoundingClientRect().width)" stepKey="buttonWidth"/>
121-
<!-- wysiwyg content may shrink smaller, but buttons will never be smaller than 36px (17px padding + 1px border) -->
122-
<executeJS function="return Math.max(36, {$expectedContentWidth})" stepKey="expectedButtonWidth"/>
123-
<executeJS function="return Math.abs({$expectedButtonWidth} - {$buttonWidth})" stepKey="buttonDiff"/>
124-
<assertLessThanOrEqual stepKey="assertButtonWidthEqualsOverlayWidthLessPadding">
125-
<expectedResult type="variable">acceptableOffset</expectedResult>
126-
<actualResult type="variable">buttonDiff</actualResult>
127-
</assertLessThanOrEqual>
128-
</actionGroup>
12949
</actionGroups>

0 commit comments

Comments
 (0)