magento
diff --git a/‎app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/ResetButton.php
Lines changed: 0 additions & 37 deletions b/‎app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/ResetButton.php
Lines changed: 0 additions & 37 deletions
diff --git a/‎app/code/Magento/PageBuilder/Model/Stage/Config.php
Lines changed: 0 additions & 2 deletions b/‎app/code/Magento/PageBuilder/Model/Stage/Config.php
Lines changed: 0 additions & 2 deletions
diff --git a/‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/AdvancedSliderItem.php
Lines changed: 6 additions & 2 deletions b/‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/AdvancedSliderItem.php
Lines changed: 6 additions & 2 deletions
diff --git a/‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/ButtonItem.php
Lines changed: 11 additions & 4 deletions b/‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/ButtonItem.php
Lines changed: 11 additions & 4 deletions
diff --git a/‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Driver.php
Lines changed: 18 additions & 7 deletions b/‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Driver.php
Lines changed: 18 additions & 7 deletions
diff --git a/‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
Lines changed: 22 additions & 0 deletions b/‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
Lines changed: 22 additions & 0 deletions
diff --git a/‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup.xml
Lines changed: 7 additions & 2 deletions b/‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup.xml
Lines changed: 7 additions & 2 deletions
diff --git a/‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup.xml
Lines changed: 15 additions & 0 deletions b/‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup.xml
Lines changed: 15 additions & 0 deletions
diff --git a/‎app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml
Lines changed: 0 additions & 3 deletions b/‎app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml
Lines changed: 0 additions & 3 deletions
diff --git a/‎app/code/Magento/PageBuilder/Test/Mftf/Data/ButtonItemData.xml
Lines changed: 0 additions & 3 deletions b/‎app/code/Magento/PageBuilder/Test/Mftf/Data/ButtonItemData.xml
Lines changed: 0 additions & 3 deletions
diff --git a/‎app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml
Lines changed: 8 additions & 0 deletions b/‎app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml
Lines changed: 8 additions & 0 deletions
diff --git a/‎app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml
Lines changed: 0 additions & 3 deletions b/‎app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml
Lines changed: 0 additions & 3 deletions
diff --git a/‎app/code/Magento/PageBuilder/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
Lines changed: 19 additions & 0 deletions b/‎app/code/Magento/PageBuilder/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
Lines changed: 19 additions & 0 deletions
diff --git a/‎app/code/Magento/PageBuilder/Test/Mftf/Section/CatalogSection.xml
Lines changed: 11 additions & 0 deletions b/‎app/code/Magento/PageBuilder/Test/Mftf/Section/CatalogSection.xml
Lines changed: 11 additions & 0 deletions
@@ -179,8 +179,6 @@ private function flattenContentTypeData(string $name, array $contentType)
             'label' => $contentType['label'],
             'icon' => $contentType['icon'],
             'form' => $contentType['form'],
-            'is_hideable' =>
-                isset($contentType['is_hideable']) && $contentType['is_hideable'] === 'false' ? false : true,
             'contentType' => '',
             'group' => $contentType['group'] ?? 'general',
             'fields' => $this->uiComponentConfig->getFields($contentType['form']),
 
@@ -120,7 +120,11 @@ public function render(array $itemData, array $additionalData = []) : string
         }
 
         // mobile wrapper div
-        $rootElementHtml = '<div' . $this->printAttributes($rootElementAttributes) . '><div data-element="link"';
+        $linkNodeName = isset($eavData['link_url']) ? 'a' : 'div';
+        $linkDataElementName = isset($eavData['link_url']) ? 'link' : 'empty_link';
+
+        $rootElementHtml = '<div' . $this->printAttributes($rootElementAttributes) . '>';
+        $rootElementHtml .= '<' . $linkNodeName . ' data-element="' . $linkDataElementName . '"';
         $rootElementHtml .= isset($eavData['link_url']) ? ' href="' . $eavData['link_url'] . '">' : '>';
         $rootElementHtml .= '<div'
             . $this->printAttributes($wrapperDivElementAttributes)
@@ -135,7 +139,7 @@ public function render(array $itemData, array $additionalData = []) : string
             . $buttonElementHtml
             . '</div></div></div>';
 
-        $rootElementHtml .= '</div></div>';
+        $rootElementHtml .= '</' . $linkNodeName . '></div>';
 
         return $rootElementHtml;
     }
 
@@ -26,6 +26,10 @@ class ButtonItem implements RendererInterface
      */
     private $eavAttributeLoader;
 
