Skip to content

Commit aa04d26

Browse files
danmooney2danmooney2
committed
MC-3865: Content Types With Links Redirect On Storefront If Link Is Empty
Add new functional tests and fix existing tests
1 parent b067110 commit aa04d26

7 files changed

+177
-5
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,15 @@
7575
<data key="fieldName">link_url</data>
7676
<data key="value">http://url.magento/</data>
7777
</entity>
78+
<entity name="PageBuilderBannerLinkUrlProperty_Empty" type="pagebuilder_banner_linkUrl_property">
79+
<data key="name">Link</data>
80+
<data key="section">contents</data>
81+
<data key="fieldName">link_url</data>
82+
<data key="value"/>
83+
</entity>
84+
<entity name="PageBuilderBannerLinkUrlProperty_EmptyFrontend" type="pagebuilder_banner_linkUrl_property">
85+
<data key="value">javascript:void(0)</data>
86+
</entity>
7887
<entity name="PageBuilderBannerLinkUrlPropertyValidate" type="pagebuilder_banner_linkUrl_property">
7988
<data key="name">Link</data>
8089
<data key="section">contents</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/ButtonItemData.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
<entity name="PageBuilderButtonItemLink_Empty" type="pagebuilder_button_item_link_property" extends="PageBuilderButtonItemLink_Template">
8787
<data key="value"/>
8888
</entity>
89+
<entity name="PageBuilderButtonItemLink_EmptyFrontend" type="pagebuilder_button_item_link_property" extends="PageBuilderButtonItemLink_Template">
90+
<data key="value">javascript:void(0)</data>
91+
</entity>
8992
<entity name="PageBuilderButtonItemLink_NotSecure" type="pagebuilder_button_item_link_property" extends="PageBuilderButtonItemLink_Template">
9093
<data key="value">http://url.magento/</data>
9194
</entity>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
<data key="fieldName">link_url</data>
4848
<data key="value"/>
4949
</entity>
50+
<entity name="PageBuilderSlideItemLinkURL_EmptyFrontend" type="pagebuilder_slide_item_link_url_property">
51+
<data key="value">javascript:void(0)</data>
52+
</entity>
5053
<entity name="PageBuilderSlideItemLinkURL_External" type="pagebuilder_slide_item_link_url_property">
5154
<data key="name">Link</data>
5255
<data key="section">general</data>

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,58 @@
975975
<switchToNextTab stepKey="switchToNextTab"/>
976976
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlProperty.value}}" stepKey="seeCurrentUrlEquals"/>
977977
</test>
978+
<test name="BannerEmptyLinkURLDoesNothingOnStorefront">
979+
<annotations>
980+
<features value="PageBuilder"/>
981+
<stories value="Banner"/>
982+
<title value="Banner - Banner Empty Link URL Does Nothing On Storefront" />
983+
<description value="A user should be able to click on banner with empty link url and remain on same page on the frontend"/>
984+
<severity value="CRITICAL"/>
985+
<useCaseId value="MC-1433"/>
986+
<testCaseId value="MC-4144"/>
987+
<group value="pagebuilder"/>
988+
<group value="pagebuilder-banner"/>
989+
<group value="pagebuilder-bannerCommon"/>
990+
</annotations>
991+
<before>
992+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
993+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
994+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
995+
</before>
996+
<after>
997+
<actionGroup ref="logout" stepKey="logout"/>
998+
</after>
999+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1000+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1001+
</actionGroup>
1002+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1003+
<argument name="group" value="PageBuilderBannerContentType"/>
1004+
</actionGroup>
1005+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1006+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1007+
</actionGroup>
1008+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
1009+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1010+
</actionGroup>
1011+
<!-- Fill Out Edit Panel -->
1012+
<comment userInput="Fill Out Edit Panel" stepKey="commentFillEditPanel"/>
1013+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterBannerLinkUrl">
1014+
<argument name="property" value="PageBuilderBannerLinkUrlProperty_Empty"/>
1015+
<argument name="selection" value="{{ExternalLink.url}}"/>
1016+
<argument name="newTab" value="PageBuilderBannerNewTabDefaultProperty"/>
1017+
</actionGroup>
1018+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1019+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1020+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1021+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1022+
</actionGroup>
1023+
<!-- Validate Storefront -->
1024+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1025+
<seeElement selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty_EmptyFrontend.value)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1026+
<click selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty_EmptyFrontend.value)}}" stepKey="clickLinkUrl"/>
1027+
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccur" />
1028+
<seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}{{PageBuilderBannerContentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="seeThatCurrentUrlIsUnchanged" />
1029+
</test>
9781030
<test name="BannerDoesNotNavigateOnStage">
9791031
<annotations>
9801032
<features value="PageBuilder"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
8383
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
8484
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="waitForButtonTypeStorefront"/>
85-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.value)}}" stepKey="waitForButtonUrlStorefront"/>
85+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
8686
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemNewTab('1', PageBuilderButtonItemOpenInNewTab_False.stageValue)}}" stepKey="waitForButtonNewTabStorefront"/>
8787
</test>
8888
<test name="ButtonItemOneCharacterButtonText">
@@ -488,7 +488,7 @@
488488
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
489489
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
490490
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="waitForButtonTypeStorefront"/>
491-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.value)}}" stepKey="waitForButtonUrlStorefront"/>
491+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
492492
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemNewTab('1', PageBuilderButtonItemOpenInNewTab_False.stageValue)}}" stepKey="waitForButtonNewTabStorefront"/>
493493
</test>
494494
<test name="ButtonItemSecondaryButtonType">
@@ -565,7 +565,7 @@
565565
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
566566
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
567567
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Secondary.value)}}" stepKey="waitForButtonTypeStorefront"/>
568-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.value)}}" stepKey="waitForButtonUrlStorefront"/>
568+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
569569
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemNewTab('1', PageBuilderButtonItemOpenInNewTab_False.stageValue)}}" stepKey="waitForButtonNewTabStorefront"/>
570570
</test>
571571
<test name="ButtonItemLinkButtonType">
@@ -642,7 +642,7 @@
642642
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
643643
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
644644
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Link.value)}}" stepKey="waitForButtonTypeStorefront"/>
645-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.value)}}" stepKey="waitForButtonUrlStorefront"/>
645+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
646646
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemNewTab('1', PageBuilderButtonItemOpenInNewTab_False.stageValue)}}" stepKey="waitForButtonNewTabStorefront"/>
647647
</test>
648648
</tests>

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

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,9 +967,65 @@
967967
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
968968
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
969969
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="waitForButtonTypeStorefront"/>
970-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.value)}}" stepKey="waitForButtonUrlStorefront"/>
970+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
971971
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemNewTab('1', PageBuilderButtonItemOpenInNewTab_False.stageValue)}}" stepKey="waitForButtonNewTabStorefront"/>
972972
</test>
973+
<test name="ButtonItemEmptyLinkURLDoesNothingOnStorefront">
974+
<annotations>
975+
<features value="PageBuilder"/>
976+
<stories value="Buttons"/>
977+
<title value="Button Item - Button Empty Link URL Does Nothing On Storefront"/>
978+
<description value="A user should be able to click on Button with empty link url and remain on same page on the frontend"/>
979+
<severity value="CRITICAL"/>
980+
<useCaseId value="MAGETWO-83922"/>
981+
<testCaseId value="MC-4143"/>
982+
<group value="pagebuilder"/>
983+
<group value="pagebuilder-buttons"/>
984+
<group value="pagebuilder-buttonItem"/>
985+
</annotations>
986+
<before>
987+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
988+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
989+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
990+
</before>
991+
<after>
992+
<actionGroup ref="logout" stepKey="logout"/>
993+
</after>
994+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
995+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
996+
</actionGroup>
997+
<!-- Add Button Group -->
998+
<comment userInput="Add Button Group" stepKey="commentAddButtonGroup"/>
999+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1000+
<argument name="group" value="PageBuilderButtonsContentType"/>
1001+
</actionGroup>
1002+
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
1003+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1004+
</actionGroup>
1005+
<!-- Fill Out Edit Panel -->
1006+
<comment userInput="Fill Out Edit Panel" stepKey="commentFillEditPanel"/>
1007+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage1">
1008+
<argument name="section" value="ButtonItemOnStage"/>
1009+
<argument name="targetIndex" value="1"/>
1010+
</actionGroup>
1011+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterButtonItemLinkUrl">
1012+
<argument name="property" value="PageBuilderButtonItemLink_Empty"/>
1013+
<argument name="selection" value="{{ExternalLink.url}}"/>
1014+
<argument name="newTab" value="PageBuilderButtonItemOpenInNewTab_False"/>
1015+
</actionGroup>
1016+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1017+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1018+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1019+
<argument name="contentType" value="PageBuilderButtonItemContentType"/>
1020+
</actionGroup>
1021+
<!-- Validate Storefront -->
1022+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1023+
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
1024+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1025+
<click selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="clickLinkUrl" />
1026+
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccur" />
1027+
<seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}{{PageBuilderButtonItemContentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="seeThatCurrentUrlIsUnchanged" />
1028+
</test>
9731029
<test name="ButtonItemNoRequiredFields">
9741030
<annotations>
9751031
<features value="PageBuilder"/>

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -993,6 +993,55 @@
993993
<switchToNextTab stepKey="switchToNextTab"/>
994994
<seeCurrentUrlEquals url="{{PageBuilderSlideItemLinkURL_External.value}}" stepKey="seeCurrentUrlEquals"/>
995995
</test>
996+
<test name="SlideItemEmptyLinkURLDoesNothingOnStorefront">
997+
<annotations>
998+
<features value="PageBuilder"/>
999+
<stories value="Slider"/>
1000+
<title value="Slide Item - Slide Empty Link URL Does Nothing On Storefront"/>
1001+
<description value="A user should be able to click on Slide with empty link url and remain on same page on the frontend"/>
1002+
<severity value="CRITICAL"/>
1003+
<useCaseId value="MAGETWO-75774"/>
1004+
<testCaseId value="MC-4139"/>
1005+
<group value="pagebuilder"/>
1006+
<group value="pagebuilder-slide"/>
1007+
<group value="pagebuilder-slideItemCommon"/>
1008+
</annotations>
1009+
<before>
1010+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1011+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1012+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1013+
</before>
1014+
<after>
1015+
<actionGroup ref="logout" stepKey="logout"/>
1016+
</after>
1017+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1018+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1019+
</actionGroup>
1020+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1021+
<argument name="group" value="PageBuilderSliderContentType"/>
1022+
</actionGroup>
1023+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragSliderIntoStage">
1024+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1025+
</actionGroup>
1026+
<!-- Fill Out Edit Panel -->
1027+
<comment userInput="Fill Out Edit Panel" stepKey="commentFillEditPanel"/>
1028+
<actionGroup ref="fillSlideOutPanelLinkUrlField" stepKey="enterSlideLinkUrl">
1029+
<argument name="property" value="PageBuilderSlideItemLinkURL_Empty"/>
1030+
<argument name="selection" value="{{ExternalLink.url}}"/>
1031+
<argument name="newTab" value="PageBuilderSlideItemLinkNewTab_False"/>
1032+
</actionGroup>
1033+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1034+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1035+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1036+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1037+
</actionGroup>
1038+
<!-- Validate Storefront -->
1039+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1040+
<seeElementInDOM selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_EmptyFrontend.value)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1041+
<click selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_EmptyFrontend.value)}}" stepKey="clickLinkUrl"/>
1042+
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccur" />
1043+
<seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}{{PageBuilderSliderContentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="seeThatCurrentUrlIsUnchanged" />
1044+
</test>
9961045
<test name="SlideItemDoesNotNavigateInPreview">
9971046
<annotations>
9981047
<features value="PageBuilder"/>

0 commit comments

Comments
 (0)