Skip to content

Commit d424d7d

Browse files
danmooney2danmooney2
committed
MC-3865: Content Types With Links Redirect On Storefront If Link Is Empty
Revert back using EmptyFrontend data entities
1 parent cc95328 commit d424d7d

8 files changed

+25
-14
lines changed

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

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

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

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

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,8 +1022,8 @@
10221022
</actionGroup>
10231023
<!-- Validate Storefront -->
10241024
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1025-
<seeElement selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty_Empty.frontendValue)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1026-
<click selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty_Empty.frontendValue)}}" stepKey="clickLinkUrl"/>
1025+
<seeElement selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty_EmptyFrontend.value)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1026+
<click selector="{{BannerOnFrontend.linkUrl('1', PageBuilderBannerLinkUrlProperty_EmptyFrontend.value)}}" 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/AdminPageBuilderButtonGroupTests.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,7 @@
379379
<actionGroup ref="validateButtonItemContent" stepKey="validateButton1Storefront2">
380380
<argument name="page" value="ButtonItemOnStorefront"/>
381381
<argument name="text" value="PageBuilderButtonItemText_Second"/>
382+
<argument name="url" value="PageBuilderButtonItemLink_EmptyFrontend"/>
382383
<argument name="index" value="4"/>
383384
</actionGroup>
384385
</test>

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

Lines changed: 8 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.frontendValue)}}" 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">
@@ -159,6 +159,7 @@
159159
<actionGroup ref="validateButtonItemContent" stepKey="validateStorefront">
160160
<argument name="page" value="ButtonItemOnStorefront"/>
161161
<argument name="text" value="PageBuilderButtonItemText_OneCharacter"/>
162+
<argument name="url" value="PageBuilderButtonItemLink_EmptyFrontend"/>
162163
</actionGroup>
163164
</test>
164165
<test name="ButtonItemCommonCharactersButtonText">
@@ -235,6 +236,7 @@
235236
<actionGroup ref="validateButtonItemContent" stepKey="validateStorefront">
236237
<argument name="page" value="ButtonItemOnStorefront"/>
237238
<argument name="text" value="PageBuilderButtonItemText_CommonCharacters"/>
239+
<argument name="url" value="PageBuilderButtonItemLink_EmptyFrontend"/>
238240
</actionGroup>
239241
</test>
240242
<test name="ButtonItemSpecialCharactersButtonText">
@@ -312,6 +314,7 @@
312314
<actionGroup ref="validateButtonItemContent" stepKey="validateStorefront">
313315
<argument name="page" value="ButtonItemOnStorefront"/>
314316
<argument name="text" value="PageBuilderButtonItemText_SpecialCharacters"/>
317+
<argument name="url" value="PageBuilderButtonItemLink_EmptyFrontend"/>
315318
</actionGroup>
316319
</test>
317320
<test name="ButtonItemLongButtonText">
@@ -400,6 +403,7 @@
400403
<actionGroup ref="validateButtonItemContent" stepKey="validateStorefront">
401404
<argument name="page" value="ButtonItemOnStorefront"/>
402405
<argument name="text" value="PageBuilderButtonItemText_200Characters"/>
406+
<argument name="url" value="PageBuilderButtonItemLink_EmptyFrontend"/>
403407
</actionGroup>
404408
<!-- Get Width Of Button on Store Front -->
405409
<executeJS function="return Math.round({{ButtonItemOnStorefront.jsButtonSelector('1')}}.clientWidth)" stepKey="buttonWidthStoreFront"/>
@@ -488,7 +492,7 @@
488492
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
489493
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
490494
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="waitForButtonTypeStorefront"/>
491-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" stepKey="waitForButtonUrlStorefront"/>
495+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
492496
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemNewTab('1', PageBuilderButtonItemOpenInNewTab_False.stageValue)}}" stepKey="waitForButtonNewTabStorefront"/>
493497
</test>
494498
<test name="ButtonItemSecondaryButtonType">
@@ -565,7 +569,7 @@
565569
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
566570
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
567571
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Secondary.value)}}" stepKey="waitForButtonTypeStorefront"/>
568-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" stepKey="waitForButtonUrlStorefront"/>
572+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
569573
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemNewTab('1', PageBuilderButtonItemOpenInNewTab_False.stageValue)}}" stepKey="waitForButtonNewTabStorefront"/>
570574
</test>
571575
<test name="ButtonItemLinkButtonType">
@@ -642,7 +646,7 @@
642646
<waitForElementVisible selector="{{ButtonItemOnStorefront.base('1')}}" stepKey="waitForButtonElementStorefront"/>
643647
<waitForElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Empty.value)}}" stepKey="waitForButtonTextStorefront"/>
644648
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Link.value)}}" stepKey="waitForButtonTypeStorefront"/>
645-
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" stepKey="waitForButtonUrlStorefront"/>
649+
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="waitForButtonUrlStorefront"/>
646650
<waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemNewTab('1', PageBuilderButtonItemOpenInNewTab_False.stageValue)}}" stepKey="waitForButtonNewTabStorefront"/>
647651
</test>
648652
</tests>

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

Lines changed: 3 additions & 3 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_Empty.frontendValue)}}" 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>
973973
<test name="ButtonItemEmptyLinkURLDoesNothingOnStorefront">
@@ -1020,8 +1020,8 @@
10201020
</actionGroup>
10211021
<!-- Validate Storefront -->
10221022
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1023-
<seeElement selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1024-
<click selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_Empty.frontendValue)}}" stepKey="clickLinkUrl" />
1023+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1024+
<click selector="{{ButtonItemOnStorefront.buttonItemUrl('1', PageBuilderButtonItemLink_EmptyFrontend.value)}}" stepKey="clickLinkUrl" />
10251025
<wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccur" />
10261026
<seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}{{PageBuilderButtonItemContentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="seeThatCurrentUrlIsUnchanged" />
10271027
</test>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,8 +1037,8 @@
10371037
</actionGroup>
10381038
<!-- Validate Storefront -->
10391039
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1040-
<seeElementInDOM selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_Empty.frontendValue)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1041-
<click selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_Empty.frontendValue)}}" stepKey="clickLinkUrl"/>
1040+
<seeElementInDOM selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_EmptyFrontend.value)}}" stepKey="seeJavaScriptVoid0UrlInDom"/>
1041+
<click selector="{{SlideOnFrontend.linkUrl('1', PageBuilderSlideItemLinkURL_EmptyFrontend.value)}}" 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)