Skip to content

Commit 3b8cbf7

Browse files
kieuphan2406kieuphan2406
committed
MC-2258: Automate MFTF
1 parent 4a25fff commit 3b8cbf7

File tree

3 files changed

+85
-2
lines changed

3 files changed

+85
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
</arguments>
1515
<click selector="{{BlockOnStage.selectBlockBtn}}" stepKey="clickSelectBlockBtn"/>
1616
<waitForElementVisible selector="{{BlockOnGrid.searchBox}}" stepKey="waitForBlockGrid" />
17-
<pressKey selector="{{BlockOnGrid.searchBox}}" userInput="{{block.identifier}}" stepKey="enterBlockTitle"/>
17+
<fillField selector="{{BlockOnGrid.searchBox}}" userInput="{{block.identifier}}" stepKey="enterBlockTitle"/>
18+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
19+
<click selector="{{BlockOnGrid.searchBtn}}" stepKey="clickSearchBtn"/>
1820
<waitForElementVisible selector="{{BlockOnGrid.selectBtn(block.identifier)}}" stepKey="waitForSearchResult"/>
1921
<click selector="{{BlockOnGrid.selectBtn(block.identifier)}}" stepKey="clickSelectBtn"/>
2022
<click selector="{{BlockOnGrid.addSelectedBtn}}" stepKey="clickAddSelected"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
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="html" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[contains(@data-bind,'html: data.main.html')])[{{arg1}}]{{arg2}}" parameterized="true"/>
1213
<element name="status" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//span[contains(@class,'placeholder') and text()='{{arg}}'])" parameterized="true"/>
1314
<element name="deleted" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//span[contains(@class,'placeholder') and contains(text(),'Block with ID: {{arg}} doesn')])" parameterized="true"/>
1415
<element name="title" type="text" selector="(//div[contains(@class,'pagebuilder-block')])[1]//div[contains(@class,'pagebuilder-options-wrapper')]//div[contains(@class,'option-title') and text()='{{arg}}']" parameterized="true"/>
@@ -32,13 +33,15 @@
3233
</section>
3334
<section name="BlockOnGrid">
3435
<element name="searchBox" type="text" selector="//input[contains(@class,'data-grid-search-control')]"/>
36+
<element name="searchBtn" type="text" selector=".action-submit"/>
3537
<element name="selectBtn" type="text" selector="//div[text()='{{arg}}']/parent::td//preceding-sibling::td//button[text()='Select']" parameterized="true"/>
3638
<element name="addSelectedBtn" type="text" selector="//button/span[text()='Add Selected']"/>
3739
</section>
3840
<section name="BlockOnForm">
3941
<element name="title" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[contains(@class,'block-title') and text()='{{arg1}}'])" parameterized="true"/>
4042
</section>
4143
<section name="BlockOnStorefront">
44+
<element name="html" type="text" selector="(//div[@data-role='block'])[{{arg1}}]{{arg2}}" parameterized="true"/>
4245
<element name="base" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}]" parameterized="true"/>
4346
<element name="hr" type="button" selector="(//div[@data-role='row']/div)[{{arg1}}]/hr" parameterized="true"/>
4447
<!-- Advanced Configuration -->

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

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
<title value="Add Block to CMS Page"/>
4949
<description value="Verify that admin are able to add a block instance to Block Content Block and see it on frontend"/>
5050
<severity value="CRITICAL"/>
51-
<testCaseId value="MC-2279"/>
51+
<testCaseId value="MC-2289"/>
52+
<useCaseId value="MC-1420"/>
5253
<group value="pagebuilder"/>
5354
<group value="pagebuilder-block"/>
5455
</annotations>
@@ -93,6 +94,83 @@
9394
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
9495
<see userInput="$$createPreReqBlock.content$$" stepKey="seeBlockContentOnCmsStage"/>
9596
</test>
97+
<test name="BlockGetUpdated">
98+
<annotations>
99+
<features value="Pagebuilder"/>
100+
<stories value="MC-1420: (Magento) Block Configuration"/>
101+
<title value="Block Content Block get updated"/>
102+
<description value="Verify that Block Content Block get updated from Block entities"/>
103+
<severity value="CRITICAL"/>
104+
<testCaseId value="MC-2289"/>
105+
<useCaseId value="MC-1420"/>
106+
<group value="pagebuilder"/>
107+
<group value="pagebuilder-block"/>
108+
</annotations>
109+
<before>
110+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
111+
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilderSetting"/>
112+
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
113+
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
114+
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
115+
</before>
116+
<after>
117+
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
118+
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
119+
<actionGroup ref="logout" stepKey="logout"/>
120+
</after>
121+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCmsPage1">
122+
<argument name="CMSPage" value="$$createCMSPage$$"/>
123+
</actionGroup>
124+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
125+
<argument name="group" value="PageBuilderBlockContentType"/>
126+
</actionGroup>
127+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
128+
<argument name="contentType" value="PageBuilderBlockContentType"/>
129+
</actionGroup>
130+
<seeElement selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
131+
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
132+
<argument name="block" value="$$createPreReqBlock$$"/>
133+
</actionGroup>
134+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
135+
<seeElement selector="{{BlockOnForm.title('$$createPreReqBlock.title$$')}}" stepKey="seeBlockTitleOnForm"/>
136+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
137+
<!-- Validate Stage -->
138+
<comment userInput="Validate stage" stepKey="validateStage1" />
139+
<actionGroup ref="verifyBlockOnStage" stepKey="verifyBlockOnStage">
140+
<argument name="contentType" value="PageBuilderBlockContentType"/>
141+
<argument name="block" value="$$createPreReqBlock$$"/>
142+
</actionGroup>
143+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
144+
<!-- Validate Storefront -->
145+
<comment userInput="Validate storefront" stepKey="validateStorefront1" />
146+
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage1"/>
147+
<see userInput="$$createPreReqBlock.content$$" stepKey="seeBlockContentOnCmsStage"/>
148+
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCmsBlock">
149+
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
150+
</actionGroup>
151+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
152+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
153+
</actionGroup>
154+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterHtmlContent">
155+
<argument name="property" value="PageBuilderHtmlPropertyButton"/>
156+
</actionGroup>
157+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
158+
<click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="saveCmcBlock"/>
159+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCmsPage2">
160+
<argument name="CMSPage" value="$$createCMSPage$$"/>
161+
</actionGroup>
162+
<!-- Validate Stage -->
163+
<comment userInput="Validate stage after updating block" stepKey="validateStage2" />
164+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
165+
<waitForElementVisible selector="{{HtmlOnStage.base('1')}}" stepKey="waitForHtmlBaseStage1"/>
166+
<waitForElementVisible selector="{{BlockOnStage.html('1', PageBuilderHtmlPropertyButton.selector)}}" stepKey="waitForHtmlStage1"/>
167+
<actionGroup ref="ClearCacheActionGroup" stepKey="clearMagentoCache"/>
168+
<!-- Validate Storefront -->
169+
<comment userInput="Validate storefront after updating block" stepKey="validateStorefront2" />
170+
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
171+
<waitForElementVisible selector="{{HtmlOnStorefront.base('1')}}" stepKey="waitForHtmlBaseStorefront"/>
172+
<waitForElementVisible selector="{{HtmlOnStorefront.html('1', PageBuilderHtmlPropertyButton.selector)}}" stepKey="waitForHtmlStorefront"/>
173+
</test>
96174
<test name="VerifyBlockDisabled">
97175
<annotations>
98176
<features value="Pagebuilder: Block"/>

0 commit comments

Comments
 (0)