Skip to content

Commit 6d44d91

Browse files
omiroshnichenkoomiroshnichenko
committed
#429: User can add content to the Stage directly
- fix tests
1 parent 4c8ad63 commit 6d44d91

File tree

800 files changed

+3228
-321
lines changed

Some content is hidden

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

800 files changed

+3228
-321
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
<waitForPageLoad stepKey="waitForFullScreenAnimation"/>
2525
<!-- Wait for the first row to be added into the stage for it to be "ready" -->
2626
<waitForElementNotVisible selector="{{PageBuilderStage.stageLoading}}" stepKey="waitForStageLoadingGraphicNotVisible"/>
27-
<waitForElementVisible time="30" selector="{{RowOnStage.base(rowIndex)}}" stepKey="waitForPageBuilderRow"/>
27+
<waitForElementVisible time="30" selector="{{PageBuilderStage.rootContainer(rowIndex)}}" stepKey="waitForPageBuilderRootContainer"/>
2828
</actionGroup>
2929
</actionGroups>

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@
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"/>
5455
</section>
5556
</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: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +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="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">
3135
<argument name="contentType" value="PageBuilderButtonsContentType"/>
3236
</actionGroup>
3337
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">

‎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/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationEditPanelVisualTest.xml

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

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalAlignmentTest.xml

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

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalAllAttributesTest.xml

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

0 commit comments

Comments
 (0)