MC-3329: Add Missing P0-P1 MFTF Tests For PageBuilder On Catalog Product (Description, Short Description, Attribute)

 - Removing unused MFTF items
 - Leaving comments for all MFTF items that need to move repos

Author: dhaecker

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup.xml

@@ -10,7 +10,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="navigateToAPageWithPageBuilder">
         <waitForPageLoad stepKey="waitForDashboardPageLoad"/>
-        <amOnPage url="{{PageBuilderCmsPage.url}}" stepKey="amOnPageBuilderPage"/>
+        <amOnPage url="{{CmsPagesPage.url}}/new" stepKey="amOnPageBuilderPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
     <actionGroup name="addPageBuilderPageTitle">

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminProductActionGroup.xml

@@ -7,8 +7,8 @@
 -->
 <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">
+        <!-- This goes in CE repo -->
         <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"/>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CmsBlockActionGroup.xml

@@ -8,6 +8,16 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="RestoreLayoutSetting">
+        <!-- Remove the existing layout update entries, as they can be merged in the wrong order -->
+        <remove keyForRemoval="selectOneColumn"/>
+        <remove keyForRemoval="selectNoLayoutUpdates1"/>
+        <remove keyForRemoval="selectNoLayoutUpdates2"/>
+        <!-- Set the defaults to those now set by Page Builder -->
+        <selectOption selector="{{DefaultLayoutsSection.pageLayout}}" userInput="{{PageBuilderFullWidthLayout.cms}}" stepKey="selectCmsFullWidth" after="expandDefaultLayouts"/>
+        <selectOption selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="{{PageBuilderFullWidthLayout.category}}" stepKey="selectCategoryFullWidth" after="expandDefaultLayouts"/>
+        <selectOption selector="{{DefaultLayoutsSection.productLayout}}" userInput="{{PageBuilderFullWidthLayout.product}}" stepKey="selectProductFullWidth" after="expandDefaultLayouts"/>
+    </actionGroup>
     <actionGroup name="validateLayoutStylesNoHeight">
         <arguments>
             <argument name="page"/>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDynamicBlockActionGroup.xml

@@ -9,16 +9,19 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="navigateToAdminContentManagementPage">
+        <!-- This goes in CE repo -->
         <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
     </actionGroup>
     <actionGroup name="saveStoreConfiguration">
+        <!-- This goes in CE repo -->
         <comment userInput="saveStoreConfiguration" stepKey="comment"/>
         <waitForElementVisible selector="{{StoreConfigSection.Save}}" stepKey="waitForSaveButton"/>
         <click selector="{{StoreConfigSection.Save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
     <actionGroup name="saveStoreConfigurationAndValidateFieldError">
+        <!-- This goes in CE repo -->
         <arguments>
             <argument name="inputFieldError" type="string"/>
             <argument name="errorMessageSelector" type="string"/>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup.xml

@@ -8,29 +8,7 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="productAttributePageBuilder" type="ProductAttribute">
-        <data key="attribute_code" unique="suffix">attribute</data>
-        <data key="frontend_input">pagebuilder</data>
-        <data key="scope">global</data>
-        <data key="is_required">false</data>
-        <data key="is_unique">false</data>
-        <data key="is_searchable">true</data>
-        <data key="is_visible">true</data>
-        <data key="backend_type">text</data>
-        <data key="is_wysiwyg_enabled">true</data>
-        <data key="is_visible_in_advanced_search">true</data>
-        <data key="is_visible_on_front">true</data>
-        <data key="is_filterable">true</data>
-        <data key="is_filterable_in_search">true</data>
-        <data key="used_in_product_listing">true</data>
-        <data key="is_used_for_promo_rules">true</data>
-        <data key="is_comparable">true</data>
-        <data key="is_used_in_grid">true</data>
-        <data key="is_visible_in_grid">true</data>
-        <data key="is_filterable_in_grid">true</data>
-        <data key="used_for_sort_by">true</data>
-        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
-    </entity>
+    <!-- This goes in CE repo -->
     <entity name="productAttributeText" type="ProductAttribute">
         <data key="attribute_code" unique="suffix">attribute</data>
         <data key="frontend_input">text</data>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/RestoreLayoutSettingActionGroup.xml

@@ -8,6 +8,7 @@
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- This goes in CE repo -->
     <entity name="AddToDefaultSetSortOrder1" type="ProductAttributeSet">
         <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
         <data key="attributeSetId">4</data>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup.xml

@@ -8,11 +8,12 @@
 
 <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">
+        <!-- This goes in CE repo -->
         <element name="AddUpSellProductsButton" type="button" selector="button[data-index='button_upsell']" timeout="30"/>
     </section>
     <section name="AdminAddUpSellProductsModalSection">
+        <!-- This goes in CE repo -->
         <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>

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

@@ -15,7 +15,7 @@
         <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 -->
+        <!-- This goes in CE repo -->
         <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"/>

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

@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ContentManagementSection">
+        <!-- This goes in CE repo (StoreConfigurationPageSuccessMessage) -->
         <element name="StoreConfigurationPageSuccessMessage" type="text" selector="#messages [data-ui-id='messages-message-success']"/>
         <element name="PageBuilderOptions" type="button" selector="#cms_pagebuilder-head"/>
         <element name="CheckIfPageBuilderTabExpanded" type="button" selector="#cms_pagebuilder-head:not(.open)"/>