+    /**
+     * @param StyleExtractorInterface $styleExtractor
+     * @param EavAttributeLoaderInterface $eavAttributeLoader
+     */
     public function __construct(
         StyleExtractorInterface $styleExtractor,
         EavAttributeLoaderInterface $eavAttributeLoader
@@ -35,7 +39,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function render(array $itemData, array $additionalData = []) : string
     {
@@ -67,12 +71,15 @@ public function render(array $itemData, array $additionalData = []) : string
             $rootElementHtml .= $attributeValue ? " $attributeName=\"$attributeValue\"" : '';
         }
 
-        $rootElementHtml .= '><a data-element="link" href="'
-            . ($eavData['link_url'] ?? '') . '"'
+        $linkNodeName = isset($eavData['link_url']) ? 'a' : 'div';
+        $linkDataElementName = isset($eavData['link_url']) ? 'link' : 'empty_link';
+
+        $rootElementHtml .= '><' . $linkNodeName . ' data-element="' . $linkDataElementName . '"'
+            . (isset($eavData['link_url']) ? ' href="' . $eavData['link_url'] . '"' : '')
             . $buttonStyleAttribute
             . ' class="pagebuilder-button-primary"><span data-element="link_text">'
             . ($eavData['link_text'] ?? '')
-            . '</span></a></div>';
+            . '</span></' . $linkNodeName . '></div>';
 
         return $rootElementHtml;
     }
 
@@ -50,6 +50,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function render(array $itemData, array $additionalData = []) : string
     {
@@ -84,11 +85,19 @@ public function render(array $itemData, array $additionalData = []) : string
             }
         }
         $rootElementAttributes['style'] .= $margin;
-        $linkAttributes = [
-            'data-element' => 'link',
-            'href' => $eavData['link_url'] ?? '',
-            'target' => isset($eavData['target_blank']) && $eavData['target_blank'] ? '_blank' : '',
-        ];
+
+        // if link_url is present, add href and target attribute
+        if (isset($eavData['link_url'])) {
+            $linkAttributes = [
+                'data-element' => 'link',
+                'href' => $eavData['link_url'],
+                'target' => isset($eavData['target_blank']) && $eavData['target_blank'] ? '_blank' : '',
+            ];
+        } else {
+            $linkAttributes = [
+                'data-element' => 'empty_link',
+            ];
+        }
 
         $imageAttributes = [
             'data-element' => 'wrapper',
@@ -120,9 +129,11 @@ public function render(array $itemData, array $additionalData = []) : string
                 . '</button>';
         }
 
+        $linkNodeName = isset($eavData['link_url']) ? 'a' : 'div';
+
         return '<div'
             . $this->printAttributes($rootElementAttributes)
-            . '><div'
+            . '><' . $linkNodeName
             . $this->printAttributes($linkAttributes)
             . '>'
             . $imageElementHtml
@@ -133,7 +144,7 @@ public function render(array $itemData, array $additionalData = []) : string
             . $overlayElementHtml
             . '<div class="pagebuilder-poster-content"><div data-element="content"></div>'
             . $buttonHtml
