Merge remote-tracking branch 'mainline/develop' into MC-401-remove-advanced-attributes

Author: krissyhiserote

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

@@ -63,14 +63,13 @@
         <data key="name">Link</data>
         <data key="section">contents</data>
         <data key="fieldName">link_url</data>
-        <data key="value">http://www.magento.com/</data>
-        <data key="_value">http://magento.com/</data>
+        <data key="value">http://url.magento/</data>
     </entity>
     <entity name="PageBuilderBannerLinkUrlPropertyValidate" type="pagebuilder_banner_linkUrl_property">
         <data key="name">Link</data>
         <data key="section">contents</data>
         <data key="fieldName">link_url[default]</data>
-        <data key="value">http://www.magento.com/</data>
+        <data key="value">http://url.magento/</data>
     </entity>
     <entity name="PageBuilderBannerLink_Anchor" type="pagebuilder_banner_linkUrl_property">
         <data key="name">Link</data>

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

@@ -105,15 +105,13 @@
         <data key="name">Button Link</data>
         <data key="section">content</data>
         <data key="fieldName">button_link</data>
-        <data key="value">http://www.magento.com/</data>
-        <data key="_value">http://magento.com/</data>
+        <data key="value">http://url.magento/</data>
     </entity>
     <entity name="PageBuilderButtonItemLink_Secure" type="pagebuilder_button_item_link_property">
         <data key="name">Button Link</data>
         <data key="section">content</data>
         <data key="fieldName">button_link</data>
-        <data key="value">https://www.magento.com/</data>
-        <data key="_value">https://magento.com/</data>
+        <data key="value">https://url.magento/</data>
     </entity>
     <entity name="PageBuilderButtonItemOpenInNewTab_True" type="pagebuilder_button_item_link_property">
         <data key="name">Open in new tab</data>

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

@@ -77,7 +77,7 @@
         <data key="name">Link</data>
         <data key="section">general</data>
         <data key="fieldName">link_url</data>
-        <data key="value">https://www.magento.com</data>
+        <data key="value">https://url.magento</data>
     </entity>
     <entity name="PageBuilderImageNewTab_True" type="pagebuilder_image_link_property">
         <data key="name">Open in new tab</data>

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

@@ -137,13 +137,13 @@
         <data key="name">Link</data>
         <data key="section">general</data>
         <data key="fieldName">link_url</data>
-        <data key="value">http://www.magento.com/</data>
+        <data key="value">http://url.magento/</data>
     </entity>
     <entity name="PageBuilderSlideLinkExternalUrlPropertyValidate" type="pagebuilder_Slide_linkUrl_property">
         <data key="name">Link URL</data>
         <data key="section">general</data>
         <data key="fieldName">link_url[default]</data>
-        <data key="value">http://www.magento.com/</data>
+        <data key="value">http://url.magento/</data>
     </entity>
     <entity name="PageBuilderSlideShowButtonAlwaysProperty" type="pagebuilder_slide_property">
         <data key="name">Show Button</data>

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

@@ -54,10 +54,9 @@
         <click selector=".pagebuilder-button-primary" stepKey="clickButton"/>
         <grabFromCurrentUrl stepKey="grabFromCurrentUrl1"/>
         <assertEquals stepKey="assertEquals1" message="pass">
-            <expectedResult type="string">{{PageBuilderButtonItemLink_Secure._value}}</expectedResult>
+            <expectedResult type="string">{{PageBuilderButtonItemLink_NotSecure.value}}</expectedResult>
             <actualResult type="variable">grabFromCurrentUrl1</actualResult>
         </assertEquals>
-        <waitForPageLoad stepKey="waitForPageLoad2" />
 
         <!--Go to admin to edit Secure External Link-->
         <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage2">
@@ -82,7 +81,7 @@
         <switchToNextTab stepKey="switchToNextTab"/>
         <grabFromCurrentUrl stepKey="grabFromCurrentUrl2"/>
         <assertEquals stepKey="assertEquals2" message="pass">
-            <expectedResult type="string">{{PageBuilderButtonItemLink_Secure._value}}</expectedResult>
+            <expectedResult type="string">{{PageBuilderButtonItemLink_Secure.value}}</expectedResult>
             <actualResult type="variable">grabFromCurrentUrl2</actualResult>
         </assertEquals>
     </test>