Skip to content

Commit 419bf98

Browse files
dhaeckerdhaecker
committed
PB-365: Templates MFTF Test Coverage
- Adding more template tests - Fixing date assertions in grid
1 parent 0c6525e commit 419bf98

File tree

4 files changed

+225
-12
lines changed

4 files changed

+225
-12
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,14 @@
214214
<waitForElementNotVisible time="1" selector="{{PageBuilderStage.modalOk}}" stepKey="waitForModalHide" />
215215
<waitForPageLoad stepKey="waitForPageLoad2"/>
216216
</actionGroup>
217+
<actionGroup name="closeConfirmModal">
218+
<waitForElementVisible time="10" selector="{{PageBuilderStage.modal}}" stepKey="waitForModal"/>
219+
<seeElement selector="{{PageBuilderStage.modal}}" stepKey="seeRemovalModal"/>
220+
<waitForElementVisible time="10" selector="{{PageBuilderStage.modalCancel}}" stepKey="waitForModalCancel"/>
221+
<click selector="{{PageBuilderStage.modalCancel}}" stepKey="clickCloseModal"/>
222+
<waitForPageLoad stepKey="waitForPageLoad2"/>
223+
<waitForElementNotVisible time="1" selector="{{PageBuilderStage.modal}}" stepKey="waitForModalHide"/>
224+
</actionGroup>
217225
<actionGroup name="validateOnHoverOptionMenu">
218226
<arguments>
219227
<argument name="contentType"/>

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

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,17 @@
4848
<waitForPageLoad stepKey="waitForModalClose"/>
4949
<waitForElementVisible selector="{{PageBuilderSaveTemplateConfirmationModal.modal}}" stepKey="waitForConfirmationModal"/>
5050
</actionGroup>
51+
<actionGroup name="clickCloseOnPageBuilderSaveTemplateConfirmationModal">
52+
<arguments>
53+
<argument name="baseContent" defaultValue="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" type="string"/>
54+
</arguments>
55+
<waitForPageLoad stepKey="waitForModal"/>
56+
<waitForElementVisible selector="{{PageBuilderSaveTemplateConfirmationModal.closeButton}}" stepKey="waitForCloseButton"/>
57+
<click selector="{{PageBuilderSaveTemplateConfirmationModal.closeButton}}" stepKey="clickCloseButton"/>
58+
<waitForPageLoad stepKey="waitForModalGone"/>
59+
<waitForElementNotVisible time="5" selector="{{PageBuilderSaveTemplateConfirmationModal.modal}}" stepKey="waitForModalNotVisible"/>
60+
<waitForElementVisible time="10" selector="{{baseContent}}" stepKey="waitForContentUnderModalVisible"/>
61+
</actionGroup>
5162
<actionGroup name="savePageBuilderTemplate">
5263
<arguments>
5364
<argument name="baseContent" defaultValue="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" type="string"/>
@@ -171,17 +182,13 @@
171182
<waitForPageLoad stepKey="waitForFilterOnGrid"/>
172183
<waitForElementVisible selector="{{PageBuilderTemplateGridFilter.clearFilters}}" stepKey="waitForClearFilters2"/>
173184
</actionGroup>
174-
<actionGroup name="clearFiltersPageBuilderTemplateGrid">
175-
<conditionalClick selector="{{PageBuilderTemplateGridFilter.clearFilters}}" dependentSelector="{{PageBuilderTemplateGridFilter.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
176-
<waitForPageLoad stepKey="waitForClearFilters"/>
177-
<dontSeeElement selector="{{PageBuilderTemplateGridFilter.clearFilters}}" stepKey="dontSeeClearFilters"/>
178-
</actionGroup>
179185
<actionGroup name="validatePageBuilderTemplateDataInGrid">
180186
<arguments>
181187
<argument name="section" defaultValue="PageBuilderTemplatePageGrid"/>
182188
<argument name="templateName" defaultValue="{{PageBuilderTemplateNameRandom.name}}" type="string"/>
183189
<argument name="createdFor" defaultValue="{{PageBuilderTemplateCreatedFor.any}}" type="string"/>
184190
<argument name="createdDate" defaultValue="" type="string"/>
191+
<argument name="createdDateAMorPM" defaultValue="" type="string"/>
185192
<argument name="rowIndex" defaultValue="1" type="string"/>
186193
</arguments>
187194
<waitForPageLoad stepKey="waitForGridLoad"/>
@@ -204,6 +211,7 @@
204211
<see userInput="{{templateName}}" selector="{{section.templateName(rowIndex)}}" stepKey="seeTemplateName"/>
205212
<see userInput="{{createdFor}}" selector="{{section.createdFor(rowIndex)}}" stepKey="seeCreatedFor"/>
206213
<see userInput="{{createdDate}}" selector="{{section.createdDate(rowIndex)}}" stepKey="seeCreatedDate"/>
214+
<see userInput="{{createdDateAMorPM}}" selector="{{section.createdDate(rowIndex)}}" stepKey="seeCreatedDateAMorPM"/>
207215
</actionGroup>
208216
<actionGroup name="validatePageBuilderTemplateEmptyGrid">
209217
<arguments>
@@ -236,6 +244,11 @@
236244
<see userInput="{{templateIdentifier}}" selector="{{PageBuilderTemplatePageGrid.templateName('1')}}" stepKey="seeTemplateName"/>
237245
<dontSeeElementInDOM selector="{{PageBuilderTemplatePageGrid.deleteButton(templateIdentifier)}}" stepKey="dontSeeDeleteTemplateButton"/>
238246
</actionGroup>
239-
<!-- todo: search by keyword in grid-->
247+
<!-- todo: not used yet-->
248+
<actionGroup name="clearFiltersPageBuilderTemplateGrid">
249+
<conditionalClick selector="{{PageBuilderTemplateGridFilter.clearFilters}}" dependentSelector="{{PageBuilderTemplateGridFilter.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
250+
<waitForPageLoad stepKey="waitForClearFilters"/>
251+
<dontSeeElement selector="{{PageBuilderTemplateGridFilter.clearFilters}}" stepKey="dontSeeClearFilters"/>
252+
</actionGroup>
240253
<!-- todo: actiongroup descriptions-->
241254
</actionGroups>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<element name="modal" type="text" selector="//aside[contains(@class,'template-manager-save')]"/>
1313
<element name="activeModal" type="text" selector="//aside[contains(@class,'template-manager-save') and contains(@class,'_show')]"/>
1414
<element name="title" type="text" selector="//aside[contains(@class,'template-manager-save') and contains(@class,'_show')]//header//h1"/>
15-
<element name="closeButton" type="button" selector="//aside[contains(@class,'template-manager-save') and contains(@class,'_show')]//header//button[contains(@class,'action-close')]//span[.='Close']"/>
15+
<element name="closeButton" type="button" selector="//aside[contains(@class,'template-manager-save') and contains(@class,'_show')]//header//button[contains(@class,'action-close')]"/>
1616
<element name="previewImage" type="text" selector="//aside[contains(@class,'template-manager-save') and contains(@class,'_show')]//*[@data-role='content']//form//img[@alt='Template Preview']"/>
1717
<element name="templateNameInput" type="text" selector="//aside[contains(@class,'template-manager-save') and contains(@class,'_show')]//*[@data-role='content']//form//input[@name='name']"/>
1818
<element name="createdForSelect" type="text" selector="//aside[contains(@class,'template-manager-save') and contains(@class,'_show')]//*[@data-role='content']//form//select[@name='created_for']"/>
@@ -23,15 +23,15 @@
2323
<section name="PageBuilderSaveTemplateConfirmationModal">
2424
<element name="modal" type="text" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]"/>
2525
<element name="title" type="text" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//header//h1"/>
26-
<element name="closeButton" type="button" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//header//button[contains(@class,'action-close')]//span[.='Close']"/>
26+
<element name="closeButton" type="button" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//header//button[contains(@class,'action-close')]"/>
2727
<element name="message" type="text" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//*[@data-role='content']//*"/>
2828
<element name="okButton" type="button" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//footer//button//span[.='OK']"/>
2929
</section>
3030
<section name="PageBuilderApplyTemplateSlideOut">
3131
<element name="slideOut" type="text" selector="//aside[contains(@class,'pagebuilder_stage_template_pagebuilder_stage_template_modal')]"/>
3232
<element name="activeSlideOut" type="text" selector="//aside[contains(@class,'pagebuilder_stage_template_pagebuilder_stage_template_modal') and contains(@class,'_show')]"/>
3333
<element name="title" type="text" selector="//aside[contains(@class,'pagebuilder_stage_template_pagebuilder_stage_template_modal')]//header//h1"/>
34-
<element name="closeButton" type="text" selector="//aside[contains(@class,'pagebuilder_stage_template_pagebuilder_stage_template_modal')]//header//button[contains(@class,'action-close')]//span[.='Close']"/>
34+
<element name="closeButton" type="text" selector="//aside[contains(@class,'pagebuilder_stage_template_pagebuilder_stage_template_modal')]//header//button[contains(@class,'action-close')]"/>
3535
</section>
3636
<section name="PageBuilderApplyTemplateGrid">
3737
<element name="base" type="text" selector="//table[@data-role='grid']"/>
@@ -71,7 +71,7 @@
7171
<section name="PageBuilderDeleteTemplateConfirmationModal">
7272
<element name="modal" type="text" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]"/>
7373
<element name="title" type="text" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//header//h1"/>
74-
<element name="closeButton" type="button" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//header//button[contains(@class,'action-close')]//span[.='Close']"/>
74+
<element name="closeButton" type="button" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//header//button[contains(@class,'action-close')]"/>
7575
<element name="message" type="text" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//*[@data-role='content']//*"/>
7676
<element name="okButton" type="button" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//footer//button//span[.='OK']"/>
7777
<element name="cancelButton" type="button" selector="//aside[contains(@class,'confirm') and contains(@class,'_show')]//footer//button//span[.='Cancel']"/>

0 commit comments

Comments
 (0)