#514: User sees content snapshot on Category Page in Admin Panel - PageBuilderContentSnapshotFullScreenTest, Category Page mftf refactoring.

Author: artKozynets

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminOpenPageBuilderFromContentPreviewOverlayActionGroup.xml

@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="adminOpenPageBuilderFromContentPreviewOverlay">
+    <actionGroup name="AdminOpenPageBuilderFromContentPreviewOverlay">
         <annotations>
             <description>Verifies Page Builder Full Screen is ready.</description>
         </annotations>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidatePageBuilderPreviewActionGroup.xml

@@ -7,19 +7,21 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="validatePageBuilderPreview">
+    <actionGroup name="ValidatePageBuilderPreview">
         <annotations>
             <description>Verifies Page Builder preview is ready.</description>
         </annotations>
         <arguments>
             <argument name="pageBuilderArea" defaultValue="" type="string"/>
         </arguments>
-        <waitForElementVisible selector="{{PageBuilderStage.editWithPageBuilderButton}}" stepKey="waitForEditWithPageBuilderButton"/>
+        <waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.editWithPageBuilderButton}}" stepKey="waitForEditWithPageBuilderButton"/>
+        <see userInput="Edit with Page Builder" selector="{{pageBuilderArea}}{{PageBuilderStage.editWithPageBuilderButton}}" stepKey="seeEditWithPageBuilderButton"/>
         <dontSeeElementInDOM selector="{{PageBuilderPanel.leftPanel}}" stepKey="dontSeePageBuilderContentTypePanel"/>
         <dontSeeElementInDOM selector="{{pageBuilderArea}}{{PageBuilderStage.applyTemplateButton}}" stepKey="dontSeePageBuilderApplyTemplateButton"/>
         <dontSeeElementInDOM selector="{{pageBuilderArea}}{{PageBuilderStage.saveAsTemplateButton}}" stepKey="dontSeePageBuilderSaveAsTemplateButton"/>
         <waitForElementVisible selector="{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
         <moveMouseOver selector="{{PageBuilderStage.stageOverlay}}" stepKey="mouseOverStageOverlay"/>
         <waitForElementVisible selector="{{PageBuilderStage.stageOverlayOnHover}}" stepKey="waitForStageOverlayOnHover"/>
+        <dontSeeElement selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderRowContentType.role)}}" stepKey="dontSeeRowOptionMenu"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml

@@ -8,11 +8,10 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="PageBuilderStage">
-        <element name="pageBuilderArea" type="text" selector="//div[@data-index='{{var1}}']" parameterized="true"/>
         <element name="imageSource" type="text" selector="//img[contains(@src,'{{var1}}')]" parameterized="true"/>
         <element name="applyTemplateButton" type="button" selector="//button[contains(@data-bind,'toggleTemplateManger') and text()='Apply Template']"/>
         <element name="saveAsTemplateButton" type="button" selector="//button[contains(@data-bind,'saveAsTemplate') and text()='Save as Template']"/>
-        <element name="editWithPageBuilderButton" type="button" selector="button.action-default"/>
+        <element name="editWithPageBuilderButton" type="button" selector="//button[contains(@data-bind,'pageBuilderEditButtonClick')]"/>
         <element name="openFullScreen" type="button" selector="//i[@class='icon-pagebuilder-fullscreen']"/>
         <element name="exitFullScreen" type="button" selector=".pagebuilder-header .icon-pagebuilder-fullscreen-exit"/>
         <element name="stageLoading" type="button" selector="div.pagebuilder-stage-loading"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogCategoryContentSnapshotTest.xml

@@ -31,13 +31,11 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Verify Page Builder preview is ready -->
-        <actionGroup ref="validatePageBuilderPreview" stepKey="verifyPageBuilderPreview">
-            <argument name="pageBuilderArea" value="{{PageBuilderStage.pageBuilderArea('description')}}"/>
-        </actionGroup>
+        <actionGroup ref="ValidatePageBuilderPreview" stepKey="verifyPageBuilderPreview"/>
         <!-- Verify Empty Row -->
         <actionGroup ref="verifyEmptyStage" stepKey="verifyStageEmptyRow"/>
         <!-- Verify Page Builder Full Screen -->
-        <actionGroup ref="adminOpenPageBuilderFromContentPreviewOverlay" stepKey="verifyPageBuilderFullScreen"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlay" stepKey="verifyPageBuilderFullScreen"/>
         <!-- Verify Empty Row -->
         <actionGroup ref="verifyEmptyStage" stepKey="verifyFullScreenEmptyRow"/>
         <!-- Add Button to Row -->
@@ -47,18 +45,18 @@
         <actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
             <argument name="contentType" value="PageBuilderButtonsContentType"/>
         </actionGroup>
+        <actionGroup ref="inlineEditButton" stepKey="inlineEditButton">
+            <argument name="text" value="PageBuilderButtonItemText_OneCharacter"/>
+        </actionGroup>
         <!-- Exit full screen -->
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitFullScreen"/>
-<!-- Verify PageBuilder Button Content Type is on Stage -->
-<!-- ERROR -->
-<waitForElementVisible selector="{{ButtonItemOnStage.emptyButtonItemElement('1')}}" stepKey="seePageBuilderButtonsContentTypeEmpty"/>
+        <!-- Verify PageBuilder Button Content Type is on Stage -->
+        <waitForElementVisible selector="{{ButtonItemOnStorefrontEmptyLink.buttonItemText('1', PageBuilderButtonItemText_OneCharacter.value)}}" stepKey="seePageBuilderButtonText"/>
         <!-- Verify no Empty Preview Message on Stage -->
         <dontSeeElementInDOM selector="{{RowOnStage.empty('1')}}" stepKey="dontSeeEmptyPreviewMessageOnStage"/>
         <!-- Verify Page Builder preview is ready -->
-        <actionGroup ref="validatePageBuilderPreview" stepKey="verifyPageBuilderPreviewAfterFullScreen">
-            <argument name="pageBuilderArea" value="{{PageBuilderStage.pageBuilderArea('description')}}"/>
-        </actionGroup>
+        <actionGroup ref="ValidatePageBuilderPreview" stepKey="verifyPageBuilderPreviewAfterFullScreen"/>
         <!-- Verify Page Builder Full Screen -->
-        <actionGroup ref="adminOpenPageBuilderFromContentPreviewOverlay" stepKey="verifyPageBuilderFullScreenAfterFullScreen"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlay" stepKey="verifyPageBuilderFullScreenAfterFullScreen"/>
     </test>
 </tests>