Skip to content

Commit 2fc60cc

Browse files
kieuphan2406kieuphan2406
committed
MC-3091: Improve MFTF tests for Block Configuration
1 parent 5160b49 commit 2fc60cc

File tree

3 files changed

+21
-39
lines changed

3 files changed

+21
-39
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<arguments>
1313
<argument name="block" defaultValue=""/>
1414
</arguments>
15-
<click selector="{{BlockOnStage.selectBlockBtn}}" stepKey="clickSelectBlockBtn"/>
15+
<click selector="{{BlockOnForm.selectBlockBtn}}" stepKey="clickSelectBlockBtn"/>
1616
<waitForElementVisible selector="{{BlockOnGrid.searchBox}}" stepKey="waitForBlockGrid" />
1717
<fillField selector="{{BlockOnGrid.searchBox}}" userInput="{{block.identifier}}" stepKey="enterBlockTitle"/>
1818
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
@@ -23,15 +23,14 @@
2323
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear3"/>
2424
<waitForElementVisible selector="{{BlockOnGrid.addSelectedBtn}}" stepKey="waitForAddSelected"/>
2525
<click selector="{{BlockOnGrid.addSelectedBtn}}" stepKey="clickAddSelected"/>
26+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear4"/>
2627
</actionGroup>
2728
<actionGroup name="verifyBlockOnStage">
2829
<arguments>
29-
<argument name="contentType"/>
3030
<argument name="block"/>
3131
</arguments>
32-
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStage(contentType.role)}}" x="10" y="0" stepKey="onMouseOverContentTypeStage"/>
32+
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStage(PageBuilderBlockContentType.role)}}" stepKey="onMouseOverContentTypeStage"/>
3333
<waitForElementVisible selector="{{BlockOnStage.title(block.title)}}" stepKey="wait"/>
34-
<seeElement selector="{{BlockOnStage.title(block.title)}}" stepKey="seeOptionMenuTitle"/>
3534
<see userInput="{{block.content}}" stepKey="seeBlockContentOnStage"/>
3635
</actionGroup>
3736
</actionGroups>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<element name="status" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//span[contains(@class,'placeholder') and text()='{{arg}}'])" parameterized="true"/>
1414
<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"/>
1515
<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"/>
16-
<element name="selectBlockBtn" type="button" selector="(//div[contains(@class,'pagebuilder-block')]//button/span[text()='Select Block'])"/>
1716
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-block')])[{{arg1}}]" parameterized="true"/>
1817
<element name="hr" type="button" selector="(//div[contains(@class,'pagebuilder-block')]//div[@data-identifier])[{{arg1}}]//hr" parameterized="true"/>
1918
<!-- Advanced Configuration -->
@@ -28,7 +27,6 @@
2827
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//div[not(@class)]" parameterized="true"/>
2928
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//div[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
3029
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//div[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
31-
<element name="selectBlockBtn" type="button" selector="(//div[contains(@class,'pagebuilder-block')]//button/span[text()='Select Block'])"/>
3230
</section>
3331
<section name="BlockOnGrid">
3432
<element name="searchBox" type="text" selector="//input[contains(@class,'data-grid-search-control')]"/>
@@ -38,11 +36,13 @@
3836
</section>
3937
<section name="BlockOnForm">
4038
<element name="title" type="text" selector="(//div[contains(@class,'pagebuilder-block')]//div[contains(@class,'block-title') and text()='{{arg1}}'])" parameterized="true"/>
39+
<element name="selectBlockBtn" type="button" selector="(//div[contains(@class,'pagebuilder-block')]//button/span[text()='Select Block'])"/>
4140
</section>
4241
<section name="BlockOnStorefront">
4342
<element name="html" type="text" selector="(//div[@data-role='html'])[{{arg1}}]//a[contains(@class,'pagebuilder-button-primary')]" parameterized="true"/>
4443
<element name="base" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}]" parameterized="true"/>
4544
<element name="hr" type="button" selector="(//div[@data-role='row']/div)[{{arg1}}]/hr" parameterized="true"/>
45+
<element name="blockContent" type="text" selector="//div[@data-role='block']//div[contains(@class,'block-static-block')]"/>
4646
<!-- Advanced Configuration -->
4747
<element name="alignment" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
4848
<element name="noAlignment" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>
@@ -55,6 +55,5 @@
5555
<element name="noCssClasses" type="text" selector="(//div[@data-role='row'])[{{arg1}}]/div[not(@class)]" parameterized="true"/>
5656
<element name="margins" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
5757
<element name="padding" type="text" selector="(//div[@data-role='row']/div)[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
58-
<element name="blockContent" type="text" selector="//div[@data-role='block']//div[contains(@class,'block-static-block')]"/>
5958
</section>
6059
</sections>

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

