MC-2374: Create MFTF Tests

 - updated merge tests with new Zephyr IDs
 - improve click steps

Author: Cari Spruiell

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

@@ -77,7 +77,7 @@
             <argument name="layoutOption"/>
         </arguments>
         <waitForElementVisible selector="{{designSection.DesignTab}}" stepKey="waitForDesignTabVisible"/>
-        <conditionalClick selector="{{designSection.DesignTab}}" dependentSelector="{{designSection.DesignTab}}/parent::strong/parent::*[@data-state-collapsible='closed']" visible="true" stepKey="clickOnDesignTab"/>
+        <conditionalClick selector="{{designSection.DesignTab}}" dependentSelector="{{designSection.LayoutDropdown}}" visible="false" stepKey="clickOnDesignTab"/>
         <waitForPageLoad stepKey="waitForPageLoadDesignTab"/>
         <waitForElementVisible selector="{{designSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
         <selectOption selector="{{designSection.LayoutDropdown}}" userInput="{{layoutOption}}" stepKey="selectLayout"/>

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

@@ -12,6 +12,7 @@
         <annotations>
             <description value="Admin should be able to configure the default layout for Category Page from System Configuration, verify the default is updated to the Page Builder's default layout"/>
             <useCaseId value="MC-936"/>
+            <testCaseId value="MC-3105"/>
             <group value="pagebuilder"/>
         </annotations>
         <!-- PageBuilder is enabled so check default is full width -->
@@ -41,7 +42,7 @@
         </after>
         <!-- Add PageBuilder description -->
         <comment userInput="Add PageBuilder description" stepKey="commentAddDescription"/>
-        <click selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="openContentSection"/>
+        <conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{PageBuilderCatalog.openPageBuilder}}" visible="false" stepKey="openContentSection"/>
         <waitForPageLoad stepKey="waitForPageLoadContentSection"/>
         <waitForElementVisible selector="{{PageBuilderCatalog.openPageBuilder}}" stepKey="waitForPageBuilderBtn" />
         <see userInput="Edit with Page Builder" stepKey="seePageBuilderBtn"/>

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

@@ -20,6 +20,7 @@
         <annotations>
             <description value="Admin should be able to configure the default layout for CMS Page from System Configuration using Page Builder's full width layouts"/>
             <useCaseId value="MC-936"/>
+            <testCaseId value="MC-3106"/>
             <group value="pagebuilder"/>
         </annotations>
         <!-- PageBuilder is enabled so check default is full width -->