#512: User edits Blocks content in full-screen mode only - Changed Stage Section element to XPath, added pageBuilderArea to actionGroups

Author: hannahnida

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

@@ -11,10 +11,13 @@
         <annotations>
             <description>Click Page Builder preview overlay to open Page Builder stage.</description>
         </annotations>
-        <waitForElementVisible selector="{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
-        <click selector="{{PageBuilderStage.stageOverlay}}" stepKey="clickOnStageOverlayOnStage"/>
+        <arguments>
+            <argument name="pageBuilderArea" defaultValue="" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
+        <click selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="clickOnStageOverlayOnStage"/>
         <waitForPageLoad stepKey="waitForPageLoadPageBuilder"/>
-        <waitForElementVisible selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderLayoutMenu"/>
+        <waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderLayoutMenu"/>
         <waitForElementVisible selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="waitForPageBuilderFullScreen"/>
     </actionGroup>
 </actionGroups>

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

@@ -19,9 +19,9 @@
         <dontSeeElement 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"/>
+        <waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="waitForStageOverlay"/>
+        <moveMouseOver selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlay}}" stepKey="mouseOverStageOverlay"/>
+        <waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderStage.stageOverlayOnHover}}" stepKey="waitForStageOverlayOnHover"/>
         <dontSeeElement selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderRowContentType.role)}}" stepKey="dontSeeRowOptionMenu"/>
     </actionGroup>
 </actionGroups>

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

@@ -21,8 +21,8 @@
         <element name="enabled" type="button" selector="//div[not(contains(@class, '_disabled'))]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[@class='pagebuilder-stage-wrapper']"/>
         <element name="disabled" type="button" selector="//div[contains(@class, '_disabled')]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[@class='pagebuilder-stage-wrapper']"/>
         <element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-full-screen"/>
-        <element name="stageOverlay" type="button" selector="div.pagebuilder-wysiwyg-overlay"/>
-        <element name="stageOverlayOnHover" type="button" selector="div.pagebuilder-wysiwyg-overlay._hover"/>
+        <element name="stageOverlay" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-overlay')]"/>
+        <element name="stageOverlayOnHover" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-overlay') and contains(@class, '_hover')]"/>
         <element name="stageWidthJS" type="button" selector="document.querySelector('div[class~=\'root-container-container\']').clientWidth"/>
         <element name="modal" type="text" selector="aside.modal-popup._show"/>
         <element name="modalOk" type="button" selector="aside.modal-popup._show button.action-primary.action-accept"/>