Lines changed: 16 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
<description value="Verify that Static Block is refactor and new Block preview is applied."/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-2278"/>
19+
<useCaseId value="MC-1420"/>
1920
<group value="pagebuilder"/>
2021
<group value="pagebuilder-block"/>
2122
</annotations>
2223
<before>
2324
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24-
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilderSetting"/>
2525
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2626
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2727
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
@@ -41,10 +41,11 @@
4141
<argument name="contentType" value="PageBuilderBlockContentType"/>
4242
</actionGroup>
4343
<actionGroup ref="closeEditPanelSettings" stepKey="closeSlideEditPanel"/>
44-
<seeElement selector="{{BlockOnStage.status('Empty Block')}}" stepKey="seeEmptyBlockPlaceHolder"/>
44+
<waitForElementVisible selector="{{BlockOnStage.status('Empty Block')}}" stepKey="seeEmptyBlockPlaceHolder"/>
4545
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
4646
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
4747
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
48+
<waitForPageLoad stepKey="waitForPageLoad"/>
4849
<dontSeeElement selector="{{BlockOnStorefront.blockContent}}" stepKey="seeBlockContentOnCmsStage"/>
4950
</test>
5051
<test name="AddBlockToCmsPage">
@@ -61,7 +62,6 @@
6162
</annotations>
6263
<before>
6364
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
64-
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilderSetting"/>
6565
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
6666
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
6767
</before>
@@ -79,24 +79,22 @@
7979
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
8080
<argument name="contentType" value="PageBuilderBlockContentType"/>
8181
</actionGroup>
82-
<seeElement selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
82+
<waitForElementVisible selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
8383
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
8484
<argument name="block" value="$$createPreReqBlock$$"/>
8585
</actionGroup>
86-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
8786
<seeElement selector="{{BlockOnForm.title('$$createPreReqBlock.title$$')}}" stepKey="seeBlockTitleOnForm"/>
8887
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
8988
<actionGroup ref="verifyBlockOnStage" stepKey="verifyBlockOnStage">
90-
<argument name="contentType" value="PageBuilderBlockContentType"/>
9189
<argument name="block" value="$$createPreReqBlock$$"/>
9290
</actionGroup>
9391
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
9492
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
9593
<actionGroup ref="verifyBlockOnStage" stepKey="verifyBlockOnStageAfterSave">
96-
<argument name="contentType" value="PageBuilderBlockContentType"/>
9794
<argument name="block" value="$$createPreReqBlock$$"/>
9895
</actionGroup>
9996
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
97+
<waitForPageLoad stepKey="waitForPageLoad"/>
10098
<see userInput="$$createPreReqBlock.content$$" stepKey="seeBlockContentOnCmsStage"/>
10199
</test>
102100
<test name="BlockGetUpdated">
@@ -113,14 +111,14 @@
113111
</annotations>
114112
<before>
115113
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
116-
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilderSetting"/>
117114
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
118115
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
119116
<createData entity="_defaultBlock" stepKey="createPreReqBlock" />
120117
</before>
121118
<after>
122119
<deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" />
123120
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
121+
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
124122
<actionGroup ref="logout" stepKey="logout"/>
125123
</after>
126124
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCmsPage1">
@@ -132,23 +130,22 @@
132130
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
133131
<argument name="contentType" value="PageBuilderBlockContentType"/>
134132
</actionGroup>
135-
<seeElement selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
133+
<waitForElementVisible selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
136134
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
137135
<argument name="block" value="$$createPreReqBlock$$"/>
138136
</actionGroup>
139-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
140-
<seeElement selector="{{BlockOnForm.title('$$createPreReqBlock.title$$')}}" stepKey="seeBlockTitleOnForm"/>
137+
<waitForElementVisible selector="{{BlockOnForm.title('$$createPreReqBlock.title$$')}}" stepKey="seeBlockTitleOnForm"/>
141138
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
142139
<!-- Validate Stage -->
143140
<comment userInput="Validate stage" stepKey="validateStage1" />
144141
<actionGroup ref="verifyBlockOnStage" stepKey="verifyBlockOnStage">
145-
<argument name="contentType" value="PageBuilderBlockContentType"/>
146142
<argument name="block" value="$$createPreReqBlock$$"/>
147143
</actionGroup>
148144
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
149145
<!-- Validate Storefront -->
150146
<comment userInput="Validate storefront" stepKey="validateStorefront1" />
151147
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage1"/>
148+
<waitForPageLoad stepKey="waitForPageLoad"/>
152149
<see userInput="$$createPreReqBlock.content$$" stepKey="seeBlockContentOnCmsStage"/>
153150
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCmsBlock">
154151
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
@@ -173,6 +170,7 @@
173170
<!-- Validate Storefront -->
174171
<comment userInput="Validate storefront after updating block" stepKey="validateStorefront2" />
175172
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
173+
<waitForPageLoad stepKey="waitForPageLoad1"/>
176174
<waitForElementVisible selector="{{HtmlOnStorefront.base('1')}}" stepKey="waitForHtmlBaseStorefront"/>
177175
<waitForElementVisible selector="{{BlockOnStorefront.html('1')}}" stepKey="waitForHtmlStorefront"/>
178176
</test>
@@ -209,11 +207,10 @@
209207
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
210208
<argument name="contentType" value="PageBuilderBlockContentType"/>
211209
</actionGroup>
212-
<seeElement selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
210+
<waitForElementVisible selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
213211
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
214212
<argument name="block" value="$$createPreReqBlock$$"/>
215213
</actionGroup>
216-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
217214
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
218215
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
219216

