Skip to content

Commit 852280b

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 d68b2f3 + 2fbfb68 commit 852280b

8 files changed

+144
-32
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,12 @@
5050
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
5151
<argument name="contentType" value="PageBuilderBannerContentType"/>
5252
</actionGroup>
53-
<!-- Validate Stage Mobile Viewport -->
5453
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons">
5554
<argument name="contentType" value="PageBuilderBannerContentType"/>
5655
</actionGroup>
5756
<attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
57+
<waitForPageLoad stepKey="waitForPageLoad"/>
58+
<!-- Validate Stage Mobile Viewport -->
5859
<actionGroup ref="ValidateBackgroundImageConfigurationActionGroup" stepKey="validateBackgroundImageStage">
5960
<argument name="section" value="BannerOnBackend"/>
6061
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
@@ -75,10 +76,6 @@
7576
<argument name="viewportButton" value="desktop"/>
7677
<argument name="viewportStage" value="desktop"/>
7778
</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"/>
8279
<actionGroup ref="ValidateBackgroundImageConfigurationActionGroup" stepKey="validateBackgroundImageStage2">
8380
<argument name="section" value="BannerOnBackend"/>
8481
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonsThroughBlockContentTypeInlineSameSizeTest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,6 @@
272272
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefrontMobile">
273273
<argument name="page" value="$$createCMSPage.identifier$$"/>
274274
</actionGroup>
275-
<reloadPage stepKey="reloadPage"/>
276-
<waitForPageLoad stepKey="waitForReload"/>
277275
<seeNumberOfElements selector="{{ButtonItemOnStorefront.all}}" userInput="2" stepKey="see2ButtonsCMSPageStorefrontMobile"/>
278276
<actionGroup ref="validateButtonItemContent" stepKey="validateButton1CMSPageStorefrontMobile">
279277
<argument name="page" value="ButtonItemOnStorefront"/>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
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="ViewportSwitcherMobileImageContentUploadFromStageTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Viewport Switcher"/>
14+
<title value="Upload Image From Stage"/>
15+
<description value="A user should be able to use the on hover upload buttons for Image on the stage."/>
16+
<severity value="CRITICAL"/>
17+
<group value="pagebuilder"/>
18+
<group value="pagebuilder-image"/>
19+
<group value="pagebuilder-viewport-switcher"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
<createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
24+
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
25+
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
26+
</actionGroup>
27+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
28+
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewport">
29+
<argument name="viewportButton" value="mobile"/>
30+
<argument name="viewportStage" value="mobile"/>
31+
</actionGroup>
32+
</before>
33+
<after>
34+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
35+
<deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
36+
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
37+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
38+
<argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
39+
</actionGroup>
40+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
41+
<argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
42+
</actionGroup>
43+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
44+
<argument name="FolderName" value="{{PageBuilderMobileImagePropertyGif.path}}"/>
45+
</actionGroup>
46+
<actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
47+
<argument name="Image" value="PageBuilderMobileImagePropertyGif"/>
48+
</actionGroup>
49+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
50+
</after>
51+
<!-- Add Image -->
52+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSectionMobile">
53+
<argument name="contentType" value="PageBuilderImageContentType"/>
54+
</actionGroup>
55+
<actionGroup ref="dragContentTypeToStage" stepKey="dragImageIntoStageMobile">
56+
<argument name="contentType" value="PageBuilderImageContentType"/>
57+
</actionGroup>
58+
<!-- Edit Image -->
59+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuImageMobile">
60+
<argument name="contentType" value="PageBuilderImageContentType"/>
61+
</actionGroup>
62+
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachImageMobile">
63+
<argument name="property" value="PageBuilderImageProperty_JPG"/>
64+
</actionGroup>
65+
<actionGroup ref="attachFileSlideOutPropertyGeneral" stepKey="attachMobileImageMobile">
66+
<argument name="property" value="PageBuilderMobileImagePropertyGif"/>
67+
</actionGroup>
68+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsImageMobile"/>
69+
<!-- Verify On Hover Upload Button Work on Viewport mobile-->
70+
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtonsMobile">
71+
<argument name="contentType" value="PageBuilderImageContentType"/>
72+
<argument name="section" value="ImageOnStageWithoutImageUploaded"/>
73+
</actionGroup>
74+
<!-- Verify Edit Panel on Viewport mobile-->
75+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageMobile">
76+
<argument name="contentType" value="PageBuilderImageContentType"/>
77+
</actionGroup>
78+
<actionGroup ref="seeImageUploadedOnSlideOut" stepKey="seeImageOnSlideOutMobile">
79+
<argument name="property" value="PageBuilderMobileImagePropertyGif"/>
80+
</actionGroup>
81+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettingsMobile"/>
82+
<!-- Verify On Hover Upload Button Work on Viewport desktop -->
83+
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToDesktopViewport">
84+
<argument name="viewportButton" value="desktop"/>
85+
<argument name="viewportStage" value="desktop"/>
86+
</actionGroup>
87+
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtonsDesktop">
88+
<argument name="contentType" value="PageBuilderImageContentType"/>
89+
<argument name="section" value="ImageOnStageWithoutImageUploaded"/>
90+
</actionGroup>
91+
<!-- Verify Edit Panel on Viewport desktop-->
92+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageDesktop">
93+
<argument name="contentType" value="PageBuilderImageContentType"/>
94+
</actionGroup>
95+
<actionGroup ref="seeImageUploadedOnSlideOut" stepKey="seeImageOnSlideOutDesktop">
96+
<argument name="property" value="PageBuilderImageProperty_JPG"/>
97+
</actionGroup>
98+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettingsDesktop"/>
99+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenDesktop"/>
100+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageDesktop"/>
101+
<!-- Validate Storefront on Viewport desktop-->
102+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
103+
<argument name="page" value="$$createPreReqCMSPage.identifier$$"/>
104+
</actionGroup>
105+
<waitForElementVisible selector="{{ImageOnStorefront.base('1')}}" stepKey="waitForImageCMSPageStorefront"/>
106+
<seeElement selector="{{ImageOnStorefront.imageDesktop('1')}}" stepKey="seeDesktopImageCMSPageStorefront"/>
107+
<actionGroup ref="validateImage" stepKey="validateImageCMSPageStorefront">
108+
<argument name="section" value="ImageOnStorefront"/>
109+
<argument name="image" value="PageBuilderImageProperty_JPG"/>
110+
</actionGroup>
111+
<!-- Validate Storefront on Vewport mobile-->
112+
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobileCMSPageStorefront"/>
113+
<waitForElementVisible selector="{{ImageOnStorefront.base('1')}}" stepKey="waitForImageCMSPageStorefrontMobile"/>
114+
<seeElement selector="{{ImageOnStorefront.imageMobile('1')}}" stepKey="seeMobileImageCMSPageStorefrontMobile"/>
115+
<actionGroup ref="validateImage" stepKey="validateImageCMSPageStorefrontMobile">
116+
<argument name="section" value="ImageOnStorefront"/>
117+
<argument name="image" value="PageBuilderMobileImagePropertyGif"/>
118+
</actionGroup>
119+
</test>
120+
</tests>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveSlideItemsTest.xml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@
102102
<!-- Validate Stage -->
103103
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlideContentAfterSave"/>
104104
<waitForElementNotVisible selector="{{SlideOnBackend.base('2')}}" stepKey="dontSeeNextSlideAfterSave"/>
105-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusNavigationAfterSave"/>
105+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu">
106+
<argument name="contentType" value="PageBuilderSlideContentType"/>
107+
</actionGroup>
106108
<moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide1AfterSave"/>
107109
<see userInput="{{PageBuilderSlideItemSlideName_Slide1.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName1InTooltipAfterSave"/>
108110
<moveMouseOver selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="moveMouseOverSecondSlideNavigationDotAfterSave"/>
@@ -117,7 +119,9 @@
117119
<waitForPageLoad stepKey="waitForDragAndDrop"/>
118120
<!-- Validate Stage After Sorting -->
119121
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide3.value)}}" stepKey="seeSlide1ContentAfterSort"/>
120-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusNavigationAfterSort"/>
122+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusNavigationAfterSort">
123+
<argument name="contentType" value="PageBuilderSlideContentType"/>
124+
</actionGroup>
121125
<moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2AfterSort"/>
122126
<see userInput="{{PageBuilderSlideItemSlideName_Slide3.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName3InTooltipAfterSort"/>
123127
<moveMouseOver selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="moveMouseOverSecondSlideNavigationDot"/>
@@ -132,7 +136,9 @@
132136
<actionGroup ref="openPageBuilderForAttribute" stepKey="switchToPageBuilderStage2"/>
133137
<!-- Validate Stage After Save Desktop Viewport -->
134138
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide3.value)}}" stepKey="seeSlide3ContentAfterSave2"/>
135-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusNavigationAfterSave2"/>
139+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusNavigationAfterSave2">
140+
<argument name="contentType" value="PageBuilderSlideContentType"/>
141+
</actionGroup>
136142
<moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2AfterSave"/>
137143
<see userInput="{{PageBuilderSlideItemSlideName_Slide3.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName3InTooltipAfterSave2"/>
138144
<moveMouseOver selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="moveMouseOverSecondSlideNavigationDotAfterSave2"/>
@@ -150,7 +156,9 @@
150156
<argument name="viewportStage" value="mobile"/>
151157
</actionGroup>
152158
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide3.value)}}" stepKey="seeSlide3ContentAfterSave3"/>
153-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusNavigationAfterSave3"/>
159+
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusNavigationAfterSave3">
160+
<argument name="contentType" value="PageBuilderSlideContentType"/>
161+
</actionGroup>
154162
<moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2AfterSave2"/>
155163
<see userInput="{{PageBuilderSlideItemSlideName_Slide3.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName3InTooltipAfterSave3"/>
156164
<moveMouseOver selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="moveMouseOverSecondSlideNavigationDotAfterSave3"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileProductsThroughBlockContentTypeTest.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,6 @@
186186
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefrontMobile">
187187
<argument name="page" value="$$createCMSPage.identifier$$"/>
188188
</actionGroup>
189-
<reloadPage stepKey="reloadPage"/>
190-
<waitForPageLoad stepKey="waitForReload"/>
191189
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountCMSPageStorefrontMobile">
192190
<argument name="page" value="ProductsOnStorefront"/>
193191
<argument name="count" value="3"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Viewport Switcher"/>
14-
<title value="Mobile Viewport: Render Slide Item CollageL eft Appearance with Video Background Through Block Content Type"/>
14+
<title value="Mobile Viewport: Render Slide Item Collage Left Appearance with Video Background Through Block Content Type"/>
1515
<description value="Verify that users are able to successfully render the collage left slide content type with a video background through the Block content type in the mobile viewport."/>
1616
<severity value="CRITICAL"/>
1717
<group value="pagebuilder"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemPosterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Viewport Switcher"/>
14-
<title value="Mobile Viewport: Render Slide Item Poster Appearance Through Block Content Type in a mobile viewport "/>
14+
<title value="Mobile Viewport: Render Slide Item Poster Appearance Through Block Content Type "/>
1515
<description value="Verify that users are able to successfully render and use the slide item content type poster appearance through the Block content type in the mobile viewport."/>
1616
<severity value="CRITICAL"/>
1717
<group value="pagebuilder"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemUploadImageFromStageTest.xml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,13 @@
5050
<actionGroup ref="dragContentTypeToStage" stepKey="dragSliderOntoStage">
5151
<argument name="contentType" value="PageBuilderSliderContentType"/>
5252
</actionGroup>
53-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
54-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
55-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
56-
<!-- Validate Stage After Save Desktop Viewport -->
57-
<actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu">
58-
<argument name="contentType" value="PageBuilderSlideContentType"/>
59-
</actionGroup>
53+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlide"/>
6054
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons">
6155
<argument name="contentType" value="PageBuilderSliderContentType"/>
6256
</actionGroup>
6357
<attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
6458
<waitForPageLoad stepKey="waitForPageLoad"/>
59+
<!-- Validate Stage Mobile Viewport -->
6560
<actionGroup ref="ValidateBackgroundImageConfigurationActionGroup" stepKey="validateBackgroundImageStage">
6661
<argument name="section" value="SlideOnBackend"/>
6762
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
@@ -77,17 +72,11 @@
7772
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
7873
</actionGroup>
7974
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
80-
<!-- Validate Stage After Save Mobile Viewport -->
81-
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToMobileViewportAfterSave">
82-
<argument name="viewportButton" value="mobile"/>
83-
<argument name="viewportStage" value="mobile"/>
75+
<!-- Validate Stage Desktop Viewport -->
76+
<actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToDesktopViewport">
77+
<argument name="viewportButton" value="desktop"/>
78+
<argument name="viewportStage" value="desktop"/>
8479
</actionGroup>
85-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlide2"/>
86-
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons2">
87-
<argument name="contentType" value="PageBuilderSliderContentType"/>
88-
</actionGroup>
89-
<attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage2"/>
90-
<waitForPageLoad stepKey="waitForPageLoad2"/>
9180
<actionGroup ref="ValidateBackgroundImageConfigurationActionGroup" stepKey="validateBackgroundImageStage2">
9281
<argument name="section" value="SlideOnBackend"/>
9382
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
@@ -103,6 +92,8 @@
10392
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
10493
</actionGroup>
10594
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
95+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
96+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
10697
<!-- Navigate To Storefront -->
10798
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
10899
<argument name="page" value="$$createPreReqCMSPage.identifier$$"/>

0 commit comments

Comments
 (0)