Skip to content

Commit 02875a5

Browse files
kieuphan2406kieuphan2406
committed
MC-2258: Automate MFTF
1 parent 7c0f013 commit 02875a5

File tree

3 files changed

+72
-15
lines changed

3 files changed

+72
-15
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="searchBlockInGrid">
12+
<arguments>
13+
<argument name="block" defaultValue=""/>
14+
</arguments>
15+
<click selector="{{BlockOnStage.selectBlockBtn}}" stepKey="clickSelectBlockBtn"/>
16+
<waitForElementVisible selector="{{BlockOnGrid.searchBox}}" stepKey="waitForBlockGrid" />
17+
<pressKey selector="{{BlockOnGrid.searchBox}}" userInput="{{block.title}}" stepKey="enterBlockTitle"/>
18+
<click selector="{{BlockOnGrid.selectBtn(block.identifier)}}" stepKey="clickSelectBtn"/>
19+
<click selector="{{BlockOnGrid.addSelectedBtn}}" stepKey="clickAddSelected"/>
20+
</actionGroup>
21+
</actionGroups>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="BlockOnStage">
12+
<element name="status" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//span[contains(@class,'placeholder') and text()='{{arg}}'])" parameterized="true"/>
13+
<element name="title" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[contains(@class,'block-title') and text()='{{arg1}}'])" parameterized="true"/>
14+
<element name="selectBlockBtn" type="button" selector="(//div[contains(@class,'pagebuilder-block')]//button/span[text()='Select Block'])"/>
1215
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[@data-identifier])[{{arg1}}]" parameterized="true"/>
1316
<element name="identifier" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[@data-identifier])[{{arg1}}][@data-identifier='{{arg2}}']" parameterized="true"/>
1417
<element name="hr" type="button" selector="(//div[contains(@class,'pagebuilder-block')]//div[@data-identifier])[{{arg1}}]//hr" parameterized="true"/>
@@ -25,6 +28,11 @@
2528
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[@data-identifier])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
2629
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[@data-identifier])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
2730
</section>
31+
<section name="BlockOnGrid">
32+
<element name="searchBox" type="text" selector="//input[contains(@class,'data-grid-search-control')]"/>
33+
<element name="selectBtn" type="text" selector="//div[text()='{{arg}}']/parent::td//preceding-sibling::td//button[text()='Select']" parameterized="true"/>
34+
<element name="addSelectedBtn" type="text" selector="//button/span[text()='Add Selected']"/>
35+
</section>
2836
<section name="BlockOnStorefront">
2937
<element name="base" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}]" parameterized="true"/>
3038
<element name="hr" type="button" selector="(//div[@data-role='row']/div)[{{arg1}}]/hr" parameterized="true"/>

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

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,25 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
11-
<test name="BlockAddToCMSPage">
11+
<test name="InitialStatusBlock">
1212
<annotations>
1313
<features value="Pagebuilder: Block"/>
14-
<stories value="MAGETWO-83941: Static Block"/>
15-
<title value="Block - Update General Values"/>
16-
<description value="Validate that updating every attribute in the General form for Block will update the Stage and Storefront correctly."/>
14+
<stories value="MC-1420: Static Block"/>
15+
<title value="Block - Initial Status"/>
16+
<description value="Verify that Static Block is refactor and new Block preview is applied."/>
1717
<severity value="CRITICAL"/>
18-
<testCaseId value="MAGETWO-84276"/>
18+
<testCaseId value="MC-2278"/>
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-block"/>
21-
<group value="pagebuilder-customBeforeAfter"/>
2221
</annotations>
2322
<before>
2423
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25-
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
26-
<actionGroup ref="disablePageBuilderSetting" stepKey="disablePageBuilderSetting"/>
27-
<actionGroup ref="addCmsBlock" stepKey="addCmsBlock"/>
2824
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilderSetting"/>
2925
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
3026
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
3127
</before>
3228
<after>
3329
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
34-
<actionGroup ref="enablePageBuilderSetting" stepKey="turnOnPageBuilder" after="disableWYSIWYG"/>
3530
<actionGroup ref="logout" stepKey="logout"/>
3631
</after>
3732
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -40,16 +35,49 @@
4035
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
4136
<argument name="group" value="PageBuilderBlockContentType"/>
4237
</actionGroup>
43-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
38+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
4439
<argument name="contentType" value="PageBuilderBlockContentType"/>
4540
</actionGroup>
46-
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
47-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
41+
<actionGroup ref="closeEditPanelSettings" stepKey="closeSlideEditPanel"/>
42+
<seeElement selector="{{BlockOnStage.status('Empty Block')}}" stepKey="seeEmptyBlockPlaceHolder"/>
43+
</test>
44+
<test name="AddBlockToCmsPage">
45+
<annotations>
46+
<features value="Pagebuilder: Block"/>
47+
<stories value="MC-1420: Static Block"/>
48+
<title value="Add Block to CMS Page"/>
49+
<description value="Verify that admin are able to add a block instance to Block Content Block and see it on frontend"/>
50+
<severity value="CRITICAL"/>
51+
<testCaseId value="MC-2279"/>
52+
<group value="pagebuilder"/>
53+
<group value="pagebuilder-block"/>
54+
</annotations>
55+
<before>
56+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
57+
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilderSetting"/>
58+
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
59+
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
60+
</before>
61+
<after>
62+
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
63+
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
64+
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
65+
<actionGroup ref="logout" stepKey="logout"/>
66+
</after>
67+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPage">
68+
<argument name="CMSPage" value="$$createCMSPage$$"/>
69+
</actionGroup>
70+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
71+
<argument name="group" value="PageBuilderBlockContentType"/>
72+
</actionGroup>
73+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
4874
<argument name="contentType" value="PageBuilderBlockContentType"/>
4975
</actionGroup>
50-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterIdentifierProperty">
51-
<argument name="property" value="PageBuilderBlockIdentifierProperty"/>
76+
<seeElement selector="{{BlockOnStage.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
77+
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
78+
<argument name="block" value="$$createPreReqBlock$$"/>
5279
</actionGroup>
80+
<!--<seeElement selector="{{BlockOnStage.title('$$createPreReqBlock.title$$')}}" stepKey="seeBlockTitle"/>-->
5381
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
5482
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
5583
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>

0 commit comments

Comments
 (0)