Skip to content

Commit 8ad55b0

Browse files
petrovsapetrovsa
committed
Merge branch 'develop' into 429_no_default_row
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/SwitchToPageBuilderStageActionGroup.xml # app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/SwitchToPageBuilderStageCMSBlockActionGroup.xml
2 parents 2ae6e20 + dffc34c commit 8ad55b0

File tree

828 files changed

+3335
-332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

828 files changed

+3335
-332
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<argument name="sectionDependentSelector" defaultValue="{{CmsNewPagePageContentSection.header}}._show" type="string"/>
1414
<argument name="snapshotSelector" defaultValue="{{PageBuilderStage.snapshot}}" type="string"/>
1515
<argument name="editButtonSelector" defaultValue="{{PageBuilderStage.editButtonSelector}}" type="string"/>
16-
<argument name="containerTargetIndex" defaultValue="1" type="string"/>
17-
<argument name="containerTargetType" defaultValue="PageBuilderRootContainerContentType"/>
16+
<argument name="rowIndex" defaultValue="1" type="string"/>
1817
</arguments>
1918
<waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
2019
<conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
@@ -25,6 +24,6 @@
2524
<waitForPageLoad stepKey="waitForFullScreenAnimation"/>
2625
<!-- Wait for the first row to be added into the stage for it to be "ready" -->
2726
<waitForElementNotVisible selector="{{PageBuilderStage.stageLoading}}" stepKey="waitForStageLoadingGraphicNotVisible"/>
28-
<waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" stepKey="waitForPageBuilderRootContainer"/>
27+
<waitForElementVisible time="30" selector="{{PageBuilderStage.rootContainer(rowIndex)}}" stepKey="waitForPageBuilderRootContainer"/>
2928
</actionGroup>
3029
</actionGroups>

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

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,7 @@
5151
<element name="inlineWYSIWYGEditor" type="text" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'inline-wysiwyg')]|(//div[@data-content-type='{{arg1}}' and contains(@class,'inline-wysiwyg')])[{{arg2}}]" parameterized="true"/>
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"/>
54+
<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"/>
5456
</section>
5557
</sections>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/PageBuilderCmsPageDisablePageBuilderTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
<argument name="CMSPage" value="$$createCMSPage$$"/>
2828
</actionGroup>
2929
<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>
3034
</before>
3135
<after>
3236
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
<argument name="CMSPage" value="$$createCMSPage$$"/>
2828
</actionGroup>
2929
<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>
3034
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3135
<argument name="contentType" value="PageBuilderButtonsContentType"/>
3236
</actionGroup>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2626
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
27+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
28+
<argument name="contentType" value="PageBuilderRowContentType"/>
29+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
30+
</actionGroup>
2731
</before>
2832
<after>
2933
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2626
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
27+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
28+
<argument name="contentType" value="PageBuilderRowContentType"/>
29+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
30+
</actionGroup>
2731
</before>
2832
<after>
2933
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAndInvalidPageLayoutTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
<closeTab stepKey="closeTab"/>
3636
</after>
3737
<actionGroup ref="openPageBuilderForAttribute" stepKey="enablePageBuilderOnCatalog"/>
38+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRootRowToStage">
39+
<argument name="contentType" value="PageBuilderRowContentType"/>
40+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
41+
</actionGroup>
3842
<!-- Set background color of row -->
3943
<comment userInput="Set background color of row" stepKey="commentSetRowBackgroundColor"/>
4044
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">

0 commit comments

Comments
 (0)