Skip to content

Commit a0b85fe

Browse files
omiroshnichenkoomiroshnichenko
committed
PB-379: Full height Slider/Slide
- fix tests
1 parent 8acf886 commit a0b85fe

5 files changed

+13
-12
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<element name="showArrows" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][@data-show-arrows='{{arg2}}']" parameterized="true"/>
2525
<element name="showDots" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][@data-show-dots='{{arg2}}']" parameterized="true"/>
2626
<element name="minHeight" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][contains(@style,'min-height: {{arg2}}')]" parameterized="true"/>
27-
<element name="noMinHeight" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][not(contains(@style,'min-height:'))]" parameterized="true"/>
27+
<element name="noMinHeight" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}][not(contains(@style,'min-height:'))]" parameterized="true"/>
2828
<!-- Advanced Configuration -->
2929
<element name="alignment" type="text" selector="(//div[@data-content-type='slider'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
3030
<element name="noAlignment" type="text" selector="(//div[@data-content-type='slider'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
@@ -58,7 +58,7 @@
5858
<element name="showArrows" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][@data-show-arrows='{{arg2}}']" parameterized="true"/>
5959
<element name="showDots" type="button" selector="(//div[@data-content-type='slider'])[{{arg1}}][@data-show-dots='{{arg2}}']" parameterized="true"/>
6060
<element name="minHeight" type="button" selector="(//div[@data-content-type='slider']/div[contains(@class,'slider-container')])[{{arg1}}][contains(@style,'min-height: {{arg2}};')]" parameterized="true"/>
61-
<element name="noMinHeight" type="button" selector="(//div[@data-content-type='slider']/div[contains(@class,'slider-container')])[{{arg1}}][not(contains(@style,'min-height:'))]" parameterized="true"/>
61+
<element name="noMinHeight" type="button" selector="(//div[@data-content-type='slider']/div[contains(@class,'slider-container')])[{{sliderIndex}}][not(contains(@style,'min-height:'))]" parameterized="true"/>
6262
<!-- Advanced Configuration -->
6363
<element name="alignment" type="text" selector="(//div[@data-content-type='slider']/div[contains(@class,'slider-container')])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
6464
<element name="noAlignment" type="text" selector="(//div[@data-content-type='slider']/div[contains(@class,'slider-container')])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
@@ -86,7 +86,7 @@
8686
<element name="appearance" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
8787
<element name="slideName" type="button" selector="(//div[@data-content-type='slide'])[{{arg1}}][@data-slide-name='{{arg2}}']" parameterized="true"/>
8888
<element name="minimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'min-height: {{arg2}};')]" parameterized="true"/>
89-
<element name="noMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'min-height:'))]" parameterized="true"/>
89+
<element name="noMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][not(contains(@style,'min-height:'))]" parameterized="true"/>
9090
<!-- Background Configuration -->
9191
<element name="backgroundColor" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
9292
<element name="noBackgroundColor" type="button" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'background-color:'))]" parameterized="true"/>
@@ -156,9 +156,9 @@
156156
<element name="appearance" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
157157
<element name="slideName" type="button" selector="(//div[@data-content-type='slide'])[{{arg1}}][@data-slide-name='{{arg2}}']" parameterized="true"/>
158158
<element name="posterMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'min-height: {{arg2}};')]" parameterized="true"/>
159-
<element name="noPosterMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]//div[@class='pagebuilder-slide-wrapper'][not(contains(@style,'min-height:'))]" parameterized="true"/>
159+
<element name="noPosterMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][not(contains(@style,'min-height:'))]" parameterized="true"/>
160160
<element name="collageMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]/div[contains(@style,'min-height: {{arg2}};')]" parameterized="true"/>
161-
<element name="noCollageMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]/div[not(contains(@style,'min-height:'))]" parameterized="true"/>
161+
<element name="noCollageMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[not(contains(@style,'min-height:'))]" parameterized="true"/>
162162
<!-- Background Configuration -->
163163
<element name="backgroundColor" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]/div[contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
164164
<element name="noBackgroundColor" type="text" selector="(//div[@data-content-type='slide'])[{{arg1}}]/div[not(contains(@style,'background-color:'))]" parameterized="true"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@
704704
<features value="PageBuilder"/>
705705
<stories value="Slider"/>
706706
<title value="Slider Min Height With Collage Center Slide Min Height"/>
707-
<description value="A user can submit an different valid min height values for slider and slide with collage center appearance"/>
707+
<description value="A user can submit valid min height values (px, view port percentages, calculations, etc.) and they apply correctly to a sliders and collage center slide items."/>
708708
<severity value="CRITICAL"/>
709709
<useCaseId value="PB-379"/>
710710
<testCaseId value="MC-31543"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@
581581
<features value="PageBuilder"/>
582582
<stories value="Slider"/>
583583
<title value="Slider Min Height With Collage Left Slide Min Height"/>
584-
<description value="A user can submit an different valid min height values for slider and slide with collage left appearance"/>
584+
<description value="A user can submit valid min height values (px, view port percentages, calculations, etc.) and they apply correctly to a sliders and collage left slide items."/>
585585
<severity value="CRITICAL"/>
586586
<useCaseId value="PB-379"/>
587587
<testCaseId value="MC-31542"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@
482482
<features value="PageBuilder"/>
483483
<stories value="Slider"/>
484484
<title value="Slider Min Height With Collage Right Slide Min Height"/>
485-
<description value="A user can submit an different valid min height values for slider and slide with collage right appearance"/>
485+
<description value="A user can submit valid min height values (px, view port percentages, calculations, etc.) and they apply correctly to a sliders and collage right slide items."/>
486486
<severity value="CRITICAL"/>
487487
<useCaseId value="PB-379"/>
488488
<testCaseId value="MC-31541"/>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,15 +1859,16 @@
18591859
<annotations>
18601860
<features value="PageBuilder"/>
18611861
<stories value="Slider"/>
1862-
<title value="Slider Min Height With Slide Min Height"/>
1863-
<description value="A user can submit an different valid min height values for slider and slide"/>
1862+
<title value="Slider Min Height With Poster Slide Min Height"/>
1863+
<description value="A user can submit valid min height values (px, view port percentages, calculations, etc.) and they apply correctly to a sliders and poster slide items."/>
18641864
<severity value="CRITICAL"/>
18651865
<useCaseId value="PB-379"/>
18661866
<testCaseId value="MC-31462"/>
18671867
<group value="pagebuilder"/>
18681868
<group value="pagebuilder-slide"/>
18691869
<group value="pagebuilder-slider"/>
18701870
<group value="pagebuilder-sliderCommon"/>
1871+
<group value="pagebuilder-sliderPoster"/>
18711872
</annotations>
18721873
<before>
18731874
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
@@ -1980,7 +1981,7 @@
19801981
<executeJS function="return window.innerHeight;" stepKey="viewportHeightStage"/>
19811982
<waitForElementVisible selector="{{SliderOnStage.minHeight('1', PageBuilderMinHeightProperty_200px.value)}}" stepKey="seeFirstSliderMinHeightStage"/>
19821983
<waitForElementVisible selector="{{SlideOnBackend.noPosterMinimumHeight('1')}}" stepKey="seeFirstSlideHeightStage"/>
1983-
<executeJS function="return document.querySelectorAll('{{SliderOnStage.containerCSS}}')[0].getBoundingClientRect().height-({{PageBuilderAdvancedBorderWidthPropertyDefault.value}}*2*2)" stepKey="firstSliderMinHeightStage"/>
1984+
<executeJS function="return document.querySelectorAll('{{SliderOnStage.containerCSS}}')[0].getBoundingClientRect().height-({{PageBuilderAdvancedBorderWidthPropertyDefault.value}}*2)-({{PageBuilderAdvancedBorderWidthPropertyDefault.value}}*2)" stepKey="firstSliderMinHeightStage"/>
19841985
<executeJS function="return document.querySelectorAll('{{SlideOnBackend.wrapperCSS}}')[0].getBoundingClientRect().height" stepKey="firstSlideMinHeightStage"/>
19851986
<assertEquals stepKey="assertFirstSliderMinHeightStage">
19861987
<actualResult type="variable">firstSliderMinHeightStage</actualResult>
@@ -2029,10 +2030,10 @@
20292030
</assertEquals>
20302031
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
20312032
<!-- Validate Storefront -->
2032-
<executeJS function="return window.innerHeight;" stepKey="viewportHeightStorefront"/>
20332033
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
20342034
<argument name="page" value="$$createCMSPage.identifier$$"/>
20352035
</actionGroup>
2036+
<executeJS function="return window.innerHeight;" stepKey="viewportHeightStorefront"/>
20362037
<waitForElementVisible selector="{{SliderOnFrontend.minHeight('1', PageBuilderMinHeightProperty_200px.value)}}" stepKey="seeFirstSliderMinHeightStorefront"/>
20372038
<waitForElementVisible selector="{{SlideOnFrontend.noMinimumHeight('1')}}" stepKey="seeFirstSlideHeightStorefront"/>
20382039
<executeJS function="return document.querySelectorAll('{{SliderOnFrontend.all}}')[0].getBoundingClientRect().height" stepKey="firstSliderMinHeightStorefront"/>

0 commit comments

Comments
 (0)