Skip to content

Commit f30731a

Browse files
danmooney2danmooney2
committed
MC-3865: Content Types With Links Redirect On Storefront If Link Is Empty
Address review feedback
1 parent aa04d26 commit f30731a

7 files changed

+20
-27
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@
8080
<data key="section">contents</data>
8181
<data key="fieldName">link_url</data>
8282
<data key="value"/>
83-
</entity>
84-
<entity name="PageBuilderBannerLinkUrlProperty_EmptyFrontend" type="pagebuilder_banner_linkUrl_property">
85-
<data key="value">javascript:void(0)</data>
83+
<data key="frontendValue">javascript:void(0)</data>
8684
</entity>
8785
<entity name="PageBuilderBannerLinkUrlPropertyValidate" type="pagebuilder_banner_linkUrl_property">
8886
<data key="name">Link</data>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@
8585
</entity>
8686
<entity name="PageBuilderButtonItemLink_Empty" type="pagebuilder_button_item_link_property" extends="PageBuilderButtonItemLink_Template">
8787
<data key="value"/>
88-
</entity>
89-
<entity name="PageBuilderButtonItemLink_EmptyFrontend" type="pagebuilder_button_item_link_property" extends="PageBuilderButtonItemLink_Template">
90-
<data key="value">javascript:void(0)</data>
88+
<data key="frontendValue">javascript:void(0)</data>
9189
</entity>
9290
<entity name="PageBuilderButtonItemLink_NotSecure" type="pagebuilder_button_item_link_property" extends="PageBuilderButtonItemLink_Template">
9391
<data key="value">http://url.magento/</data>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@
4646
<data key="section">general</data>
4747
<data key="fieldName">link_url</data>
4848
<data key="value"/>
49-
</entity>
50-
<entity name="PageBuilderSlideItemLinkURL_EmptyFrontend" type="pagebuilder_slide_item_link_url_property">
51-
<data key="value">javascript:void(0)</data>
49+
<data key="frontendValue">javascript:void(0)</data>
5250
</entity>
5351
<entity name="PageBuilderSlideItemLinkURL_External" type="pagebuilder_slide_item_link_url_property">
5452
<data key="name">Link</data>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -981,8 +981,8 @@
981981
<stories value="Banner"/>
982982
<title value="Banner - Banner Empty Link URL Does Nothing On Storefront" />
983983
<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"/>
984+
<severity value="MAJOR"/>
985+
<useCaseId value="MC-3865"/>
986986
<testCaseId value="MC-4144"/>
987987
<group value="pagebuilder"/>
988988
<group value="pagebuilder-banner"/>
@@ -1022,8 +1022,8 @@
10221022
</actionGroup>
10231023
<!-- Validate Storefront -->
10241024
<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"/>
1025+
<seeElement selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty_Empty.frontendValue)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1026+
<click selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty_Empty.frontendValue)}}" stepKey="clickLinkUrl"/>
10271027
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccur" />
10281028
<seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}{{PageBuilderBannerContentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="seeThatCurrentUrlIsUnchanged" />
10291029
</test>

‎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_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
85+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" 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_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
491+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" 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_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
568+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" 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_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
645+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" 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: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@
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_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
970+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" stepKey="waitForButtonUrlStorefront"/>
971971
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemNewTab('1', PageBuilderButtonItemOpenInNewTab_False.stageValue)}}" stepKey="waitForButtonNewTabStorefront"/>
972972
</test>
973973
<test name="ButtonItemEmptyLinkURLDoesNothingOnStorefront">
@@ -976,8 +976,8 @@
976976
<stories value="Buttons"/>
977977
<title value="Button Item - Button Empty Link URL Does Nothing On Storefront"/>
978978
<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"/>
979+
<severity value="MAJOR"/>
980+
<useCaseId value="MC-3865"/>
981981
<testCaseId value="MC-4143"/>
982982
<group value="pagebuilder"/>
983983
<group value="pagebuilder-buttons"/>
@@ -1020,9 +1020,8 @@
10201020
</actionGroup>
10211021
<!-- Validate Storefront -->
10221022
<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" />
1023+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1024+
<click selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" stepKey="clickLinkUrl" />
10261025
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccur" />
10271026
<seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}{{PageBuilderButtonItemContentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="seeThatCurrentUrlIsUnchanged" />
10281027
</test>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -999,8 +999,8 @@
999999
<stories value="Slider"/>
10001000
<title value="Slide Item - Slide Empty Link URL Does Nothing On Storefront"/>
10011001
<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"/>
1002+
<severity value="MAJOR"/>
1003+
<useCaseId value="MC-3865"/>
10041004
<testCaseId value="MC-4139"/>
10051005
<group value="pagebuilder"/>
10061006
<group value="pagebuilder-slide"/>
@@ -1037,8 +1037,8 @@
10371037
</actionGroup>
10381038
<!-- Validate Storefront -->
10391039
<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"/>
1040+
<seeElementInDOM selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_Empty.frontendValue)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1041+
<click selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_Empty.frontendValue)}}" stepKey="clickLinkUrl"/>
10421042
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccur" />
10431043
<seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}{{PageBuilderSliderContentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="seeThatCurrentUrlIsUnchanged" />
10441044
</test>

0 commit comments

Comments
 (0)