Skip to content

Commit 18e9038

Browse files
author
hannahnida
committed
#558: Developer can style content types output differently per viewport - General Mftf tests fixes
1 parent c6866e0 commit 18e9038

File tree

24 files changed

+118
-121
lines changed

24 files changed

+118
-121
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<element name="elementJS" type="button" selector="document.querySelectorAll('[data-content-type=slide]')[{{slideIndex}} - 1]" parameterized="true"/>
1515
<element name="wrapperJS" type="button" selector="document.querySelectorAll('[data-content-type=slider] div.pagebuilder-slide-wrapper')[{{slideWrapperIndex}} - 1]" parameterized="true"/>
1616
<element name="wrapperCSS" type="button" selector="[data-content-type=slider] .pagebuilder-slide-wrapper"/>
17+
<element name="wrapper" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@class=&quot;pagebuilder-slide-wrapper&quot;]" parameterized="true"/>
18+
<element name="overlay" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;overlay&quot; or contains(@class,&quot;pagebuilder-overlay&quot;)]" parameterized="true"/>
1719
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-content-type=slider] div.pagebuilder-overlay')[{{slideOverlayIndex}} - 1]" parameterized="true"/>
1820
<element name="editableButtonItemElement" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//a[@data-element='button']//span[contains(@contenteditable, 'true')]" parameterized="true"/>
1921
<element name="imageSourceByIndex" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'{{image}}')]" parameterized="true" deprecated="Styles are not inline"/>
@@ -33,10 +35,8 @@
3335
<element name="slideName" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}][@data-slide-name='{{slideName}}']" parameterized="true"/>
3436
<element name="posterMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'min-height: {{minHeight}};')]" parameterized="true" deprecated="Styles are not inline"/>
3537
<element name="noPosterMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][not(contains(@style,'min-height:'))]" parameterized="true" deprecated="Styles are not inline"/>
36-
<element name="posterMinimumHeightPath" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@class=&quot;pagebuilder-slide-wrapper&quot;]" parameterized="true" />
3738
<element name="collageMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'min-height: {{minHeight}};')]" parameterized="true" deprecated="Styles are not inline"/>
3839
<element name="noCollageMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[not(contains(@style,'min-height:'))]" parameterized="true" deprecated="Styles are not inline"/>
39-
<element name="collageMinimumHeightPath" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]/div" parameterized="true"/>
4040
<!-- Background Configuration -->
4141
<element name="backgroundPath" type="button" parameterized="true" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;wrapper&quot;]"/>
4242
<element name="backgroundType" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-background-type='{{backgroundType}}']"/>
@@ -73,9 +73,7 @@
7373
<element name="buttonText" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//a[@data-element='button']//span[.='{{buttonText}}']" parameterized="true"/>
7474
<element name="showOverlay" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}][@data-show-overlay='{{showOverlay}}']" parameterized="true"/>
7575
<element name="overlayBackgroundColor" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: {{overlayColor}};')]" parameterized="true" deprecated="Styles are not inline"/>
76-
<element name="overlayBackgroundColorPath" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;overlay&quot; or contains(@class,&quot;pagebuilder-overlay&quot;)]" parameterized="true"/>
7776
<element name="transparentOverlay" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: transparent;')]" parameterized="true" deprecated="Styles are not inline"/>
78-
<element name="transparentOverlayPath" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;overlay&quot; or contains(@class,&quot;pagebuilder-overlay&quot;)]" parameterized="true"/>
7977
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@class,'inline-wysiwyg')]//{{tag}}" parameterized="true"/>
8078
<!-- Advanced Configuration -->
8179
<element name="posterAlignment" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'text-align: {{alignment}};')]" parameterized="true" deprecated="Styles are not inline"/>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
<element name="base" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]" parameterized="true"/>
1313
<element name="baseJS" type="button" selector="document.querySelectorAll('[data-content-type=slide] div.pagebuilder-slide-wrapper')[{{slideWrapperIndex}} - 1]" parameterized="true"/>
1414
<element name="elementJS" type="button" selector="document.querySelectorAll('[data-content-type=slide]')[{{slideIndex}} - 1]" parameterized="true"/>
15+
<element name="wrapper" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;wrapper&quot;]" parameterized="true"/>
1516
<element name="wrapperJS" type="button" selector="document.querySelectorAll('[data-content-type=slide] div.pagebuilder-slide-wrapper')[{{slideWrapperIndex}} - 1]" parameterized="true"/>
1617
<element name="wrapperCSS" type="button" selector="[data-content-type=slide] .pagebuilder-slide-wrapper"/>
18+
<element name="overlay" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;wrapper&quot;]//div[@data-element=&quot;overlay&quot; or contains(@class,&quot;pagebuilder-overlay&quot;)]" parameterized="true"/>
1719
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-content-type=slide] div.pagebuilder-overlay')[{{slideOverlayIndex}} - 1]" parameterized="true"/>
1820
<element name="slickSlideIndex" type="text" selector="[data-slick-index='{{slickSlideIndex}}']" parameterized="true"/>
1921
<element name="computedBoxSizing" type="button" selector="return window.getComputedStyle(document.querySelector('[data-content-type=slide]')).boxSizing"/>
@@ -23,7 +25,6 @@
2325
<element name="slideName" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}][@data-slide-name='{{slideName}}']" parameterized="true"/>
2426
<element name="minimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'min-height: {{minHeight}};')]" parameterized="true" deprecated="Styles are not inline"/>
2527
<element name="noMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][not(contains(@style,'min-height:'))]" parameterized="true" deprecated="Styles are not inline"/>
26-
<element name="minimumHeightPath" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;wrapper&quot;]" parameterized="true"/>
2728
<!-- Background Configuration -->
2829
<element name="backgroundPath" type="button" parameterized="true" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;wrapper&quot;]"/>
2930
<element name="backgroundType" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper' and @data-background-type='{{backgroundType}}']"/>
@@ -65,9 +66,7 @@
6566
<element name="buttonText" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//button[@data-element='button'][.='{{buttonText}}']" parameterized="true"/>
6667
<element name="showOverlay" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}][@data-show-overlay='{{showOverlay}}']" parameterized="true"/>
6768
<element name="overlayBackgroundColor" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//div[@data-element='overlay'][contains(@style,'background-color: {{overlayColor}};')]" parameterized="true" deprecated="Styles are not inline"/>
68-
<element name="overlayBackgroundColorPath" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;wrapper&quot;]//div[@data-element=&quot;overlay&quot;]" parameterized="true"/>
6969
<element name="transparentOverlay" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper']//div[@data-element='overlay' or contains(@class,'pagebuilder-overlay')][contains(@style,'background-color: transparent;')]" parameterized="true" deprecated="Styles are not inline"/>
70-
<element name="transparentOverlayPath" type="text" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;wrapper&quot;]//div[@data-element=&quot;overlay&quot; or contains(@class,&quot;pagebuilder-overlay&quot;)]" parameterized="true"/>
7170
<!-- Advanced Configuration -->
7271
<element name="advancedConfigurationPath" type="text" parameterized="true" selector="(//div[@data-content-type=&quot;slide&quot;])[{{slideIndex}}]//div[@data-element=&quot;wrapper&quot;]"/>
7372
<element name="alignment" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{alignment}};')]" parameterized="true" deprecated="Styles are not inline"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<argument name="page" value="SlideOnBackend"/>
3131
</actionGroup>
3232
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSBlockStage">
33-
<argument name="selector" value="{{SlideOnBackend.collageMinimumHeightPath('1')}}"/>
33+
<argument name="selector" value="{{SlideOnBackend.wrapper('1')}}"/>
3434
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
3535
<argument name="cssProperty" value="minHeight"/>
3636
</actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageLeftAppearanceThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<argument name="page" value="SlideOnBackend"/>
3131
</actionGroup>
3232
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSBlockStage">
33-
<argument name="selector" value="{{SlideOnBackend.collageMinimumHeightPath('1')}}"/>
33+
<argument name="selector" value="{{SlideOnBackend.wrapper('1')}}"/>
3434
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
3535
<argument name="cssProperty" value="minHeight"/>
3636
</actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageRightAppearanceThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<argument name="page" value="SlideOnBackend"/>
3131
</actionGroup>
3232
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSBlockStage">
33-
<argument name="selector" value="{{SlideOnBackend.collageMinimumHeightPath('1')}}"/>
33+
<argument name="selector" value="{{SlideOnBackend.wrapper('1')}}"/>
3434
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
3535
<argument name="cssProperty" value="minHeight"/>
3636
</actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverSlideDotCMSBlockStage"/>
127127
<see userInput="{{PageBuilderSlideItemSlideName_Slide1.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName1InTooltipCMSBlockStage"/>
128128
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSBlockStage">
129-
<argument name="selector" value="{{SlideOnBackend.posterMinimumHeightPath('1')}}"/>
129+
<argument name="selector" value="{{SlideOnBackend.wrapper('1')}}"/>
130130
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
131131
<argument name="cssProperty" value="minHeight"/>
132132
</actionGroup>
@@ -149,7 +149,7 @@
149149
<seeElementInDOM selector="{{SlideOnBackend.button('1')}}" stepKey="seeButtonInDOMCMSBlockStage"/>
150150
<dontSeeElement selector="{{SlideOnBackend.button('1')}}" stepKey="dontSeeButtonCMSBlockStage"/>
151151
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTransparentOverlayCMSBlockStage">
152-
<argument name="selector" value="{{SlideOnBackend.transparentOverlayPath('1')}}"/>
152+
<argument name="selector" value="{{SlideOnBackend.overlay('1')}}"/>
153153
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
154154
<argument name="cssProperty" value="backgroundColor"/>
155155
</actionGroup>
@@ -159,7 +159,7 @@
159159
<seeElement selector="{{SlideOnBackend.buttonType('1', PageBuilderSlideItemButtonType_Secondary.value)}}" stepKey="seeButtonTypeOnHoverCMSBlockStage"/>
160160
<waitForPageLoad time="30" stepKey="waitForOverlayTransitionStage"/>
161161
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverCMSBlockStage">
162-
<argument name="selector" value="{{SlideOnBackend.overlayBackgroundColorPath('1')}}"/>
162+
<argument name="selector" value="{{SlideOnBackend.overlay('1')}}"/>
163163
<argument name="expectedProperty" value="{{PageBuilderSlideItemOverlayColor_Blue_Opaque.value}}"/>
164164
<argument name="cssProperty" value="backgroundColor"/>
165165
</actionGroup>
@@ -201,7 +201,7 @@
201201
<argument name="page" value="SlideOnFrontend"/>
202202
</actionGroup>
203203
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSPageStage">
204-
<argument name="selector" value="{{SlideOnFrontend.minimumHeightPath('1')}}"/>
204+
<argument name="selector" value="{{SlideOnFrontend.wrapper('1')}}"/>
205205
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
206206
<argument name="cssProperty" value="minHeight"/>
207207
</actionGroup>
@@ -224,7 +224,7 @@
224224
<seeElementInDOM selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonInDOMCMSPageStage"/>
225225
<dontSeeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="dontSeeButtonCMSPageStage"/>
226226
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTransparentOverlayCMSPageStage">
227-
<argument name="selector" value="{{SlideOnFrontend.transparentOverlayPath('1')}}"/>
227+
<argument name="selector" value="{{SlideOnFrontend.overlay('1')}}"/>
228228
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
229229
<argument name="cssProperty" value="backgroundColor"/>
230230
</actionGroup>
@@ -253,7 +253,7 @@
253253
</actionGroup>
254254
<seeElement selector="{{SlideOnFrontend.slideName('1', PageBuilderSlideItemSlideName_Slide1.value)}}" stepKey="seeSlideNameCMSPageStorefront"/>
255255
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeMinimumHeightCMSPageStorefront">
256-
<argument name="selector" value="{{SlideOnFrontend.minimumHeightPath('1')}}"/>
256+
<argument name="selector" value="{{SlideOnFrontend.wrapper('1')}}"/>
257257
<argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_500.value}}"/>
258258
<argument name="cssProperty" value="minHeight"/>
259259
</actionGroup>
@@ -276,7 +276,7 @@
276276
<seeElementInDOM selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonInDOMCMSPageStorefront"/>
277277
<dontSeeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="dontSeeButtonCMSPageStorefront"/>
278278
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTransparentOverlayCMSPageStorefront">
279-
<argument name="selector" value="{{SlideOnFrontend.transparentOverlayPath('1')}}"/>
279+
<argument name="selector" value="{{SlideOnFrontend.overlay('1')}}"/>
280280
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
281281
<argument name="cssProperty" value="backgroundColor"/>
282282
</actionGroup>
@@ -286,7 +286,7 @@
286286
<seeElement selector="{{SlideOnFrontend.buttonType('1', PageBuilderSlideItemButtonType_Secondary.value)}}" stepKey="seeButtonTypeOnHoverCMSPageStorefront"/>
287287
<waitForPageLoad time="30" stepKey="waitForSlideTransitionStorefront"/>
288288
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverCMSPageStorefront">
289-
<argument name="selector" value="{{SlideOnFrontend.overlayBackgroundColorPath('1')}}"/>
289+
<argument name="selector" value="{{SlideOnFrontend.overlay('1')}}"/>
290290
<argument name="expectedProperty" value="{{PageBuilderSlideItemOverlayColor_Blue_Opaque.value}}"/>
291291
<argument name="cssProperty" value="backgroundColor"/>
292292
</actionGroup>
@@ -328,14 +328,14 @@
328328
<seeElementInDOM selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonInDOMCMSPageStorefrontMobile"/>
329329
<dontSeeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="dontSeeButtonCMSPageStorefrontMobile"/>
330330
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeTransparentOverlayCMSPageStorefrontMobile">
331-
<argument name="selector" value="{{SlideOnFrontend.transparentOverlayPath('1')}}"/>
331+
<argument name="selector" value="{{SlideOnFrontend.overlay('1')}}"/>
332332
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
333333
<argument name="cssProperty" value="backgroundColor"/>
334334
</actionGroup>
335335
<moveMouseOver selector="{{SlideOnFrontend.base('1')}}" stepKey="moveMouseOverSlideCMSPageStorefrontMobile"/>
336336
<seeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonOnHoverCMSPageStorefrontMobile"/>
337337
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverCMSPageStorefrontMobile">
338-
<argument name="selector" value="{{SlideOnFrontend.overlayBackgroundColorPath('1')}}"/>
338+
<argument name="selector" value="{{SlideOnFrontend.overlay('1')}}"/>
339339
<argument name="expectedProperty" value="{{PageBuilderSlideItemOverlayColor_Blue_Opaque.value}}"/>
340340
<argument name="cssProperty" value="backgroundColor"/>
341341
</actionGroup>

0 commit comments

Comments
 (0)