Skip to content

Commit 009e9ab

Browse files
dhaeckerdhaecker
committed
MC-3330: Add Missing P0-P1 MFTF Tests For PageBuilder On Catalog Category
 - Fixing PageBuilder Catalog Category tests - Renaming/consolidating files, tests, sections, actiongroups
1 parent 254adc1 commit 009e9ab

37 files changed

+2429
-2513
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,20 @@
2020
<waitForPageLoad stepKey="waitForPageBuilderToOpen"/>
2121
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderPanel.layoutMenuSection}}" stepKey="waiForPageBuilderVisible"/>
2222
</actionGroup>
23+
<actionGroup name="expandAdminCategorySection">
24+
<!-- Move to CE -->
25+
<arguments>
26+
<argument name="sectionSelector" defaultValue="{{AdminCategoryContentSection.sectionHeader}}" type="string"/>
27+
<argument name="sectionDependentSelector" defaultValue="{{AdminCategoryContentSection.uploadButton}}" type="string"/>
28+
</arguments>
29+
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
30+
<waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
31+
<conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
32+
<waitForPageLoad time="30" stepKey="waitForSectionToExpand"/>
33+
</actionGroup>
34+
<actionGroup name="saveCatalogCategory" extends="saveCategoryForm">
35+
<!-- Move to CE: Fix CE action group -->
36+
<waitForElementVisible selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="waitForSaveCategoryButton" before="saveCategory"/>
37+
<waitForPageLoad stepKey="waitForPageLoad" after="saveCategory"/>
38+
</actionGroup>
2339
</actionGroups>

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

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,18 @@
1212
<arguments>
1313
<argument name="baseContent" defaultValue="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" type="string"/>
1414
</arguments>
15-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
16-
<waitForElementVisible time="2" selector="{{EditPanelForm.editFormClose}}" stepKey="waitForCloseButton"/>
15+
<waitForPageLoad stepKey="waitForPageLoad"/>
16+
<waitForElementVisible time="5" selector="{{EditPanelForm.editFormClose}}" stepKey="waitForCloseButton"/>
1717
<click selector="{{EditPanelForm.editFormClose}}" stepKey="clickCloseButton"/>
18+
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
1819
<waitForElementNotVisible time="5" selector="{{EditPanelForm.editForm}}" stepKey="waitForEditFormNotVisible"/>
19-
<waitForElementVisible time="1" selector="{{baseContent}}" stepKey="waitForCmsPageSaveButton"/>
20+
<waitForElementVisible time="10" selector="{{baseContent}}" stepKey="waitForCmsPageSaveButton"/>
2021
</actionGroup>
2122
<actionGroup name="saveEditPanelSettings">
2223
<arguments>
2324
<argument name="baseContent" defaultValue="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" type="string"/>
2425
</arguments>
25-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
26+
<waitForPageLoad stepKey="waitForPageLoad"/>
2627
<waitForElementVisible time="5" selector="{{EditPanelForm.editFormSave}}" stepKey="waitForSaveButton"/>
2728
<click selector="{{EditPanelForm.editFormSave}}" stepKey="clickSaveButton"/>
2829
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
@@ -33,7 +34,7 @@
3334
<arguments>
3435
<argument name="property"/>
3536
</arguments>
36-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
37+
<waitForPageLoad stepKey="waitForPageLoad"/>
3738
<waitForElementVisible time="5" selector="{{EditPanelForm.editFormSave}}" stepKey="waitForColumnSaveButton"/>
3839
<click selector="{{EditPanelForm.editFormSave}}" stepKey="clickSaveColumn"/>
3940
<waitForElementVisible selector="{{EditPanelForm.panelFieldValidationError(property.section, property.fieldName)}}" stepKey="waitForErrorField"/>
@@ -45,14 +46,14 @@
4546
<argument name="form" defaultValue="EditPanelForm"/>
4647
<argument name="property"/>
4748
</arguments>
48-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
49+
<waitForPageLoad stepKey="waitForPageLoad"/>
4950
<waitForElementVisible time="5" selector="{{form.editFormSave}}" stepKey="waitForSaveButton"/>
5051
<click selector="{{form.editFormSave}}" stepKey="clickSaveButton"/>
5152
<waitForElementVisible selector="{{EditPanelForm.panelFieldValidationError(property.section, property.fieldName)}}" stepKey="waitForErrorField"/>
5253
<waitForElementVisible selector="{{EditPanelForm.panelFieldValidationErrorMessage(property.section, property.fieldName, property.errorMessage)}}" stepKey="waitForErrorMessage"/>
5354
</actionGroup>
5455
<actionGroup name="saveEditPanelSettingsFullScreen">
55-
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
56+
<waitForPageLoad stepKey="waitForPageLoad"/>
5657
<waitForElementVisible time="5" selector="{{EditPanelForm.editFormSave}}" stepKey="waitForColumnSaveButton" />
5758
<click selector="{{EditPanelForm.editFormSave}}" stepKey="clickSaveColumn"/>
5859
<waitForPageLoad stepKey="waitForSavePanelClose"/>
@@ -103,7 +104,7 @@
103104
<arguments>
104105
<argument name="property"/>
105106
</arguments>
106-
<waitForLoadingMaskToDisappear stepKey="waitForSpinner"/>
107+
<waitForPageLoad stepKey="waitForPageLoad"/>
107108
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
108109
<see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
109110
<fillField selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" userInput="{{property.value}}" stepKey="fillPropertyField"/>
@@ -130,19 +131,46 @@
130131
<argument name="selection" type="string"/>
131132
<argument name="newTab"/>
132133
</arguments>
133-
<waitForElementVisible time="10" selector="{{PageBuilderSection.LinkSelect(property.fieldName)}}" stepKey="waitForLinkSelect"/>
134+
<waitForElementVisible time="10" selector="{{PageBuilderLinkAttributeAdmin.LinkSelect(property.fieldName)}}" stepKey="waitForLinkSelect"/>
134135
<waitForElement time="10" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
135136
<selectOption selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" userInput="{{selection}}" stepKey="selectOption"/>
136-
<fillField selector="{{PageBuilderSection.LinkInput(property.fieldName)}}" userInput="{{property.value}}" stepKey="inputLink"/>
137+
<fillField selector="{{PageBuilderLinkAttributeAdmin.LinkInput(property.fieldName)}}" userInput="{{property.value}}" stepKey="inputLink"/>
137138
<conditionalClick selector="{{EditPanelForm.panelFieldControlSwitch(newTab.fieldName)}}" dependentSelector="{{EditPanelForm.panelFieldControlCheckboxState(newTab.fieldName, newTab.value)}}" visible="false" stepKey="conditionalClickNewTab"/>
138139
<waitForElementVisible selector="{{EditPanelForm.panelFieldControlCheckboxState(newTab.fieldName, newTab.value)}}" stepKey="waitForNewTabStateChange"/>
139140
<click selector="{{EditPanelForm.panelFieldLabel((property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
140141
</actionGroup>
142+
<actionGroup name="fillOutUrlInput">
143+
<arguments>
144+
<argument name="fieldName"/>
145+
<argument name="linkName"/>
146+
<argument name="searchString"/>
147+
<argument name="searchResult"/>
148+
</arguments>
149+
<waitForElementVisible selector="{{PageBuilderLinkAttributeAdmin.LinkSelect('fieldName')}}" stepKey="waitForButtonLinkSelect"/>
150+
<seeElement selector="{{PageBuilderLinkAttributeAdmin.LinkSelect('fieldName')}}" stepKey="seeButtonLinkSelect"/>
151+
<selectOption selector="{{EditPanelForm.panelFieldControl(PageBuilderButtonItemLink_NotSecure.section, PageBuilderButtonItemLink_NotSecure.fieldName)}}" userInput="{{linkName}}" stepKey="selectOption" />
152+
<!--See dropdown beside Button Link Select-->
153+
<waitForElementVisible selector="{{PageBuilderLinkAttributeAdmin.LinkDropdown}}" stepKey="waitButtonLinkDropdownInput" />
154+
<seeElement selector="{{PageBuilderLinkAttributeAdmin.LinkDropdown}}" stepKey="seeButtonLinkDropdownInput" />
155+
<click selector="{{PageBuilderLinkAttributeAdmin.LinkDropdown}}" stepKey="expandButtonLinkDropdownInput1" />
156+
<!--Type 2 first letters into Search box-->
157+
<click selector="{{PageBuilderLinkAttributeAdmin.LinkSearch}}" stepKey="focusOnField"/>
158+
<fillField selector="{{PageBuilderLinkAttributeAdmin.LinkSearch}}" userInput="{{searchString}}" stepKey="fill2FirstLetters"/>
159+
<waitForElementVisible selector="{{PageBuilderLinkAttributeAdmin.SearchResult(searchResult)}}" stepKey="waitForSearchResult" />
160+
<seeElement selector="{{PageBuilderLinkAttributeAdmin.SearchResult(searchResult)}}" stepKey="seeCMSPageAOnSearchResult"/>
161+
<click selector="{{PageBuilderLinkAttributeAdmin.SearchResult(searchResult)}}" stepKey="selectResult"/>
162+
<dontSee selector="{{PageBuilderLinkAttributeAdmin.SearchResultBox}}" stepKey="dropdownCollapses" />
163+
<grabTextFrom selector="{{PageBuilderLinkAttributeAdmin.DropdownInput}}" stepKey="textFromDropDown1"/>
164+
<assertEquals stepKey="assertEquals1" message="pass">
165+
<expectedResult type="string">{{searchResult}}</expectedResult>
166+
<actualResult type="variable">textFromDropDown1</actualResult>
167+
</assertEquals>
168+
</actionGroup>
141169
<actionGroup name="clearSlideOutPanelFieldGeneral">
142170
<arguments>
143171
<argument name="property"/>
144172
</arguments>
145-
<waitForLoadingMaskToDisappear stepKey="waitForSpinner"/>
173+
<waitForPageLoad stepKey="waitForPageLoad"/>
146174
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
147175
<see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
148176
<clearField selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="clearPropertyField"/>
@@ -164,7 +192,7 @@
164192
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
165193
<see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
166194
<selectOption selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" userInput="{{property.value}}" stepKey="selectPropertyField"/>
167-
<waitForLoadingMaskToDisappear stepKey="waitForSpinner"/>
195+
<waitForPageLoad stepKey="waitForPageLoad"/>
168196
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
169197
</actionGroup>
170198
<actionGroup name="conditionalClickSlideOutPanelFieldGeneral">
@@ -296,10 +324,10 @@
296324
<argument name="selection" type="string"/>
297325
<argument name="newTab"/>
298326
</arguments>
299-
<waitForElementVisible time="10" selector="{{PageBuilderSection.LinkSelect(property.fieldName)}}" stepKey="waitForLinkSelect"/>
327+
<waitForElementVisible time="10" selector="{{PageBuilderLinkAttributeAdmin.LinkSelect(property.fieldName)}}" stepKey="waitForLinkSelect"/>
300328
<waitForElement time="10" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
301329
<seeInField selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" userInput="{{selection}}" stepKey="seeOptionIsSelected"/>
302-
<seeInField selector="{{PageBuilderSection.LinkInput(property.fieldName)}}" userInput="{{property.value}}" stepKey="seeInField"/>
330+
<seeInField selector="{{PageBuilderLinkAttributeAdmin.LinkInput(property.fieldName)}}" userInput="{{property.value}}" stepKey="seeInField"/>
303331
<waitForElementVisible time="10" selector="{{EditPanelForm.panelFieldControlCheckboxState(newTab.fieldName, newTab.value)}}" stepKey="waitForNewTab"/>
304332
</actionGroup>
305333
<actionGroup name="validateSlideOutPanelFieldIsDisabled">

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,16 @@
4141
</arguments>
4242
<waitForElement time="30" selector="{{PageBuilderStoreFront.contentTypeInsideContainerStorefront(containerTargetType.role, containerTargetIndex, contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeStorefront"/>
4343
</actionGroup>
44+
<actionGroup name="verifyCmsPageLinkOnFrontend">
45+
<arguments>
46+
<argument name="CMSPage"/>
47+
<argument name="index"/>
48+
<argument name="section"/>
49+
</arguments>
50+
<scrollTo selector="{{section.base('index')}}" stepKey="waitForButtonElementStorefront"/>
51+
<seeElement selector="{{PageBuilderPageOnStoreFrontSection.CMSPageLink(CMSPage.identifier)}}" stepKey="seePageLinkOnStoreFront" />
52+
<click selector="{{PageBuilderPageOnStoreFrontSection.CMSPageLink(CMSPage.identifier)}}" stepKey="clickButton"/>
53+
<waitForPageLoad stepKey="waitForPageLoad"/>
54+
<see userInput="{{CMSPage.title}}" stepKey="seePageName" />
55+
</actionGroup>
4456
</actionGroups>

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

Lines changed: 0 additions & 50 deletions
This file was deleted.

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

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)