Skip to content

Commit c28e1cd

Browse files
irenelagnoirenelagno
authored
Merge pull request #54 from magento-trigger/MAGETWO-87898-Stabilize-PageBuilder-EE
[CMS Team 3] Stabilize PageBuilder tests related to EE functionality
2 parents 72713ab + 7e0c100 commit c28e1cd

File tree

6 files changed

+206
-215
lines changed

6 files changed

+206
-215
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Banner/Test/AdminPageBuilderEnabledTest.xml

Lines changed: 73 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,77 @@
1010

1111
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1212
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
13-
<!--<test name="VerifyPageBuilderOnDynamicBlock">-->
14-
<!--<annotations>-->
15-
<!--<title value="Admin are able to see PageBuilder on Dynmic Block after enable PageBuilder from Configuration"/>-->
16-
<!--<description value="Admin are able to see PageBuilder on Dynmic Block after enable PageBuilder from Configuration"/>-->
17-
<!--<severity value="CRITICAL"/>-->
18-
<!--<group value="pagebuilder"/>-->
19-
<!--</annotations>-->
20-
<!--<before>-->
21-
<!--<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>-->
22-
<!--<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilder"/>-->
23-
<!--</before>-->
24-
<!--<after>-->
25-
<!--<actionGroup ref="dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Banner/Test/AdminPageBuilderEnabledTest.xml:23logout" stepKey="logout"/>-->
26-
<!--</after>-->
27-
<!--&lt;!&ndash;Verify PageBuilder visible on Dynamic Block creation form &ndash;&gt;-->
28-
<!--<amOnPage url="{{AdminBannerPage.url}}" stepKey="openNewBannerForm"/>-->
29-
<!--<waitForPageLoad stepKey="waitForPageLoad5"/>-->
30-
<!--<actionGroup ref="verifyPageBuilderVisibleOnPage" stepKey="verifyBluefootVisibleOnBlockPage"/>-->
31-
<!--</test>-->
32-
<!--<test name="VerifyPageBuilderDisableOnDynamicBlockWhenPageBuilderDisabledAndWYSIWYGEnabled">-->
33-
<!--<annotations>-->
34-
<!--<title value="Admin should not be able to see PageBuilder on Dynamic Block Page after disable PageBuilder and disable WYSIWYG from Configuration"/>-->
35-
<!--<description value="Admin should not be able to see PageBuilder on Dynamic Block Page after disable PageBuilder and disable WYSIWYG from Configuration"/>-->
36-
<!--<severity value="CRITICAL"/>-->
37-
<!--<group value="pagebuilder"/>-->
38-
<!--</annotations>-->
39-
<!--<before>-->
40-
<!--<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>-->
41-
<!--<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>-->
42-
<!--<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilder"/>-->
43-
<!--</before>-->
44-
<!--<after>-->
45-
<!--<actionGroup ref="logout" stepKey="logout"/>-->
46-
<!--</after>-->
47-
<!--&lt;!&ndash;Create Dynamic Block using PageBuilder&ndash;&gt;-->
48-
<!--<amOnPage url="{{AdminBannerPage.url}}" stepKey="goToNewBannerPage" />-->
49-
<!--<waitForPageLoad stepKey="waitForPageLoad" />-->
50-
<!--<actionGroup ref="fillDynamicBlockName" stepKey="fillDynamicBlockName">-->
51-
<!--<argument name="Banner" value="sampleBanner"/>-->
52-
<!--</actionGroup>-->
53-
<!--<actionGroup ref="dragContentBlockToStage" stepKey="dragButtonsOntoStage">-->
54-
<!--<argument name="contentBlockType" value="PageBuilderTextContentBlock"/>-->
55-
<!--</actionGroup>-->
56-
<!--<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">-->
57-
<!--<argument name="contentBlockType" value="PageBuilderTextContentBlock"/>-->
58-
<!--</actionGroup>-->
59-
<!--<waitForLoadingMaskToDisappear stepKey="waitForEditPanelSpinner"/>-->
60-
<!--<fillField selector="{{TextOnConfiguration.textArea}}" userInput="Hello Dynamic Block from PageBuilder" stepKey="addTextToEditor"/>-->
61-
<!--<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>-->
62-
<!--<see userInput="Hello Dynamic Block from PageBuilder" stepKey="seeTypedTextOnStorefront"/>-->
63-
<!--<click selector="{{AdminBannerBasicActionSection.Save}}" stepKey="clickSaveBanner" />-->
64-
<!--&lt;!&ndash;Enable WYSIWYG&ndash;&gt;-->
65-
<!--<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>-->
66-
<!--&lt;!&ndash;Disable PageBuilder from Configuration&ndash;&gt;-->
67-
<!--<actionGroup ref="disablePageBuilderSetting" stepKey="disablePageBuilderSetting"/>-->
68-
<!--<actionGroup ref="navigateToCreatedDynamicBlock" stepKey="navigateToCreatedDynamicBlock">-->
69-
<!--<argument name="Banner" value="sampleBanner"/>-->
70-
<!--</actionGroup>-->
71-
<!--<seeElement selector="{{TinyMCESection.TinyMCE4}}" stepKey="seeTinyMCE4Visible" />-->
72-
<!--&lt;!&ndash;Missing step of asserting PageBuilder text convert to TinyMCE4 (blocked by current testing framework - unable to grab text from TinyMCE4)&ndash;&gt;-->
73-
<!--</test>-->
13+
<test name="VerifyPageBuilderOnDynamicBlock">
14+
<annotations>
15+
<features value="Pagebuilder"/>
16+
<stories value="MAGETWO-71404: Enabling PageBuilder on Webstore"/>
17+
<title value="Admin are able to see PageBuilder on Dynamic Block after enable PageBuilder from Configuration"/>
18+
<description value="Admin are able to see PageBuilder on Dynamic Block after enable PageBuilder from Configuration"/>
19+
<severity value="CRITICAL"/>
20+
<group value="pagebuilder"/>
21+
<group value="pagebuilder-ee"/>
22+
</annotations>
23+
<before>
24+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25+
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilder"/>
26+
</before>
27+
<after>
28+
<actionGroup ref="logout" stepKey="logout"/>
29+
</after>
30+
<!--Verify PageBuilder visible on Dynamic Block creation form -->
31+
<comment userInput="Verify PageBuilder visible on Dynamic Block creation form " stepKey="commentValidation"/>
32+
<amOnPage url="{{AdminBannerPage.url}}" stepKey="openNewBannerForm"/>
33+
<waitForPageLoad stepKey="waitForPageLoad5"/>
34+
<actionGroup ref="verifyPageBuilderVisibleOnPage" stepKey="verifyBluefootVisibleOnBlockPage"/>
35+
</test>
36+
<test name="VerifyPageBuilderDisableOnDynamicBlockWhenPageBuilderDisabledAndWYSIWYGEnabled">
37+
<annotations>
38+
<features value="Pagebuilder"/>
39+
<stories value="MAGETWO-71404: Enabling PageBuilder on Webstore"/>
40+
<title value="Admin should not be able to see PageBuilder on Dynamic Block Page after disable PageBuilder and disable WYSIWYG from Configuration"/>
41+
<description value="Admin should not be able to see PageBuilder on Dynamic Block Page after disable PageBuilder and disable WYSIWYG from Configuration"/>
42+
<severity value="CRITICAL"/>
43+
<group value="pagebuilder"/>
44+
<group value="pagebuilder-ee"/>
45+
</annotations>
46+
<before>
47+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
48+
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
49+
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilder"/>
50+
</before>
51+
<after>
52+
<actionGroup ref="logout" stepKey="logout"/>
53+
</after>
54+
<!--Create Dynamic Block using PageBuilder-->
55+
<amOnPage url="{{AdminBannerPage.url}}" stepKey="goToNewBannerPage" />
56+
<waitForPageLoad stepKey="waitForPageLoad" />
57+
<actionGroup ref="fillDynamicBlockName" stepKey="fillDynamicBlockName">
58+
<argument name="Banner" value="sampleBanner"/>
59+
</actionGroup>
60+
<actionGroup ref="dragContentBlockToStage" stepKey="dragButtonsOntoStage">
61+
<argument name="contentBlockType" value="PageBuilderTextContentBlock"/>
62+
</actionGroup>
63+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
64+
<argument name="contentBlockType" value="PageBuilderTextContentBlock"/>
65+
</actionGroup>
66+
<waitForLoadingMaskToDisappear stepKey="waitForEditPanelSpinner"/>
67+
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="Hello Dynamic Block from PageBuilder" stepKey="addTextToEditor"/>
68+
<click selector="{{PageBuilderActionsSection.editFormSave}}" stepKey="clickSaveColumn"/>
69+
<waitForElementNotVisible time="5" selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditFormNotVisible" />
70+
<see userInput="Hello Dynamic Block from PageBuilder" stepKey="seeTypedTextOnStorefront"/>
71+
<click selector="{{AdminBannerBasicActionSection.Save}}" stepKey="clickSaveBanner" />
72+
<!--Enable WYSIWYG-->
73+
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
74+
<!--Disable PageBuilder from Configuration-->
75+
<actionGroup ref="disablePageBuilderSetting" stepKey="disablePageBuilderSetting"/>
76+
<actionGroup ref="navigateToCreatedDynamicBlock" stepKey="navigateToCreatedDynamicBlock">
77+
<argument name="Banner" value="sampleBanner"/>
78+
</actionGroup>
79+
<seeElement selector="{{TinyMCESection.TinyMCE4}}" stepKey="seeTinyMCE4Visible" />
80+
<executeJS function="return (function() {var div = document.createElement('div'); div.innerHTML = tinymce.activeEditor.getContent(); return div.innerText.trim();}())" stepKey="textFromPageBuilder"/>
81+
<assertEquals stepKey="assertEquals1" message="pass">
82+
<expectedResult type="string">Hello Dynamic Block from PageBuilder</expectedResult>
83+
<actualResult type="variable">textFromPageBuilder</actualResult>
84+
</assertEquals>
85+
</test>
7486
</tests>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/ActionGroup/ActionGroup.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,11 @@
616616
<waitForElementVisible selector="{{PageBuilderActionsSection.identifyPageBuilder}}" stepKey="seePageBuilderVisible" />
617617
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
618618
</actionGroup>
619+
<actionGroup name="verifyPageBuilderVisibleOnStaging">
620+
<scrollTo selector="{{PageBuilderActionsSection.identifyPageBuilder}}" stepKey="scrollToIdentifyPageBuilder"/>
621+
<waitForElementVisible selector="{{PageBuilderActionsSection.identifyPageBuilder}}" stepKey="seePageBuilderVisible" />
622+
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
623+
</actionGroup>
619624
<actionGroup name="verifyPageBuilderNotVisibleOnPage">
620625
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
621626
<dontSee selector="{{PageBuilderActionsSection.identifyPageBuilder}}" stepKey="seePageBuilderVisible" />

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/PageBuilder/Test/AdminPageBuilderEnabledTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@
175175
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage1">
176176
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
177177
</actionGroup>
178-
179178
<actionGroup ref="dragContentBlockToStage" stepKey="dragButtonsOntoStage">
180179
<argument name="contentBlockType" value="PageBuilderTextContentBlock"/>
181180
</actionGroup>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Staging/ActionGroup/ActionGroup.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1212
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
13-
<!--<actionGroup name="navigateToStagingSlideout">-->
14-
<!--<click selector="{{AdminStagingSlideOutSection.scheduleNewUpdateBtn}}" stepKey="clickOnStagingBtn" />-->
15-
<!--<waitForLoadingMaskToDisappear stepKey="waitForLoading" />-->
16-
<!--<waitForElementVisible selector="{{AdminStagingSlideOutSection.title}}" stepKey="waitForSlideOutOpen"/>-->
17-
<!--</actionGroup>-->
13+
<actionGroup name="navigateToStagingSlideout">
14+
<click selector="{{AdminStagingSlideOutSection.scheduleNewUpdateBtn}}" stepKey="clickOnStagingBtn" />
15+
<waitForLoadingMaskToDisappear stepKey="waitForLoading" />
16+
<waitForElementVisible selector="{{AdminStagingSlideOutSection.title}}" stepKey="waitForSlideOutOpen"/>
17+
</actionGroup>
1818
</actionGroups>

0 commit comments

Comments
 (0)