Skip to content

Commit e98dc92

Browse files
krissyhiserotekrissyhiserote
committed
Merge remote-tracking branch 'origin/MC-407-empty-banner-display-empty-area' into cms-team-2-sprint-11
2 parents b5b8fc6 + 04df2a0 commit e98dc92

File tree

11 files changed

+417
-8
lines changed

11 files changed

+417
-8
lines changed

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@
109109
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBackgroundAttachment2">
110110
<argument name="property" value="PageBuilderBackgroundAttachment_Default"/>
111111
</actionGroup>
112+
<!-- Fill URL field so it will show on storefront -->
113+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
114+
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
115+
<argument name="selection" value="{{ExternalLink.url}}"/>
116+
<argument name="newTab" value="PageBuilderBannerNewTabProperty"/>
117+
</actionGroup>
118+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
119+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
112120
<!-- Validate Storefront -->
113121
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
114122
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
@@ -339,6 +347,12 @@
339347
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor">
340348
<argument name="property" value="PageBuilderBackgroundColor_Empty"/>
341349
</actionGroup>
350+
<!-- Fill URL field so it will show on storefront -->
351+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
352+
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
353+
<argument name="selection" value="{{ExternalLink.url}}"/>
354+
<argument name="newTab" value="PageBuilderBannerNewTabProperty"/>
355+
</actionGroup>
342356
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
343357
<!-- Stage: Check No Background Color -->
344358
<comment userInput="Stage: Check No Background Color" stepKey="commentStageCheck"/>
@@ -1480,6 +1494,12 @@
14801494
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachFileSlideOutProperty">
14811495
<argument name="property" value="PageBuilderBackgroundMobileImage_JPG"/>
14821496
</actionGroup>
1497+
<!-- Fill URL field so it will show on storefront -->
1498+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
1499+
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
1500+
<argument name="selection" value="{{ExternalLink.url}}"/>
1501+
<argument name="newTab" value="PageBuilderBannerNewTabProperty"/>
1502+
</actionGroup>
14831503
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
14841504
<!-- Stage: Check No Mobile Background Image -->
14851505
<comment userInput="Stage: Check No Mobile Background Image" stepKey="commentStageCheck"/>
@@ -1564,6 +1584,12 @@
15641584
<argument name="Image" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
15651585
</actionGroup>
15661586
<actionGroup ref="saveImage" stepKey="saveImage"/>
1587+
<!-- Fill URL field so it will show on storefront -->
1588+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
1589+
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
1590+
<argument name="selection" value="{{ExternalLink.url}}"/>
1591+
<argument name="newTab" value="PageBuilderBannerNewTabProperty"/>
1592+
</actionGroup>
15671593
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
15681594
<!-- Stage:Check No Mobile Background Image -->
15691595
<comment userInput="Stage:Check No Mobile Background Image" stepKey="commentStageCheck"/>
@@ -1641,6 +1667,12 @@
16411667
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachFileSlideOutProperty">
16421668
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
16431669
</actionGroup>
1670+
<!-- Fill URL field so it will show on storefront -->
1671+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
1672+
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
1673+
<argument name="selection" value="{{ExternalLink.url}}"/>
1674+
<argument name="newTab" value="PageBuilderBannerNewTabProperty"/>
1675+
</actionGroup>
16441676
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
16451677
<!-- Stage:Check No Mobile Background Image -->
16461678
<comment userInput="Stage:Check No Mobile Background Image" stepKey="commentStageCheck"/>
@@ -1718,6 +1750,12 @@
17181750
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachFileSlideOutProperty">
17191751
<argument name="property" value="PageBuilderBackgroundMobileImage_PNG"/>
17201752
</actionGroup>
1753+
<!-- Fill URL field so it will show on storefront -->
1754+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
1755+
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
1756+
<argument name="selection" value="{{ExternalLink.url}}"/>
1757+
<argument name="newTab" value="PageBuilderBannerNewTabProperty"/>
1758+
</actionGroup>
17211759
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
17221760
<!-- Stage:Check No Mobile Background Image -->
17231761
<comment userInput="Stage:Check No Mobile Background Image" stepKey="commentStageCheck"/>
@@ -1795,6 +1833,12 @@
17951833
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachFileSlideOutProperty">
17961834
<argument name="property" value="PageBuilderBackgroundMobileImage_SpecialCharacters"/>
17971835
</actionGroup>
1836+
<!-- Fill URL field so it will show on storefront -->
1837+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
1838+
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
1839+
<argument name="selection" value="{{ExternalLink.url}}"/>
1840+
<argument name="newTab" value="PageBuilderBannerNewTabProperty"/>
1841+
</actionGroup>
17981842
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
17991843
<!-- Stage:Check No Mobile Background Image -->
18001844
<comment userInput="Stage:Check No Mobile Background Image" stepKey="commentStageCheck"/>
@@ -1889,6 +1933,12 @@
18891933
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachValidFileOnSlideOut">
18901934
<argument name="property" value="PageBuilderBackgroundMobileImage_JPG"/>
18911935
</actionGroup>
1936+
<!-- Fill URL field so it will show on storefront -->
1937+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
1938+
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
1939+
<argument name="selection" value="{{ExternalLink.url}}"/>
1940+
<argument name="newTab" value="PageBuilderBannerNewTabProperty"/>
1941+
</actionGroup>
18921942
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
18931943
<!-- Stage:Check No Background Mobile Image -->
18941944
<comment userInput="Stage:Check No Background Mobile Image" stepKey="commentStageCheck2"/>
@@ -1967,6 +2017,12 @@
19672017
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachValidFileOnSlideOut">
19682018
<argument name="property" value="PageBuilderBackgroundMobileImage_JPG"/>
19692019
</actionGroup>
2020+
<!-- Fill URL field so it will show on storefront -->
2021+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
2022+
<argument name="property" value="PageBuilderBannerLinkUrlProperty"/>
2023+
<argument name="selection" value="{{ExternalLink.url}}"/>
2024+
<argument name="newTab" value="PageBuilderBannerNewTabProperty"/>
2025+
</actionGroup>
19702026
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
19712027
<!-- Stage:Check No Background Mobile Image -->
19722028
<comment userInput="Stage:Check No Background Mobile Image" stepKey="commentStageCheck2"/>

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,4 +1134,54 @@
11341134
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
11351135
<seeElement selector="{{BannerOnFrontend.buttonText(PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStorefront"/>
11361136
</test>
1137+
<test name="BannerCollageCenterEmptyBannerTakeNoSpaceOnStoreFrontValidation">
1138+
<annotations>
1139+
<features value="Pagebuilder"/>
1140+
<stories value="Banner"/>
1141+
<useCaseId value="MC-407"/>
1142+
<title value=" Validate empty banner collage center does not take up space on store front"/>
1143+
<description value="Validate empty banner collage center does not take up space on store fronts"/>
1144+
<severity value="CRITICAL"/>
1145+
<group value="pagebuilder"/>
1146+
<group value="pagebuilder-banner"/>
1147+
<group value="pagebuilder-bannerCollageCenter"/>
1148+
</annotations>
1149+
<before>
1150+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1151+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1152+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1153+
</before>
1154+
<after>
1155+
<actionGroup ref="logout" stepKey="logout"/>
1156+
</after>
1157+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1158+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1159+
</actionGroup>
1160+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1161+
<argument name="group" value="PageBuilderBannerContentType"/>
1162+
</actionGroup>
1163+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1164+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1165+
</actionGroup>
1166+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageToEdit">
1167+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1168+
</actionGroup>
1169+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCollageCenteredProperty">
1170+
<argument name="property" value="PageBuilderBannerCollageCenteredProperty"/>
1171+
</actionGroup>
1172+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsCollageCentered"/>
1173+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPageWithCollageCenteredBanner"/>
1174+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1175+
<!-- Validate Stage -->
1176+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1177+
<waitForElementVisible time="2" selector="{{BannerOnBackend.emptyCollageCentered}}" stepKey="waitForCollageCentered" />
1178+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeEmptyBannerContent"/>
1179+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1180+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1181+
</actionGroup>
1182+
<!-- Validate Storefront -->
1183+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1184+
<waitForElement selector="{{BannerOnFrontend.banner}}" stepKey="waitForBannerOnStoreFront"/>
1185+
<dontSeeElement selector="{{BannerOnFrontend.banner}}" stepKey="dontSeeBannerOnStoreFront"/>
1186+
</test>
11371187
</tests>

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,4 +1128,54 @@
11281128
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
11291129
<seeElement selector="{{BannerOnFrontend.buttonText(PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStorefront"/>
11301130
</test>
1131+
<test name="BannerCollageLeftEmptyBannerTakeNoSpaceOnStoreFrontValidation">
1132+
<annotations>
1133+
<features value="Pagebuilder"/>
1134+
<stories value="Banner"/>
1135+
<useCaseId value="MC-407"/>
1136+
<title value=" Validate empty banner collage left does not take up space on store front"/>
1137+
<description value="Validate empty banner collage left does not take up space on store fronts"/>
1138+
<severity value="CRITICAL"/>
1139+
<group value="pagebuilder"/>
1140+
<group value="pagebuilder-banner"/>
1141+
<group value="pagebuilder-bannerCollageLeft"/>
1142+
</annotations>
1143+
<before>
1144+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1145+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1146+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1147+
</before>
1148+
<after>
1149+
<actionGroup ref="logout" stepKey="logout"/>
1150+
</after>
1151+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1152+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1153+
</actionGroup>
1154+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1155+
<argument name="group" value="PageBuilderBannerContentType"/>
1156+
</actionGroup>
1157+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1158+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1159+
</actionGroup>
1160+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageToEdit">
1161+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1162+
</actionGroup>
1163+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCollageLeftProperty">
1164+
<argument name="property" value="PageBuilderBannerCollageLeftProperty"/>
1165+
</actionGroup>
1166+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsCollageLeft"/>
1167+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPageWithCollageLeftBanner"/>
1168+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1169+
<!-- Validate Stage -->
1170+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1171+
<waitForElementVisible time="2" selector="{{BannerOnBackend.emptyCollageLeft}}" stepKey="waitForCollageLeft" />
1172+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeEmptyBannerContent"/>
1173+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1174+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1175+
</actionGroup>
1176+
<!-- Validate Storefront -->
1177+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1178+
<waitForElement selector="{{BannerOnFrontend.banner}}" stepKey="waitForBannerOnStoreFront"/>
1179+
<dontSeeElement selector="{{BannerOnFrontend.banner}}" stepKey="dontSeeBannerOnStoreFront"/>
1180+
</test>
11311181
</tests>

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,4 +1122,54 @@
11221122
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
11231123
<seeElement selector="{{BannerOnFrontend.buttonText(PageBuilderBannerButtonTextProperty2.value)}}" stepKey="seeButtonTextStorefront"/>
11241124
</test>
1125+
<test name="BannerCollageRightEmptyBannerTakeNoSpaceOnStoreFrontValidation">
1126+
<annotations>
1127+
<features value="Pagebuilder"/>
1128+
<stories value="Banner"/>
1129+
<useCaseId value="MC-407"/>
1130+
<title value=" Validate empty banner collage right does not take up space on store front"/>
1131+
<description value="Validate empty banner collage right does not take up space on store fronts"/>
1132+
<severity value="CRITICAL"/>
1133+
<group value="pagebuilder"/>
1134+
<group value="pagebuilder-banner"/>
1135+
<group value="pagebuilder-bannerCollageRight"/>
1136+
</annotations>
1137+
<before>
1138+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1139+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1140+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1141+
</before>
1142+
<after>
1143+
<actionGroup ref="logout" stepKey="logout"/>
1144+
</after>
1145+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1146+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1147+
</actionGroup>
1148+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1149+
<argument name="group" value="PageBuilderBannerContentType"/>
1150+
</actionGroup>
1151+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1152+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1153+
</actionGroup>
1154+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageToEdit">
1155+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1156+
</actionGroup>
1157+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceCollageRightProperty">
1158+
<argument name="property" value="PageBuilderBannerCollageRightProperty"/>
1159+
</actionGroup>
1160+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsCollageRight"/>
1161+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPageWithCollageRightBanner"/>
1162+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1163+
<!-- Validate Stage -->
1164+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1165+
<waitForElementVisible time="2" selector="{{BannerOnBackend.emptyCollageRight}}" stepKey="waitForCollageRight" />
1166+
<seeElement selector="{{BannerOnBackend.emptyBanner(PageBuilderBannerMessageDefaultProperty.placeholder)}}" stepKey="seeEmptyBannerContent"/>
1167+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1168+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1169+
</actionGroup>
1170+
<!-- Validate Storefront -->
1171+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1172+
<waitForElement selector="{{BannerOnFrontend.banner}}" stepKey="waitForBannerOnStoreFront"/>
1173+
<dontSeeElement selector="{{BannerOnFrontend.banner}}" stepKey="dontSeeBannerOnStoreFront"/>
1174+
</test>
11251175
</tests>

0 commit comments

Comments
 (0)