Skip to content

Commit d92107e

Browse files
omiroshnichenkoomiroshnichenko
committed
#510: User edits CMS page content in full-screen mode only
- fix mftf tests
1 parent 8899a8f commit d92107e

File tree

9 files changed

+22
-19
lines changed

9 files changed

+22
-19
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ScrollToActionGroup.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="ScrollToActionGroup">
11+
<annotations>
12+
<description>Scroll to element inside Page Builder stage using CSS selector</description>
13+
</annotations>
1114
<arguments>
1215
<argument name="cssSelector" type="string"/>
1316
<argument name="index" defaultValue="1" type="string" />

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/AddBlockToCmsPageTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
3333
<argument name="CMSPage" value="$$createCMSPage$$"/>
3434
</actionGroup>
35-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
35+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageBeforeDrag"/>
3636
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
3737
<argument name="contentType" value="PageBuilderBlockContentType"/>
3838
</actionGroup>
@@ -52,7 +52,7 @@
5252
</actionGroup>
5353
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
5454
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
55-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
55+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
5656
<actionGroup ref="verifyBlockOnStage" stepKey="verifyBlockOnStageAfterSave">
5757
<argument name="block" value="$$createPreReqBlock$$"/>
5858
<argument name="index" value="1"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockGetsUpdatedTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPageInAdmin">
3535
<argument name="CMSPage" value="$$createCMSPage$$"/>
3636
</actionGroup>
37-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
37+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageBeforeDrag"/>
3838
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
3939
<argument name="contentType" value="PageBuilderBlockContentType"/>
4040
</actionGroup>
@@ -80,7 +80,7 @@
8080
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPageInAdmin2">
8181
<argument name="CMSPage" value="$$createCMSPage$$"/>
8282
</actionGroup>
83-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
83+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
8484
<waitForElementVisible selector="{{HtmlOnStage.base('1')}}" stepKey="waitForHtmlBaseStage1"/>
8585
<see selector="{{BlockOnStage.html('1', '1')}}" userInput="{{PageBuilderHtmlPropertyButton.valueOnStage}}" stepKey="waitForHtmlStage1"/>
8686
<actionGroup ref="ClearCacheActionGroup" stepKey="clearMagentoCache"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockValidateEmptyStateTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
3131
<argument name="CMSPage" value="$$createCMSPage$$"/>
3232
</actionGroup>
33-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
33+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageBeforeDrag"/>
3434
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
3535
<argument name="contentType" value="PageBuilderBlockContentType"/>
3636
</actionGroup>
@@ -40,7 +40,7 @@
4040
<seeElement selector="{{BlockOnStage.status('1', 'Empty Block')}}" stepKey="seeEmptyBlockPlaceHolder1"/>
4141
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
4242
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
43-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
43+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
4444
<seeElement selector="{{BlockOnStage.status('1', 'Empty Block')}}" stepKey="seeEmptyBlockPlaceHolder2"/>
4545
<!-- Validate Storefront -->
4646
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSwitchingAppearancesTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage">
3333
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
3434
</actionGroup>
35-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
35+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageBeforeDrag"/>
3636
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3737
<argument name="contentType" value="PageBuilderButtonsContentType"/>
3838
</actionGroup>
@@ -69,7 +69,7 @@
6969
</actionGroup>
7070
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
7171
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
72-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
72+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
7373
<!-- Validate Stage After Save -->
7474
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
7575
<waitForElementVisible selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_First.value)}}" stepKey="waitForButton1Stage2"/>
@@ -91,7 +91,7 @@
9191
<switchToPreviousTab stepKey="switchToPreviousTab"/>
9292
<reloadPage stepKey="reloadPage"/>
9393
<waitForPageLoad stepKey="waitForPageLoad"/>
94-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
94+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
9595
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage3">
9696
<argument name="contentType" value="PageBuilderButtonsContentType"/>
9797
</actionGroup>
@@ -111,7 +111,7 @@
111111
</actionGroup>
112112
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
113113
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage2"/>
114-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage4"/>
114+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
115115
<!-- Validate Stage After Save -->
116116
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage4"/>
117117
<waitForElementVisible selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_First.value)}}" stepKey="waitForButton1Stage4"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddVariableWithinStringInlineWYSWIYGTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
3131
<argument name="CMSPage" value="$$createCMSPage$$"/>
3232
</actionGroup>
33-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
33+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageBeforeDrag"/>
3434
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3535
<argument name="contentType" value="PageBuilderTextContentType"/>
3636
</actionGroup>
@@ -69,7 +69,7 @@
6969
<!-- Save page and verify single clicking on variable will retain selection -->
7070
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
7171
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
72-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
72+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
7373
<actionGroup ref="clickDirectiveTinyMCE" stepKey="clickDirectiveTinyMCE2">
7474
<argument name="labelValue" value="TinyMCEVariableBaseURL.editPanelValue"/>
7575
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWidgetWithinStringInlineWYSIWYGTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
3333
<argument name="CMSPage" value="$$createCMSPage$$"/>
3434
</actionGroup>
35-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
35+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageBeforeDrag"/>
3636
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3737
<argument name="contentType" value="PageBuilderTextContentType"/>
3838
</actionGroup>
@@ -72,7 +72,7 @@
7272
<!-- Save page and verify single clicking on widget will retain selection -->
7373
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
7474
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
75-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
75+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
7676
<actionGroup ref="clickDirectiveTinyMCE" stepKey="clickDirectiveTinyMCE2">
7777
<argument name="labelValue" value="TinyMCEWidgetCMSPageLink.editPanelValue"/>
7878
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextTooltipMenusAreNotCutOffInFullScreenModeTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
</actionGroup>
5454
<comment userInput="focusOnInnerContentTypeAfterExitFullScreen" stepKey="focusOnInnerContentTypeAfterExitFullScreen"/>
5555
<comment userInput="waitForToolbarAnimationAfterExitFullScreen" stepKey="waitForToolbarAnimationAfterExitFullScreen"/>
56-
<comment userInput="waitForToolbarVisibleAfterExitFullScreen" stepKey="waitForToolbarVisibleAfterExitFullScreen"/>
57-
<comment userInput="toolbarBottomPositionAfterExitFullScreen" stepKey="toolbarBottomPositionAfterExitFullScreen"/>
58-
<comment userInput="toolbarTopPositionAfterExitFullScreen" stepKey="toolbarTopPositionAfterExitFullScreen"/>
56+
<comment userInput="waitForToolbarVisibleAfterExitFullScreen" after="waitForToolbarAnimationAfterExitFullScreen" stepKey="waitForToolbarVisibleAfterExitFullScreen"/>
5957
<comment userInput="inputBoxTopPositionAfterExitFullScreen" stepKey="inputBoxTopPositionAfterExitFullScreen"/>
58+
<comment userInput="toolbarTopPositionAfterExitFullScreen" stepKey="toolbarTopPositionAfterExitFullScreen"/>
59+
<comment userInput="toolbarBottomPositionAfterExitFullScreen" stepKey="toolbarBottomPositionAfterExitFullScreen"/>
6060
</test>
6161
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifySelectionInlineWYSIWYG.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
3232
<argument name="CMSPage" value="$$createCMSPage$$"/>
3333
</actionGroup>
34-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
34+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageBeforeDrag"/>
3535
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection1">
3636
<argument name="contentType" value="PageBuilderTextContentType"/>
3737
</actionGroup>
@@ -63,7 +63,7 @@
6363
</actionGroup>
6464
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
6565
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
66-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
66+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
6767
<actionGroup ref="scrollToTinyMCE" stepKey="scrollToTinyMCE"/>
6868
<!-- Select portion of Heading "his is a h" -->
6969
<helper class="\Magento\PageBuilder\Test\Mftf\Helper\SelectText" method="selectText" stepKey="selectHeadingTextInTinyMCE">

0 commit comments

Comments
 (0)