Skip to content

Commit a9e2b84

Browse files
committed
MC-2305: Mainline MFTF Failure with magento.com Re-direct
- Change URL values to fake URLs that are guaranteed not to redirect in the future
1 parent ba3a657 commit a9e2b84

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,13 @@
6363
<data key="name">Link</data>
6464
<data key="section">contents</data>
6565
<data key="fieldName">link_url</data>
66-
<data key="value">http://www.magento.com/</data>
67-
<data key="_value">http://magento.com/</data>
66+
<data key="value">http://url.magento/</data>
6867
</entity>
6968
<entity name="PageBuilderBannerLinkUrlPropertyValidate" type="pagebuilder_banner_linkUrl_property">
7069
<data key="name">Link</data>
7170
<data key="section">contents</data>
7271
<data key="fieldName">link_url[default]</data>
73-
<data key="value">http://www.magento.com/</data>
72+
<data key="value">http://url.magento/</data>
7473
</entity>
7574
<entity name="PageBuilderBannerLink_Anchor" type="pagebuilder_banner_linkUrl_property">
7675
<data key="name">Link</data>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,13 @@
105105
<data key="name">Button Link</data>
106106
<data key="section">content</data>
107107
<data key="fieldName">button_link</data>
108-
<data key="value">http://www.magento.com/</data>
109-
<data key="_value">http://magento.com/</data>
108+
<data key="value">http://url.magento/</data>
110109
</entity>
111110
<entity name="PageBuilderButtonItemLink_Secure" type="pagebuilder_button_item_link_property">
112111
<data key="name">Button Link</data>
113112
<data key="section">content</data>
114113
<data key="fieldName">button_link</data>
115-
<data key="value">https://www.magento.com/</data>
116-
<data key="_value">https://magento.com/</data>
114+
<data key="value">https://url.magento/</data>
117115
</entity>
118116
<entity name="PageBuilderButtonItemOpenInNewTab_True" type="pagebuilder_button_item_link_property">
119117
<data key="name">Open in new tab</data>

app/code/Magento/PageBuilder/Test/Mftf/Data/ImageData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<data key="name">Link</data>
7878
<data key="section">general</data>
7979
<data key="fieldName">link_url</data>
80-
<data key="value">https://www.magento.com</data>
80+
<data key="value">https://url.magento</data>
8181
</entity>
8282
<entity name="PageBuilderImageNewTab_True" type="pagebuilder_image_link_property">
8383
<data key="name">Open in new tab</data>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,13 @@
137137
<data key="name">Link</data>
138138
<data key="section">general</data>
139139
<data key="fieldName">link_url</data>
140-
<data key="value">http://www.magento.com/</data>
140+
<data key="value">http://url.magento/</data>
141141
</entity>
142142
<entity name="PageBuilderSlideLinkExternalUrlPropertyValidate" type="pagebuilder_Slide_linkUrl_property">
143143
<data key="name">Link URL</data>
144144
<data key="section">general</data>
145145
<data key="fieldName">link_url[default]</data>
146-
<data key="value">http://www.magento.com/</data>
146+
<data key="value">http://url.magento/</data>
147147
</entity>
148148
<entity name="PageBuilderSlideShowButtonAlwaysProperty" type="pagebuilder_slide_property">
149149
<data key="name">Show Button</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderURLInputTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,9 @@
5454
<click selector=".pagebuilder-button-primary" stepKey="clickButton"/>
5555
<grabFromCurrentUrl stepKey="grabFromCurrentUrl1"/>
5656
<assertEquals stepKey="assertEquals1" message="pass">
57-
<expectedResult type="string">{{PageBuilderButtonItemLink_Secure._value}}</expectedResult>
57+
<expectedResult type="string">{{PageBuilderButtonItemLink_NotSecure.value}}</expectedResult>
5858
<actualResult type="variable">grabFromCurrentUrl1</actualResult>
5959
</assertEquals>
60-
<waitForPageLoad stepKey="waitForPageLoad2" />
6160

6261
<!--Go to admin to edit Secure External Link-->
6362
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage2">
@@ -82,7 +81,7 @@
8281
<switchToNextTab stepKey="switchToNextTab"/>
8382
<grabFromCurrentUrl stepKey="grabFromCurrentUrl2"/>
8483
<assertEquals stepKey="assertEquals2" message="pass">
85-
<expectedResult type="string">{{PageBuilderButtonItemLink_Secure._value}}</expectedResult>
84+
<expectedResult type="string">{{PageBuilderButtonItemLink_Secure.value}}</expectedResult>
8685
<actualResult type="variable">grabFromCurrentUrl2</actualResult>
8786
</assertEquals>
8887
</test>

0 commit comments

Comments
 (0)