Skip to content

Commit 722ef8d

Browse files
dhaeckerdhaecker
committed
PB-365: Templates MFTF Test Coverage
- Addressing CR feedback
1 parent a02474c commit 722ef8d

File tree

6 files changed

+42
-40
lines changed

6 files changed

+42
-40
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@
218218
<annotations>
219219
<description>Closes the confirmation modal on the Page Builder stage.</description>
220220
</annotations>
221-
<waitForElementVisible time="10" selector="{{PageBuilderStage.modal}}" stepKey="waitForModal"/>
222-
<seeElement selector="{{PageBuilderStage.modal}}" stepKey="seeRemovalModal"/>
223-
<waitForElementVisible time="10" selector="{{PageBuilderStage.modalCancel}}" stepKey="waitForModalCancel"/>
224-
<click selector="{{PageBuilderStage.modalCancel}}" stepKey="clickCloseModal"/>
225-
<waitForPageLoad stepKey="waitForPageLoad2"/>
226-
<waitForElementNotVisible time="1" selector="{{PageBuilderStage.modal}}" stepKey="waitForModalHide"/>
221+
<waitForElementVisible time="10" selector="{{PageBuilderStage.modal}}" stepKey="waitForModalVisible"/>
222+
<seeElement selector="{{PageBuilderStage.modal}}" stepKey="seeModal"/>
223+
<waitForElementVisible time="10" selector="{{PageBuilderStage.modalCancel}}" stepKey="waitForModalCancelButton"/>
224+
<click selector="{{PageBuilderStage.modalCancel}}" stepKey="clickCancelButton"/>
225+
<waitForPageLoad stepKey="waitForModalClose"/>
226+
<waitForElementNotVisible time="1" selector="{{PageBuilderStage.modal}}" stepKey="waitForModalNotVisible"/>
227227
</actionGroup>
228228
<actionGroup name="validateOnHoverOptionMenu">
229229
<arguments>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@
182182
<argument name="pageBuilderArea" defaultValue="" type="string"/>
183183
</arguments>
184184
<waitForPageLoad stepKey="waitForStageLoad"/>
185+
<waitForElementVisible selector="{{RowOnStage.empty(rowIndex)}}" stepKey="waitForEmptyRow"/>
185186
<seeElement selector="{{RowOnStage.empty(rowIndex)}}" stepKey="seeEmptyRow"/>
186187
<seeNumberOfElements userInput="1" selector="{{pageBuilderArea}}{{RowOnStage.allRows}}" stepKey="seeOnlyOneRow"/>
187188
</actionGroup>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
<argument name="totalCreatedForOptions" defaultValue="5" type="string"/>
129129
</arguments>
130130
<waitForPageLoad stepKey="waitForModalLoad"/>
131+
<waitForElementVisible selector="{{PageBuilderSaveTemplateModal.previewImage}}" stepKey="waitForImageLoad"/>
131132
<see userInput="Save Content as Template" selector="{{PageBuilderSaveTemplateModal.title}}" stepKey="seeTitle"/>
132133
<seeElement selector="{{PageBuilderSaveTemplateModal.closeButton}}" stepKey="seeCloseButton"/>
133134
<seeElement selector="{{PageBuilderSaveTemplateModal.previewImage}}" stepKey="seePreview"/>
@@ -510,10 +511,10 @@
510511
<arguments>
511512
<argument name="section" defaultValue="PageBuilderTemplatesPageGrid"/>
512513
</arguments>
513-
<waitForPageLoad stepKey="waitForGridLoad1"/>
514+
<waitForPageLoad stepKey="waitForGridLoad"/>
514515
<waitForElementVisible selector="{{section.nextPageButton}}" stepKey="waitForNextPageButton"/>
515516
<click selector="{{section.nextPageButton}}" stepKey="clickNextPageButton"/>
516-
<waitForPageLoad stepKey="waitForGridLoad2"/>
517+
<waitForPageLoad stepKey="waitForNextPage"/>
517518
</actionGroup>
518519
<actionGroup name="clickPreviousPageOnPageBuilderTemplateGrid">
519520
<annotations>
@@ -525,6 +526,6 @@
525526
<waitForPageLoad stepKey="waitForGridLoad1"/>
526527
<waitForElementVisible selector="{{section.previousPageButton}}" stepKey="waitForPreviousPageButton"/>
527528
<click selector="{{section.previousPageButton}}" stepKey="clickPreviousPageButton"/>
528-
<waitForPageLoad stepKey="waitForGridLoad2"/>
529+
<waitForPageLoad stepKey="waitForPreviousPage"/>
529530
</actionGroup>
530531
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<!-- Template Name -->
12-
<entity name="PageBuilderTemplateNameRandom" type="pagebuilder_template_name_property">
12+
<entity name="PageBuilderTemplateNameRandom" type="pagebuilder_template_name">
1313
<data key="name" unique="suffix">MFTF Template</data>
1414
</entity>
15-
<entity name="PageBuilderTemplateNameRandom2" type="pagebuilder_template_name_property">
15+
<entity name="PageBuilderTemplateNameRandom2" type="pagebuilder_template_name">
1616
<data key="name" unique="suffix">MFTF Second Template</data>
1717
</entity>
18-
<entity name="PageBuilderTemplateName_Sorting" type="pagebuilder_template_name_property">
18+
<entity name="PageBuilderTemplateName_Sorting" type="pagebuilder_template_name_sort">
1919
<data key="0">sorting_0</data>
2020
<data key="999">sorting_999</data>
2121
<data key="aaa">sorting_aaa</data>
2222
<data key="A">sorting_A</data>
2323
<data key="zzz">sorting_zzz</data>
2424
<data key="Z">sorting_Z</data>
2525
</entity>
26-
<entity name="PageBuilderTemplateName_EdgeCases" type="pagebuilder_template_name_property">
26+
<entity name="PageBuilderTemplateName_EdgeCases" type="pagebuilder_template_name_edge_case">
2727
<data key="empty"/>
2828
<data key="leadingSpace"> leadingSpaceTest</data>
2929
<data key="noLeadingSpace">leadingSpaceTest</data>
@@ -32,7 +32,7 @@
3232
<data key="specialCharacters">./;[]\-=&lt;&gt;?:"{}|_+!@#$%^&amp;*()`~Ω≈ç√∫˜µ≤≥÷åß∂ƒ©˙∆˚¬…æœ∑´®†¥¨ˆøπ“‘¡™£¢∞§¶•ªº–≠¸˛Ç◊ı˜Â¯˘¿ÅÍÎÏ˝ÓÔÒÚÆ☃Œ„´‰ˇÁ¨ˆØ∏”’`⁄€‹›fifl‡°·‚—±⅛⅜⅝⅞ЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюя٠١٢٣٤٥٦٧٨٩ヽ</data>
3333
</entity>
3434
<!-- Template Created For -->
35-
<entity name="PageBuilderTemplateCreatedFor" type="pagebuilder_template_created_for_property">
35+
<entity name="PageBuilderTemplateCreatedFor" type="pagebuilder_template_created_for">
3636
<data key="any">Any</data>
3737
<data key="page">Page</data>
3838
<data key="product">Product</data>
@@ -41,7 +41,7 @@
4141
<data key="dynamicBlock">Dynamic Block</data>
4242
</entity>
4343
<!-- Template Grid -->
44-
<entity name="PageBuilderTemplateGridColumns" type="pagebuilder_template_grid_property">
44+
<entity name="PageBuilderTemplateGridColumns" type="pagebuilder_template_grid_column_header">
4545
<data key="id">ID</data>
4646
<data key="previewImage">Preview Image</data>
4747
<data key="templateName">Template Name</data>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<section name="PageBuilderTemplatesPageGrid">
5656
<!-- Filter -->
5757
<element name="searchByKeyword" type="input" selector="[data-bind*=pagebuilder_template_grid] #fulltext"/>
58-
<element name="searchByKeywordButton" type="button" selector="[data-bind*=pagebuilder_template_grid] .action-submit"/>
58+
<element name="searchByKeywordButton" type="button" selector="[data-bind*=pagebuilder_template_grid] .data-grid-search-control-wrap .action-submit"/>
5959
<element name="clearFilters" type="button" selector="//*[contains(@data-bind,'pagebuilder_template_grid')]//*[contains(@class,'admin__data-grid-header')]//button[@data-action='grid-filter-reset' and text()='Clear all']"/>
6060
<element name="filters" type="button" selector="//*[contains(@data-bind,'pagebuilder_template_grid')]//*[contains(@class,'admin__data-grid-header')]//button[@data-action='grid-filter-expand' and text()='Filters']"/>
6161
<element name="applyFilters" type="button" selector="//*[contains(@data-bind,'pagebuilder_template_grid')]//*[contains(@class,'admin__data-grid-header')]//button[@data-action='grid-filter-apply']//span[text()='Apply Filters']"/>
@@ -87,7 +87,7 @@
8787
<section name="PageBuilderApplyTemplatesGrid">
8888
<!-- Filter -->
8989
<element name="searchByKeyword" type="input" selector=".pagebuilder_stage_template_pagebuilder_stage_template_modal_pagebuilder_stage_template_grid #fulltext"/>
90-
<element name="searchByKeywordButton" type="button" selector=".pagebuilder_stage_template_pagebuilder_stage_template_modal_pagebuilder_stage_template_grid .action-submit"/>
90+
<element name="searchByKeywordButton" type="button" selector=".pagebuilder_stage_template_pagebuilder_stage_template_modal_pagebuilder_stage_template_grid .data-grid-search-control-wrap .action-submit"/>
9191
<element name="clearFilters" type="button" selector="//*[contains(@class,'pagebuilder_stage_template_pagebuilder_stage_template_modal_pagebuilder_stage_template_grid')]//*[contains(@class,'admin__data-grid-header')]//button[@data-action='grid-filter-reset' and text()='Clear all']"/>
9292
<element name="filters" type="button" selector="//*[contains(@class,'pagebuilder_stage_template_pagebuilder_stage_template_modal_pagebuilder_stage_template_grid')]//*[contains(@class,'admin__data-grid-header')]//button[@data-action='grid-filter-expand' and text()='Filters']"/>
9393
<element name="applyFilters" type="button" selector="//*[contains(@class,'pagebuilder_stage_template_pagebuilder_stage_template_modal_pagebuilder_stage_template_grid')]//*[contains(@class,'admin__data-grid-header')]//button[@data-action='grid-filter-apply']//span[text()='Apply Filters']"/>

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<!-- Save Template -->
4040
<actionGroup ref="openPageBuilderSaveTemplateModal" stepKey="openPageBuilderSaveTemplateModal"/>
4141
<actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateForm"/>
42-
<generateDate date="now" format="M d, Y g:i" stepKey="today"/>
42+
<generateDate date="now" format="M d, Y g:" stepKey="today"/>
4343
<generateDate date="now" format="A" stepKey="todayAMorPM"/>
4444
<actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate"/>
4545
<!-- Verify Info on Apply Template Slide Out -->
@@ -142,6 +142,9 @@
142142
<argument name="role" value="rolePageBuilderTemplates"/>
143143
</actionGroup>
144144
<actionGroup ref="logout" stepKey="logout"/>
145+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsCreatedUser">
146+
<argument name="adminUser" value="NewAdminUser"/>
147+
</actionGroup>
145148
</before>
146149
<after>
147150
<actionGroup ref="logout" stepKey="logout"/>
@@ -158,13 +161,10 @@
158161
<actionGroup ref="logout" stepKey="logout2"/>
159162
</after>
160163
<!-- Verify Successful Navigation to Templates Page -->
161-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin">
162-
<argument name="adminUser" value="NewAdminUser"/>
163-
</actionGroup>
164164
<actionGroup ref="navigateToPageBuilderTemplatesGridPage" stepKey="navigateToPageBuilderTemplatesGridPage"/>
165165
<actionGroup ref="logout" stepKey="logout"/>
166166
<!-- Change User Role -->
167-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
167+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
168168
<actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="AdminOpenUserEditPageActionGroup">
169169
<argument name="user" value="NewAdminUser"/>
170170
</actionGroup>
@@ -175,7 +175,7 @@
175175
<actionGroup ref="AssertAdminUserSaveMessageActionGroup" stepKey="AssertAdminUserSaveMessageActionGroup"/>
176176
<actionGroup ref="logout" stepKey="logout2"/>
177177
<!-- Verify Unsuccessful Navigation to Templates Page -->
178-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin3">
178+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsCreatedUser">
179179
<argument name="adminUser" value="NewAdminUser"/>
180180
</actionGroup>
181181
<actionGroup ref="verifyCannotNavigateToPageBuilderTemplatesGridPage" stepKey="verifyCannotNavigateToPageBuilderTemplatesGridPage"/>
@@ -203,6 +203,9 @@
203203
<argument name="role" value="rolePageBuilderSaveTemplates"/>
204204
</actionGroup>
205205
<actionGroup ref="logout" stepKey="logout"/>
206+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsCreatedUser">
207+
<argument name="adminUser" value="NewAdminUser"/>
208+
</actionGroup>
206209
</before>
207210
<after>
208211
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
@@ -224,16 +227,13 @@
224227
<actionGroup ref="logout" stepKey="logout2"/>
225228
</after>
226229
<!-- Verify Can Save Template -->
227-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin">
228-
<argument name="adminUser" value="NewAdminUser"/>
229-
</actionGroup>
230230
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
231231
<argument name="CMSPage" value="$$createCMSPage$$"/>
232232
</actionGroup>
233233
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
234234
<actionGroup ref="openPageBuilderSaveTemplateModal" stepKey="openPageBuilderSaveTemplateModal"/>
235235
<actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateForm"/>
236-
<generateDate date="now" format="M d, Y g:i" stepKey="today"/>
236+
<generateDate date="now" format="M d, Y g:" stepKey="today"/>
237237
<generateDate date="now" format="A" stepKey="todayAMorPM"/>
238238
<actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate"/>
239239
<!-- Verify Info on Template Grid Page -->
@@ -248,7 +248,7 @@
248248
</actionGroup>
249249
<actionGroup ref="logout" stepKey="logout"/>
250250
<!-- Change User Role -->
251-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
251+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
252252
<actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="AdminOpenUserEditPageActionGroup">
253253
<argument name="user" value="NewAdminUser"/>
254254
</actionGroup>
@@ -259,7 +259,7 @@
259259
<actionGroup ref="AssertAdminUserSaveMessageActionGroup" stepKey="AssertAdminUserSaveMessageActionGroup"/>
260260
<actionGroup ref="logout" stepKey="logout2"/>
261261
<!-- Verify Cannot Save Template -->
262-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin3">
262+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsCreatedUser">
263263
<argument name="adminUser" value="NewAdminUser"/>
264264
</actionGroup>
265265
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage2">
@@ -305,6 +305,9 @@
305305
<actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateForm"/>
306306
<actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate"/>
307307
<actionGroup ref="logout" stepKey="logout"/>
308+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsCreatedUser">
309+
<argument name="adminUser" value="NewAdminUser"/>
310+
</actionGroup>
308311
</before>
309312
<after>
310313
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
@@ -326,9 +329,6 @@
326329
<actionGroup ref="logout" stepKey="logout2"/>
327330
</after>
328331
<!-- Verify Can Apply Template -->
329-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin">
330-
<argument name="adminUser" value="NewAdminUser"/>
331-
</actionGroup>
332332
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
333333
<argument name="CMSPage" value="$$createCMSPage$$"/>
334334
</actionGroup>
@@ -346,7 +346,7 @@
346346
<seeElement selector="{{ButtonItemOnStage.emptyButtonItemElement('1')}}" stepKey="seeEmptyButton"/>
347347
<actionGroup ref="logout" stepKey="logout"/>
348348
<!-- Change User Role -->
349-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
349+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
350350
<actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="AdminOpenUserEditPageActionGroup">
351351
<argument name="user" value="NewAdminUser"/>
352352
</actionGroup>
@@ -357,7 +357,7 @@
357357
<actionGroup ref="AssertAdminUserSaveMessageActionGroup" stepKey="AssertAdminUserSaveMessageActionGroup"/>
358358
<actionGroup ref="logout" stepKey="logout2"/>
359359
<!-- Verify Cannot Apply Template -->
360-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin3">
360+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsCreatedUser">
361361
<argument name="adminUser" value="NewAdminUser"/>
362362
</actionGroup>
363363
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage2">
@@ -401,6 +401,9 @@
401401
</actionGroup>
402402
<actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate2"/>
403403
<actionGroup ref="logout" stepKey="logout"/>
404+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsCreatedUser">
405+
<argument name="adminUser" value="NewAdminUser"/>
406+
</actionGroup>
404407
</before>
405408
<after>
406409
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
@@ -426,9 +429,6 @@
426429
<actionGroup ref="logout" stepKey="logout2"/>
427430
</after>
428431
<!-- Verify Can Delete Template -->
429-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin">
430-
<argument name="adminUser" value="NewAdminUser"/>
431-
</actionGroup>
432432
<actionGroup ref="navigateToPageBuilderTemplatesGridPage" stepKey="navigateToPageBuilderTemplatesGridPage"/>
433433
<actionGroup ref="clearFiltersPageBuilderTemplateGrid" stepKey="clearFiltersPageBuilderTemplateGrid"/>
434434
<actionGroup ref="searchByKeywordPageBuilderTemplateGrid" stepKey="searchByKeywordPageBuilderTemplateGrid"/>
@@ -439,7 +439,7 @@
439439
<actionGroup ref="validatePageBuilderTemplateEmptyGrid" stepKey="validatePageBuilderTemplateEmptyGrid"/>
440440
<actionGroup ref="logout" stepKey="logout"/>
441441
<!-- Change User Role -->
442-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
442+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
443443
<actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="AdminOpenUserEditPageActionGroup">
444444
<argument name="user" value="NewAdminUser"/>
445445
</actionGroup>
@@ -450,7 +450,7 @@
450450
<actionGroup ref="AssertAdminUserSaveMessageActionGroup" stepKey="AssertAdminUserSaveMessageActionGroup"/>
451451
<actionGroup ref="logout" stepKey="logout2"/>
452452
<!-- Verify Cannot Delete Template -->
453-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin3">
453+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsCreatedUser">
454454
<argument name="adminUser" value="NewAdminUser"/>
455455
</actionGroup>
456456
<actionGroup ref="navigateToPageBuilderTemplatesGridPage" stepKey="navigateToPageBuilderTemplatesGridPage2"/>
@@ -693,7 +693,7 @@
693693
<actionGroup ref="fillPageBuilderSaveTemplateForm" stepKey="fillPageBuilderSaveTemplateFormCommonCharacters">
694694
<argument name="templateName" value="{{PageBuilderTemplateName_EdgeCases.commonCharacters}}"/>
695695
</actionGroup>
696-
<generateDate date="now" format="M d, Y g:i" stepKey="today"/>
696+
<generateDate date="now" format="M d, Y g:" stepKey="today"/>
697697
<generateDate date="now" format="A" stepKey="todayAMorPM"/>
698698
<actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplateZeroCommonCharacters"/>
699699
<!-- Validate Common Characters Template -->

0 commit comments

Comments
 (0)