Skip to content

Commit dffc34c

Browse files
omiroshnichenkoomiroshnichenko
committed
#429: User can add content to the Stage directly
- fix tests
1 parent c07e24d commit dffc34c

File tree

10 files changed

+55
-34
lines changed

10 files changed

+55
-34
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<click selector="{{PageBuilderStage.modalOk}}" stepKey="confirmRemoveModal"/>
2626
<waitForPageLoad time="30" stepKey="waitForRemoveAnimation"/>
2727
<waitForElementNotVisible time="30" selector="{{PageBuilderStage.modalOk}}" stepKey="waitForModalHide"/>
28-
<waitForElementVisible time="30" selector="{{RowOnStage.base('1')}}" stepKey="waitForPageBuilderRow"/>
28+
<waitForElementVisible time="30" selector="{{PageBuilderStage.rootContainer('1')}}" stepKey="waitForPageBuilderRow"/>
2929
<!-- Follow with confirmRemovalModal actionGroup -->
3030
</actionGroup>
3131
</actionGroups>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="verifyEmptyStage">
1111
<annotations>
12-
<description>Verifies that the Page Builder stage only has 1 row that is empty.</description>
12+
<description>Verifies that the Page Builder stage only has root container.</description>
1313
</annotations>
1414
<arguments>
1515
<argument name="rowIndex" defaultValue="1" type="string"/>
1616
<argument name="pageBuilderArea" defaultValue="" type="string"/>
1717
</arguments>
1818
<waitForPageLoad stepKey="waitForStageLoad"/>
19-
<waitForElementVisible selector="{{RowOnStage.empty(rowIndex)}}" stepKey="waitForEmptyRow"/>
20-
<seeElement selector="{{RowOnStage.empty(rowIndex)}}" stepKey="seeEmptyRow"/>
21-
<see userInput="Drag content types or columns here" selector="{{RowOnStage.emptyPlaceholder(rowIndex)}}" stepKey="seeEmptyRowPlaceholderMessage"/>
22-
<seeNumberOfElements userInput="1" selector="{{pageBuilderArea}}{{RowOnStage.allRows}}" stepKey="seeOnlyOneRow"/>
19+
<waitForElementVisible selector="{{PageBuilderStage.rootContainer(rowIndex)}}" stepKey="waitForEmptyStage"/>
20+
<seeElement selector="{{PageBuilderStage.rootContainer(rowIndex)}}" stepKey="seeEmptyStage"/>
21+
<see userInput="Drag Row, Columns, Tabs, Block, Dynamic Block or HTML Code here" selector="{{PageBuilderStage.rootContainerPlaceholder(rowIndex)}}" stepKey="seeEmptyStagePlaceholderMessage"/>
22+
<seeNumberOfElements userInput="0" selector="{{pageBuilderArea}}{{RowOnStage.allRows}}" stepKey="seeZeroRow"/>
2323
</actionGroup>
2424
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,6 @@
5252
<element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'mce-tinymce-inline')]|(//div[@data-content-type='{{arg1}}'])[{{arg2}}][following-sibling::div[contains(@class,'mce-tinymce-inline')]]" parameterized="true"/>
5353
<element name="inlineTextAreaEditor" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//textarea[@class='inline-wysiwyg-textarea']" parameterized="true"/>
5454
<element name="rootContainer" type="text" selector="(//div[contains(@class,&quot;pagebuilder-content-type&quot;) and contains(@class,&quot;pagebuilder-root-container&quot;)])[{{arg1}}]" parameterized="true"/>
55+
<element name="rootContainerPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-root-container')])[{{arg1}}][contains(@class,'empty-container')]//div[contains(@class,'empty-placeholder')]" parameterized="true"/>
5556
</section>
5657
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateAndApplyTemplate.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2626
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
2727
<argument name="CMSPage" value="$$createCMSPage$$"/>
28-
</actionGroup>
29-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
30-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
31-
<argument name="contentType" value="PageBuilderRowContentType"/>
32-
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
33-
</actionGroup>
34-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
28+
</actionGroup>
29+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
30+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
31+
<argument name="contentType" value="PageBuilderRowContentType"/>
32+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
33+
</actionGroup>
34+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3535
<argument name="contentType" value="PageBuilderButtonsContentType"/>
3636
</actionGroup>
3737
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
<!-- Verify Empty Row -->
4040
<actionGroup ref="verifyEmptyStage" stepKey="verifyFullScreenEmptyRow"/>
4141
<!-- Add Button to Row -->
42+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
43+
<argument name="contentType" value="PageBuilderRowContentType"/>
44+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
45+
</actionGroup>
4246
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
4347
<argument name="contentType" value="PageBuilderButtonsContentType"/>
4448
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/ButtonGroupInBlockOnDifferentLineWhenInFullWidthRowTest.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
<!-- Change row appearance to full-width -->
3939
<comment userInput="Change row appearance to full-width" stepKey="commentChangeRowAppearanceBlock"/>
4040
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
41+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
42+
<argument name="contentType" value="PageBuilderRowContentType"/>
43+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
44+
</actionGroup>
4145
<actionGroup ref="openPageBuilderEditPanel" stepKey="openRowEditMenuOnStageBlock">
4246
<argument name="contentType" value="PageBuilderRowContentType"/>
4347
</actionGroup>
@@ -78,6 +82,10 @@
7882
<argument name="CMSPage" value="$$createCMSPage$$"/>
7983
</actionGroup>
8084
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStagePage"/>
85+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage2">
86+
<argument name="contentType" value="PageBuilderRowContentType"/>
87+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
88+
</actionGroup>
8189
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContentPage">
8290
<argument name="contentType" value="PageBuilderBlockContentType"/>
8391
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/TextHeightConsistencyBetweenContentTypeAndBlockOnStorefrontTest.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
<!-- Update block with text -->
3838
<comment userInput="Update block with text" stepKey="commentUpdateBlockWithText"/>
3939
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
40+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
41+
<argument name="contentType" value="PageBuilderRowContentType"/>
42+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
43+
</actionGroup>
4044
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionForText1">
4145
<argument name="contentType" value="PageBuilderTextContentType"/>
4246
</actionGroup>
@@ -55,6 +59,10 @@
5559
<!-- Add text to page -->
5660
<comment userInput="Add text to page" stepKey="addTextToPage"/>
5761
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
62+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage2">
63+
<argument name="contentType" value="PageBuilderRowContentType"/>
64+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
65+
</actionGroup>
5866
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionForText2">
5967
<argument name="contentType" value="PageBuilderTextContentType"/>
6068
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplateMultipleTimes.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
2626
<argument name="CMSPage" value="$$createCMSPage$$"/>
27-
</actionGroup>
28-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
29-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
30-
<argument name="contentType" value="PageBuilderRowContentType"/>
31-
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
32-
</actionGroup>
33-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
27+
</actionGroup>
28+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
29+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
30+
<argument name="contentType" value="PageBuilderRowContentType"/>
31+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
32+
</actionGroup>
33+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3434
<argument name="contentType" value="PageBuilderButtonsContentType"/>
3535
</actionGroup>
3636
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplatesPermission.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
</actionGroup>
3232
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
3333
<argument name="CMSPage" value="$$createCMSPage$$"/>
34-
</actionGroup>
35-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
36-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
37-
<argument name="contentType" value="PageBuilderRowContentType"/>
38-
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
39-
</actionGroup>
40-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
34+
</actionGroup>
35+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
36+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
37+
<argument name="contentType" value="PageBuilderRowContentType"/>
38+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
39+
</actionGroup>
40+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
4141
<argument name="contentType" value="PageBuilderButtonsContentType"/>
4242
</actionGroup>
4343
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderMustSavePageForApplyTemplateToSave.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
2626
<argument name="CMSPage" value="$$createCMSPage$$"/>
27-
</actionGroup>
28-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
29-
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
30-
<argument name="contentType" value="PageBuilderRowContentType"/>
31-
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
32-
</actionGroup>
33-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
27+
</actionGroup>
28+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
29+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
30+
<argument name="contentType" value="PageBuilderRowContentType"/>
31+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
32+
</actionGroup>
33+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3434
<argument name="contentType" value="PageBuilderButtonsContentType"/>
3535
</actionGroup>
3636
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">

0 commit comments

Comments
 (0)