-            . '</div></div></div></div></div>';
+            . '</div></div></div></' . $linkNodeName . '></div>';
     }
 
     /**
 
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <!-- Consider moving action group to core, or utilising core action group if one is added at a later date -->
+    <actionGroup name="addUpSellProductBySku" extends="addRelatedProductBySku">
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddUpSellProductsButton}}" stepKey="clickAddRelatedProductButton"/>
+        <conditionalClick selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminAddUpSellProductsModalSection.Modal}}{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectProduct"/>
+        <click selector="{{AdminAddUpSellProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+    </actionGroup>
+</actionGroups>
@@ -83,16 +83,21 @@
         <arguments>
             <argument name="contentType"/>
             <argument name="targetIndex" defaultValue="1" type="string"/>
-            <argument name="expectedIndex" defaultValue="2" type="string"/>
             <argument name="contentTypeXCoordinate" defaultValue="null" type="string"/>
             <argument name="contentTypeYCoordinate" defaultValue="null" type="string"/>
         </arguments>
+        <waitForElement selector="{{PageBuilderStage.contentTypeTotalInStage(contentType.role)}}" stepKey="waitForAllContentTypes"/>
+        <executeJS function="return document.querySelectorAll('{{PageBuilderStage.contentTypeTotalInStage(contentType.role)}}').length+1" stepKey="expectedContentTypeCount"/>
         <waitForElementVisible selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, targetIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
         <moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, targetIndex)}}" x="{{contentTypeXCoordinate}}" y="{{contentTypeYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
         <waitForElementVisible selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex(contentType.role, targetIndex)}}" stepKey="waitForOptionsMenu"/>
         <click selector="{{PageBuilderContentTypeOptionsMenu.contentTypeDuplicate(contentType.role, targetIndex)}}" stepKey="clickDuplicateContentType"/>
         <waitForPageLoad time="30" stepKey="waitForAnimation"/>
-        <waitForElementVisible selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, expectedIndex)}}" stepKey="waitForDuplicateContentType"/>
+        <executeJS function="return document.querySelectorAll('{{PageBuilderStage.contentTypeTotalInStage(contentType.role)}}').length" stepKey="resultingContentTypeCount"/>
+        <assertEquals stepKey="assertContentTypeCount">
+            <actualResult type="variable">$resultingContentTypeCount</actualResult>
+            <expectedResult type="variable">$expectedContentTypeCount</expectedResult>
+        </assertEquals>
     </actionGroup>
     <actionGroup name="duplicateSmallContentType">
         <arguments>
 
@@ -161,4 +161,19 @@
             <actualResult type="variable">textareaValue</actualResult>
         </assertEquals>
     </actionGroup>
+    <actionGroup name="validateContentWordHeight">
+        <arguments>
+            <argument name="page"/>
+            <argument name="height" type="string"/>
+            <argument name="index" defaultValue="1" type="string"/>
+        </arguments>
+        <!-- Validate content height -->
+        <comment userInput="Validate content height" stepKey="commentValidateContentHeight"/>
+        <executeJS function="return {{page.contentJS(index)}}.getBoundingClientRect().height" stepKey="elementContentHeight"/>
+        <executeJS function="return Math.round(({$elementContentHeight}/{{height}})*100)/100" stepKey="contentHeightRatio"/>
+        <assertEquals stepKey="assertContentHeightRatio">
+            <expectedResult type="int">1</expectedResult>
+            <actualResult type="variable">contentHeightRatio</actualResult>
+        </assertEquals>
+    </actionGroup>
 </actionGroups>
@@ -88,9 +88,6 @@
         <data key="fieldName">link_url</data>
         <data key="value"/>
     </entity>
-    <entity name="PageBuilderBannerLinkUrlProperty_EmptyFrontend" type="pagebuilder_banner_linkUrl_property">
-        <data key="value">javascript:void(0)</data>
-    </entity>
     <entity name="PageBuilderBannerLinkUrlPropertyValidate" type="pagebuilder_banner_linkUrl_property">
         <data key="name">Link</data>
         <data key="section">contents</data>
 
@@ -86,9 +86,6 @@
     <entity name="PageBuilderButtonItemLink_Empty" type="pagebuilder_button_item_link_property" extends="PageBuilderButtonItemLink_Template">
         <data key="value"/>
     </entity>
-    <entity name="PageBuilderButtonItemLink_EmptyFrontend" type="pagebuilder_button_item_link_property" extends="PageBuilderButtonItemLink_Template">
-        <data key="value">javascript:void(0)</data>
-    </entity>
     <entity name="PageBuilderButtonItemLink_NotSecure" type="pagebuilder_button_item_link_property" extends="PageBuilderButtonItemLink_Template">
         <data key="value">http://url.magento/</data>
     </entity>
 
@@ -113,4 +113,12 @@
         <data key="name">Box Shadow</data>
         <data key="value">rgb(153, 153, 153) 0px 0px 0px 1px</data>
     </entity>
+    <!-- Message -->
+    <entity name="PageBuilderMessageProperty_WordBreak" type="pagebuilder_message_property">
+        <data key="name">Message Text</data>
+        <data key="section">contents</data>
+        <data key="role">textarea</data>
+        <data key="fieldName">message</data>
+        <data key="value">Magento1111111 Page11111111111</data>
+    </entity>
 </entities>
@@ -54,9 +54,6 @@
         <data key="fieldName">link_url</data>
         <data key="value"/>
     </entity>
-    <entity name="PageBuilderSlideItemLinkURL_EmptyFrontend" type="pagebuilder_slide_item_link_url_property">
-        <data key="value">javascript:void(0)</data>
-    </entity>
     <entity name="PageBuilderSlideItemLinkURL_External" type="pagebuilder_slide_item_link_url_property">
         <data key="name">Link</data>
         <data key="section">general</data>
 
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <!-- Consider moving to core, when up-sell tests are implemented -->
+    <section name="AdminProductFormRelatedUpSellCrossSellSection">
+        <element name="AddUpSellProductsButton" type="button" selector="button[data-index='button_upsell']" timeout="30"/>
+    </section>
+    <section name="AdminAddUpSellProductsModalSection">
+        <element name="Modal" type="button" selector=".product_form_product_form_related_upsell_modal"/>
+        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'product_form_product_form_related_upsell_modal')]//button/span[contains(text(), 'Add Selected Products')]" timeout="30"/>
+    </section>
+</sections>
@@ -11,4 +11,15 @@
     <section name="PageBuilderCatalog">
         <element name="openPageBuilder" type="button" selector="[data-index='description'] button.action-default"/>
     </section>
+    <section name="StorefrontProductFullWidth">
+        <element name="description" type="button" selector=".page-main-description"/>
+        <element name="attributes" type="button" selector=".page-main-pagebuilder-attributes"/>
+        <element name="moreInformation" type="button" selector=".additional-attributes-wrapper"/>
+        <!-- Consider moving the below to core -->
+        <element name="infoMain" type="button" selector=".product-info-main"/>
+        <element name="media" type="button" selector=".product.media"/>
+        <element name="reviews" type="button" selector=".block.review-add"/>
+        <element name="related" type="button" selector=".block.related"/>
+        <element name="upsell" type="button" selector=".block.upsell"/>
+    </section>
 </sections>