Skip to content

Commit c90e7f2

Browse files
author
joiecaquicla
committed
Merge branch '636-functional-tests-on-mobile-viewport' of github.com:joweecaquicla/magento2-page-builder into 636-functional-tests-on-mobile-viewport
2 parents 3729ec6 + b82b6aa commit c90e7f2

5 files changed

+221
-33
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@
268268
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefrontMobile">
269269
<argument name="page" value="$$createCMSPage.identifier$$"/>
270270
</actionGroup>
271-
<reloadPage stepKey="reloadPage"/>
272271
<waitForPageLoad stepKey="waitForReload"/>
273272
<seeNumberOfElements selector="{{ButtonItemOnStorefront.all}}" userInput="2" stepKey="see2ButtonsCMSPageStorefrontMobile"/>
274273
<actionGroup ref="validateButtonItemContent" stepKey="validateButton1CMSPageStorefrontMobile">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerUploadImageFromStageTest.xml

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="ViewportSwitcherMobileBannerUploadImageFromStageTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Viewport Switcher"/>
14+
<title value="Mobile Viewport: Upload Image From Stage"/>
15+
<description value="A user should be able to use the on hover upload buttons for Banner on the stage."/>
16+
<severity value="CRITICAL"/>
17+
<group value="pagebuilder"/>
18+
<group value="pagebuilder-banner"/>
19+
<group value="pagebuilder-bannerCommon"/>
20+
<group value="pagebuilder-viewport-switcher"/>
21+
</annotations>
22+
<before>
23+
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
26+
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
27+
</actionGroup>
28+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
29+
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewport">
30+
<argument name="viewportButton" value="mobile"/>
31+
<argument name="viewportStage" value="mobile"/>
32+
</actionGroup>
33+
</before>
34+
<after>
35+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
36+
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
37+
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
38+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
39+
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
40+
</actionGroup>
41+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
42+
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
43+
</actionGroup>
44+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
45+
</after>
46+
<!-- Add Banner -->
47+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
48+
<argument name="contentType" value="PageBuilderBannerContentType"/>
49+
</actionGroup>
50+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
51+
<argument name="contentType" value="PageBuilderBannerContentType"/>
52+
</actionGroup>
53+
<!-- Validate Stage Mobile Viewport -->
54+
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons">
55+
<argument name="contentType" value="PageBuilderBannerContentType"/>
56+
</actionGroup>
57+
<attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
58+
<actionGroup ref="validateBackgroundImage" stepKey="validateBackgroundImageStage">
59+
<argument name="section" value="BannerOnBackend"/>
60+
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
61+
</actionGroup>
62+
<actionGroup ref="verifySelectFromGalleryButtonWorks" stepKey="verifySelectFromGalleryButtonWorks">
63+
<argument name="contentType" value="PageBuilderBannerContentType"/>
64+
</actionGroup>
65+
<!-- Verify Edit Panel -->
66+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
67+
<argument name="contentType" value="PageBuilderBannerContentType"/>
68+
</actionGroup>
69+
<actionGroup ref="seeImageUploadedOnSlideOut" stepKey="seeImageOnSlideOut">
70+
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
71+
</actionGroup>
72+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
73+
<!-- Validate Stage Desktop Viewport -->
74+
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewport2">
75+
<argument name="viewportButton" value="desktop"/>
76+
<argument name="viewportStage" value="desktop"/>
77+
</actionGroup>
78+
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons2">
79+
<argument name="contentType" value="PageBuilderBannerContentType"/>
80+
</actionGroup>
81+
<attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage2"/>
82+
<actionGroup ref="validateBackgroundImage" stepKey="validateBackgroundImageStage2">
83+
<argument name="section" value="BannerOnBackend"/>
84+
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
85+
</actionGroup>
86+
<actionGroup ref="verifySelectFromGalleryButtonWorks" stepKey="verifySelectFromGalleryButtonWorks2">
87+
<argument name="contentType" value="PageBuilderBannerContentType"/>
88+
</actionGroup>
89+
<!-- Verify Edit Panel -->
90+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
91+
<argument name="contentType" value="PageBuilderBannerContentType"/>
92+
</actionGroup>
93+
<actionGroup ref="seeImageUploadedOnSlideOut" stepKey="seeImageOnSlideOut2">
94+
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
95+
</actionGroup>
96+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
97+
<!-- Save Page -->
98+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
99+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
100+
<!-- Navigate To Storefront -->
101+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
102+
<argument name="page" value="$$createPreReqCMSPage.identifier$$"/>
103+
</actionGroup>
104+
<!-- Validate Storefront Desktop -->
105+
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront">
106+
<argument name="section" value="BannerOnFrontend"/>
107+
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
108+
</actionGroup>
109+
<!-- Validate Storefront Mobile -->
110+
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
111+
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateImageOnStorefront2">
112+
<argument name="section" value="BannerOnFrontend"/>
113+
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
114+
</actionGroup>
115+
</test>
116+
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,33 +25,46 @@
2525
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
2626
</actionGroup>
2727
<!-- Validate CMS Block Stage Mobile Viewport -->
28-
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSBlockStage" before="widthOfWrapperMinusPaddingCMSPageBackendMobile"/>
29-
<executeJS function="return Math.abs({{SlideOnBackend.wrapperJS('1')}}.getBoundingClientRect().width - {{PageBuilderPaddingProperty40.paddingLeft}} - {{PageBuilderPaddingProperty40.paddingRight}})" stepKey="widthOfWrapperMinusPaddingCMSPageBackendMobile" before="validateOverlayPositionCMSPageBackendMobile"/>
30-
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageBackendMobile">
28+
<seeElement selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSBlockStageMobile"/>
29+
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSBlockStageMobile">
30+
<argument name="page" value="SlideOnBackend"/>
31+
</actionGroup>
32+
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderMinHeightProperty_300px.value)}}" stepKey="seeMinimumHeightCMSBlockStageMobile"/>
33+
<moveMouseOver selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverSlideCMSBlockStageMobile"/>
34+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStageMobile}-{$overlayLeftPositionCMSBlockStageMobile}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStageMobile"/>
35+
<!-- Validate CMS Block Stage Desktop Viewport-->
36+
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSBlockStage"/>
37+
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSBlockStage">
3138
<argument name="page" value="SlideOnBackend"/>
32-
<argument name="expectedOverlayWidth" value="{$widthOfWrapperMinusPaddingCMSPageBackendMobile}"/>
3339
</actionGroup>
34-
35-
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderMinHeightProperty_200px.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
3640
<moveMouseOver selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverSlideCMSBlockStage"/>
3741
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStage}-{$overlayLeftPositionCMSBlockStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStage"/>
38-
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSPageStage"/>
39-
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStage">
42+
<!-- Validate CMS Page Stage Mobile Viewport-->
43+
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSPageStageMobile"/>
44+
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStageMobile">
45+
<argument name="page" value="SlideOnFrontend"/>
46+
</actionGroup>
47+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStageMobile}-{$overlayLeftPositionCMSPageStageMobile}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStageMobile"/>
48+
<!-- Validate CMS Block Stage Desktop Viewport after Save-->
49+
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSPageStageAfterSave"/>
50+
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStageAfterSave">
4051
<argument name="page" value="SlideOnFrontend"/>
4152
</actionGroup>
42-
43-
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStage}-{$overlayLeftPositionCMSPageStage}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStage"/>
53+
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStageAfterSave}-{$overlayLeftPositionCMSPageStageAfterSave}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStageAfterSave"/>
54+
<!-- Validate CMS Page Storefront -->
4455
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSPageStorefront"/>
4556
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStorefront">
4657
<argument name="page" value="SlideOnFrontend"/>
4758
</actionGroup>
48-
4959
<moveMouseOver selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverSlideCMSPageStorefront"/>
5060
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSPageStorefront}-{$overlayLeftPositionCMSPageStorefront}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSPageStorefront"/>
51-
<executeJS function="return Math.abs({{SlideOnFrontend.wrapperJS('1')}}.getBoundingClientRect().width - {{PageBuilderPaddingProperty40.paddingLeft}} - {{PageBuilderPaddingProperty40.paddingRight}})" stepKey="widthOfWrapperMinusPaddingCMSPageStorefrontMobile" before="validateOverlayPositionCMSPageStorefrontMobile"/>
61+
<!-- Validate CMS Page Storefront Mobile -->
62+
<seeElement selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="seeAppearanceCMSPageStorefrontMobile"/>
63+
<executeJS function="return Math.abs({{SlideOnFrontend.wrapperJS('1')}}.getBoundingClientRect().width - {{PageBuilderPaddingProperty40.paddingLeft}} - {{PageBuilderPaddingProperty40.paddingRight}})" stepKey="widthOfWrapperMinusPaddingCMSBlockStageFrontend" before="validateOverlayPositionCMSPageStorefrontMobile"/>
5264
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSPageStorefrontMobile">
5365
<argument name="page" value="SlideOnFrontend"/>
54-
<argument name="expectedOverlayWidth" value="{$widthOfWrapperMinusPaddingCMSPageStorefrontMobile}"/>
66+
<argument name="expectedOverlayWidth" value="{$widthOfWrapperMinusPaddingCMSBlockStageFrontend}"/>
5567
</actionGroup>
56-
</test>
68+
<moveMouseOver selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverSlideCMSPageStorefrontMobile"/>
69+
</test>
5770
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@
116116
<waitForElementVisible selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="waitForMessageContentCMSBlockStageMobile"/>
117117
<waitForElementVisible selector="{{SlideOnBackend.buttonText('1', PageBuilderSlideItemButtonText_Slide1.value)}}" stepKey="waitForButtonTextCMSBlockStageMobile"/>
118118
<!-- Validate Stage on Viewport Desktop -->
119+
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToDesktopViewport">
120+
<argument name="viewportButton" value="desktop"/>
121+
<argument name="viewportStage" value="desktop"/>
122+
</actionGroup>
119123
<actionGroup ref="validateVideoBackgroundWithAllAttributes" stepKey="validateCMSBlockStage">
120124
<argument name="section" value="SlideOnBackend"/>
121125
<argument name="backgroundColor" value="{{PageBuilderBackgroundColor_Pink.rgb}}"/>
@@ -139,7 +143,7 @@
139143
</actionGroup>
140144
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
141145
<!-- Edit Row On CMS Page -->
142-
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewportForEditRor">
146+
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewportForEditRow">
143147
<argument name="viewportButton" value="mobile"/>
144148
<argument name="viewportStage" value="mobile"/>
145149
</actionGroup>
@@ -168,6 +172,10 @@
168172
</actionGroup>
169173
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsBlock"/>
170174
<!-- Validate CMS Page Stage on Viewport Desktop-->
175+
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToDesktopViewportCMSPage">
176+
<argument name="viewportButton" value="desktop"/>
177+
<argument name="viewportStage" value="desktop"/>
178+
</actionGroup>
171179
<actionGroup ref="validateVideoBackgroundWithAllAttributes" stepKey="validateCMSPageStage">
172180
<argument name="section" value="SlideOnFrontend"/>
173181
<argument name="backgroundColor" value="{{PageBuilderBackgroundColor_Pink.rgb}}"/>

0 commit comments

Comments
 (0)