Skip to content

Commit 4d63a4f

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 4db8697 + 8f7fba8 commit 4d63a4f

6 files changed

+106
-42
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<argument name="contentType" value="PageBuilderBannerContentType"/>
5656
</actionGroup>
5757
<attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
58-
<actionGroup ref="validateBackgroundImage" stepKey="validateBackgroundImageStage">
58+
<actionGroup ref="ValidateBackgroundImageConfigurationActionGroup" stepKey="validateBackgroundImageStage">
5959
<argument name="section" value="BannerOnBackend"/>
6060
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
6161
</actionGroup>
@@ -79,7 +79,7 @@
7979
<argument name="contentType" value="PageBuilderBannerContentType"/>
8080
</actionGroup>
8181
<attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage2"/>
82-
<actionGroup ref="validateBackgroundImage" stepKey="validateBackgroundImageStage2">
82+
<actionGroup ref="ValidateBackgroundImageConfigurationActionGroup" stepKey="validateBackgroundImageStage2">
8383
<argument name="section" value="BannerOnBackend"/>
8484
<argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
8585
</actionGroup>

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

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,22 @@
5252
</actionGroup>
5353
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditFormForRow"/>
5454
<!-- Validate Stage -->
55-
<seeElement selector="{{RowOnStage.backgroundColor('1', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="seeBackgroundColorRowStage"/>
55+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowStage">
56+
<argument name="selector" value="{{RowOnStage.backgroundPath('1')}}"/>
57+
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
58+
<argument name="cssProperty" value="backgroundColor"/>
59+
</actionGroup>
5660
<!-- Save Product -->
5761
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
5862
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
5963
<actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="expandAdminProductSection"/>
6064
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForDescription"/>
6165
<!-- Validate Stage After Save Desktop Viewport -->
62-
<seeElement selector="{{RowOnStage.backgroundColor('1', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="seeBackgroundColorRowStageAfterSave"/>
66+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowStageAfterSave">
67+
<argument name="selector" value="{{RowOnStage.backgroundPath('1')}}"/>
68+
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
69+
<argument name="cssProperty" value="backgroundColor"/>
70+
</actionGroup>
6371
<!-- Validate Edit Panel After Save -->
6472
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForRowAfterSave">
6573
<argument name="contentType" value="PageBuilderRowContentType"/>
@@ -73,7 +81,11 @@
7381
<argument name="viewportButton" value="mobile"/>
7482
<argument name="viewportStage" value="mobile"/>
7583
</actionGroup>
76-
<seeElement selector="{{RowOnStage.backgroundColor('1', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="seeBackgroundColorRowStageAfterSave2"/>
84+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowStageAfterSave2">
85+
<argument name="selector" value="{{RowOnStage.backgroundPath('1')}}"/>
86+
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
87+
<argument name="cssProperty" value="backgroundColor"/>
88+
</actionGroup>
7789
<!-- Validate Edit Panel After Save -->
7890
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForRowAfterSave2">
7991
<argument name="contentType" value="PageBuilderRowContentType"/>
@@ -86,12 +98,19 @@
8698
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToProductStorefront">
8799
<argument name="page" value="$$createProduct.name$$.html"/>
88100
</actionGroup>
89-
<!-- Validate Storefront Desktop -->
90101
<scrollTo selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="scrollToProductDescription"/>
91-
<seeElement selector="{{RowOnStorefront.backgroundColor('1', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="seeBackgroundColorRowStorefront"/>
102+
<!-- Validate Storefront Desktop -->
103+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowStorefront">
104+
<argument name="selector" value="{{RowOnStorefront.backgroundPath('1')}}"/>
105+
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
106+
<argument name="cssProperty" value="backgroundColor"/>
107+
</actionGroup>
92108
<!-- Validate Storefront Mobile -->
93109
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
94-
<scrollTo selector="{{StorefrontProductInfoMainSection.productDescription}}" stepKey="scrollToProductDescription2"/>
95-
<seeElement selector="{{RowOnStorefront.backgroundColor('1', PageBuilderBackgroundColor_Hex_Grey.rgb)}}" stepKey="seeBackgroundColorRowStorefront2"/>
110+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeBackgroundColorRowStorefront2">
111+
<argument name="selector" value="{{RowOnStorefront.backgroundPath('1')}}"/>
112+
<argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Hex_Grey.rgb}}"/>
113+
<argument name="cssProperty" value="backgroundColor"/>
114+
</actionGroup>
96115
</test>
97116
</tests>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<group value="pagebuilder-viewport-switcher"/>
2222
</annotations>
2323
<before>
24-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2524
<createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2626
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToAPageWithPageBuilder">
2727
<argument name="Category" value="$$createPreReqCategory$$"/>
2828
</actionGroup>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<actionGroup ref="validateOverlayPositionCollageCenter" stepKey="validateOverlayPositionCMSBlockStageMobile">
3030
<argument name="page" value="SlideOnBackend"/>
3131
</actionGroup>
32-
<seeElement selector="{{SlideOnBackend.collageMinimumHeight('1', PageBuilderMinHeightProperty_300px.value)}}" stepKey="seeMinimumHeightCMSBlockStageMobile"/>
3332
<moveMouseOver selector="{{SlideOnBackend.appearance('1', PageBuilderAppearance_CollageCentered.value)}}" stepKey="moveMouseOverSlideCMSBlockStageMobile"/>
3433
<executeJS function="return Math.abs(Math.round({$buttonLeftPositionCMSBlockStageMobile}-{$overlayLeftPositionCMSBlockStageMobile}-30))" stepKey="buttonMinusOverlayMinusPaddingCMSBlockStageMobile"/>
3534
<!-- Validate CMS Block Stage Desktop Viewport-->

0 commit comments

Comments
 (0)