@@ -230,18 +227,19 @@
230227
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToCreatedCMSPageAfterDisablingBlock">
231228
<argument name="CMSPage" value="$$createCMSPage$$" />
232229
</actionGroup>
233-
<seeElement selector="{{BlockOnStage.status('Block disabled')}}" stepKey="seeDisabledBlockPlaceholder" />
230+
<waitForElementVisible selector="{{BlockOnStage.status('Block disabled')}}" stepKey="seeDisabledBlockPlaceholder" />
234231

235232
<!-- Go to CMS page on storefront and assert disabled block does not exist on page -->
236233
<comment userInput="Go to CMS page on storefront and assert disabled block does not exist on page" stepKey="commentAssertDisabledBlockMissingOnStorefront" />
237234
<amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnStorefrontCMSPage" />
235+
<waitForPageLoad stepKey="waitForPageLoad"/>
238236
<dontSeeElement selector="{{BlockOnStorefront.base('1')}}" stepKey="doNotSeeBlockElementOnStorefront" />
239237
</test>
240238
<test name="BlockDelete">
241239
<annotations>
242240
<features value="PageBuilder"/>
243241
<stories value="Block"/>
244-
<title value="Block - Delete Block"/>
242+
<title value="Delete Block"/>
245243
<description value="A user should be able to delete an Block content type. Verify on Stage amd Storefront."/>
246244
<severity value="CRITICAL"/>
247245
<testCaseId value="MC-2848"/>
@@ -280,23 +278,19 @@
280278
<annotations>
281279
<features value="PageBuilder"/>
282280
<stories value="Block"/>
283-
<title value="Block - Displaying deleted block on Stage"/>
281+
<title value="Displaying deleted block on Stage"/>
284282
<description value="A user should be able to see that block is deleted on Stage."/>
285283
<severity value="CRITICAL"/>
286284
<useCaseId value="MC-1420"/>
287285
<testCaseId value="MC-2420"/>
288286
<group value="pagebuilder"/>
289287
<group value="pagebuilder-block"/>
290-
<group value="pagebuilder-customBeforeAfter"/>
291288
</annotations>
292289
<before>
293290
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
294-
<actionGroup ref="EnabledWYSIWYG" stepKey="enableWYSIWYG"/>
295-
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilderSetting" />
296291
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />
297292
</before>
298293
<after>
299-
<actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
300294
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
301295
<actionGroup ref="logout" stepKey="logout"/>
302296
</after>
@@ -322,7 +316,7 @@
322316
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive2">
323317
<argument name="group" value="PageBuilderBlockContentType"/>
324318
</actionGroup>
325-
<seeElement selector="{{BlockOnStage.deleted('$createPreReqBlock.id$')}}" stepKey="seeDeletedBlockPlaceHolder"/>
319+
<waitForElementVisible selector="{{BlockOnStage.deleted('$createPreReqBlock.id$')}}" stepKey="seeDeletedBlockPlaceHolder"/>
326320
</test>
327321
<test name="BlockValidateAdvancedConfigurationDefaultValues">
328322
<annotations>
@@ -358,14 +352,9 @@
358352
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
359353
<argument name="contentType" value="PageBuilderBlockContentType"/>
360354
</actionGroup>
361-
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
362-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
363-
<argument name="contentType" value="PageBuilderBlockContentType"/>
364-
</actionGroup>
365355
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
366356
<argument name="block" value="$$createPreReqBlock$$"/>
367357
</actionGroup>
368-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
369358
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
370359
<!-- Validate Default Values -->
371360
<comment userInput="Validate Default Values" stepKey="CommentValidateDefaultValues"/>
@@ -496,14 +485,9 @@
496485
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
497486
<argument name="contentType" value="PageBuilderBlockContentType"/>
498487
</actionGroup>
499-
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
500-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
501-
<argument name="contentType" value="PageBuilderBlockContentType"/>
502-
</actionGroup>
503488
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
504489
<argument name="block" value="$$createPreReqBlock$$"/>
505490
</actionGroup>
506-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
507491
<actionGroup ref="expandConfigurationSection" stepKey="expandConfigurationSection"/>
508492
<!-- Update Values -->
509493
<comment userInput="Update Values" stepKey="commentUpdateValues"/>

0 commit comments

Comments
 (0)