MC-2373: Update existing MFTF Tests

- Add description ID to new description wrapper, the tabs would add this ID automatically
- Ensure defaults in layouts are updated when Page Builder is installed within test suite
- Check for the new PB defaults

Author: davemacaulay

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

@@ -0,0 +1,21 @@
+<?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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/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>
+</actionGroups>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="PageBuilderFullWidthLayout" type="pagebuild_full_width_layout">
+        <data key="cms">CMS - Full Width</data>
+        <data key="category">Category - Full Width</data>
+        <data key="product">Product - Full Width</data>
+    </entity>
+</entities>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest">
+        <!-- PageBuilder is enabled so check default is full width -->
+        <comment userInput="PageBuilder is enabled so check default is full width" stepKey="commentSeeCategoryFullWidth" before="seeNoLayoutUpdatesSelected" />
+        <seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="{{PageBuilderFullWidthLayout.category}}" stepKey="seeNoLayoutUpdatesSelected" />
+    </test>
+</tests>

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

@@ -16,4 +16,11 @@
             <actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder" before="amOnLogoutPage"/>
         </after>
     </test>
+    <test name="AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest">
+        <!-- PageBuilder is enabled so check default is full width -->
+        <comment userInput="PageBuilder is enabled so check default is full width" stepKey="commentSeeFullWidth" />
+        <seeOptionIsSelected selector="{{DefaultLayoutsSection.pageLayout}}" userInput="{{PageBuilderFullWidthLayout.cms}}" stepKey="seeOneColumnSelected" />
+        <seeOptionIsSelected selector="{{DefaultLayoutsSection.productLayout}}" userInput="{{PageBuilderFullWidthLayout.product}}" stepKey="seeNoLayoutUpdatesSelected1" />
+        <seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="{{PageBuilderFullWidthLayout.category}}" stepKey="seeNoLayoutUpdatesSelected2" />
+    </test>
 </tests>

app/code/Magento/PageBuilder/view/frontend/page_layout/product-full-width.xml

@@ -16,7 +16,7 @@
             </container>
         </container>
         <!-- Create wrapper for description without page-main class which adds gutters -->
-        <container name="product.info.description.wrapper" after="main.content" before="product.info.details.wrapper" htmlTag="div" htmlClass="page-main-description"/>
+        <container name="product.info.description.wrapper" after="main.content" before="product.info.details.wrapper" htmlTag="div" htmlClass="page-main-description" htmlId="description"/>
     </referenceContainer>
 
     <!-- Move details & description into their new wrappers -->