Skip to content

Commit a90fa5c

Browse files
danmooney2danmooney2
committed
MC-3330: Add Missing P0-P1 MFTF Tests For PageBuilder On Catalog Category
Rewrite PageBuilderCategoryVerifyCanMoveContentTypesFromOnHoverOptionMenus to extend from PageBuilderProductVerifyCanMoveContentTypesFromOnHoverOptionMenus
1 parent fc1cd88 commit a90fa5c

File tree

1 file changed

+21
-110
lines changed

1 file changed

+21
-110
lines changed

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

Lines changed: 21 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<!-- TODO - rename stepKey -->
5454
<scrollTo selector="//div[@class='category-description']" stepKey="scrollToProductDescription"/>
5555
</test>
56-
<test name="PageBuilderCategoryVerifyCanMoveContentTypesFromOnHoverOptionMenus">
56+
<test name="PageBuilderCategoryVerifyCanMoveContentTypesFromOnHoverOptionMenus" extends="PageBuilderProductVerifyCanMoveContentTypesFromOnHoverOptionMenus">
5757
<annotations>
5858
<features value="PageBuilder"/>
5959
<stories value="Catalog Category"/>
@@ -70,122 +70,33 @@
7070
<group value="pagebuilder-catalog-category"/>
7171
</annotations>
7272
<before>
73-
<createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
74-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
75-
<actionGroup ref="navigateToCreatedCategory" stepKey="navigateToCreatedCategory">
73+
<comment userInput="---merging to remove step---" stepKey="createProduct"/>
74+
<!-- TODO - rename stepKey -->
75+
<actionGroup ref="navigateToCreatedCategory" stepKey="navigateToCreatedProductEditPage">
7676
<argument name="Category" value="$$createPreReqCategory$$"/>
7777
</actionGroup>
78-
<conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
79-
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForDescription"/>
78+
<!-- TODO - rename stepKey -->
79+
<conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="expandAdminProductSection"/>
8080
</before>
8181
<after>
82-
<deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
83-
<actionGroup ref="logout" stepKey="logout"/>
82+
<!-- TODO - rename stepKey -->
83+
<comment userInput="---merging to remove step---" stepKey="deleteCreatedProduct"/>
84+
<comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
8485
</after>
85-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragColumnToRow">
86-
<argument name="contentType" value="PageBuilderColumnContentType"/>
87-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
88-
</actionGroup>
89-
<!-- Add Heading to Column 2 -->
90-
<comment userInput="Add Heading to Column 2" stepKey="commentAddHeadingToColumn2"/>
91-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
92-
<argument name="group" value="PageBuilderHeadingContentType"/>
93-
</actionGroup>
94-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToColumn2">
95-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
96-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
97-
<argument name="containerTargetIndex" value="2" />
98-
</actionGroup>
99-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
100-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
101-
</actionGroup>
102-
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
103-
<argument name="index" value="1"/>
104-
</actionGroup>
105-
<!-- Add Divider to Column 2 -->
106-
<comment userInput="Add Divider to Column 2" stepKey="commentAddDividerToColumn2"/>
107-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupElements">
108-
<argument name="group" value="PageBuilderDividerContentType"/>
109-
</actionGroup>
110-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerToColumn2">
111-
<argument name="contentType" value="PageBuilderDividerContentType"/>
112-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
113-
<argument name="containerTargetIndex" value="2" />
114-
</actionGroup>
115-
<!-- Validate Stage -->
116-
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
117-
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateHeadingPosition">
118-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
119-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
120-
<argument name="positionInContainer" value="1"/>
121-
<argument name="contentTypeIndex" value="1"/>
122-
<argument name="containerTargetIndex" value="2"/>
123-
</actionGroup>
124-
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateDividerPosition">
125-
<argument name="contentType" value="PageBuilderDividerContentType"/>
126-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
127-
<argument name="positionInContainer" value="2"/>
128-
<argument name="contentTypeIndex" value="1"/>
129-
<argument name="containerTargetIndex" value="2"/>
130-
</actionGroup>
131-
<!-- Move Divider -->
132-
<comment userInput="Move Divider" stepKey="commentMoveDivider"/>
133-
<actionGroup ref="moveContentTypeToContainer" stepKey="moveDividerToColumn1">
134-
<argument name="contentType" value="PageBuilderDividerContentType"/>
135-
<argument name="contentTypeIndex" value="1"/>
136-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
137-
<argument name="containerTargetIndex" value="1"/>
138-
</actionGroup>
139-
<!-- Validate Stage After Move -->
140-
<comment userInput="Validate Stage After Move" stepKey="commentValidateStageAfterMove"/>
141-
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateHeadingPositionAfterMove">
142-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
143-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
144-
<argument name="contentTypeIndex" value="1"/>
145-
<argument name="containerTargetIndex" value="2"/>
146-
</actionGroup>
147-
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateDividerPositionAfterMove">
148-
<argument name="contentType" value="PageBuilderDividerContentType"/>
149-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
150-
<argument name="contentTypeIndex" value="1"/>
151-
<argument name="containerTargetIndex" value="1"/>
152-
</actionGroup>
15386
<!-- Save Category -->
154-
<comment userInput="Save Category" stepKey="commentSaveCategory"/>
155-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
156-
<actionGroup ref="saveCategoryForm" stepKey="saveCategory"/>
157-
<waitForPageLoad stepKey="waitForPageLoadSaveCategory"/>
158-
<conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="openContentSection"/>
159-
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForDescription"/>
160-
<!-- Validate Stage After Save -->
161-
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
162-
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateHeadingPositionAfterSave">
163-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
164-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
165-
<argument name="contentTypeIndex" value="1"/>
166-
<argument name="containerTargetIndex" value="2"/>
167-
</actionGroup>
168-
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateDividerPositionAfterSave">
169-
<argument name="contentType" value="PageBuilderDividerContentType"/>
170-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
171-
<argument name="contentTypeIndex" value="1"/>
172-
<argument name="containerTargetIndex" value="1"/>
173-
</actionGroup>
87+
<!-- TODO - rename stepKey -->
88+
<comment userInput="Save Category" stepKey="commentSaveProduct"/>
89+
<!-- TODO - rename stepKey -->
90+
<actionGroup ref="saveCategoryForm" stepKey="saveProduct"/>
91+
<!-- TODO - rename stepKey -->
92+
<waitForPageLoad stepKey="waitForPageLoadSaveProduct"/>
93+
<!-- TODO - rename stepKey -->
94+
<conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="expandAdminProductSection"/>
17495
<!-- Validate Storefront -->
17596
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
176-
<amOnPage url="$$createPreReqCategory.name$$.html" stepKey="navigateToCategoryPage"/>
177-
<scrollTo selector="//div[@class='category-description']" stepKey="scrollToCategoryDescription"/>
178-
<actionGroup ref="validateContentTypeInsideContainerStorefront" stepKey="validateHeadingPositionStorefront">
179-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
180-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
181-
<argument name="contentTypeIndex" value="1"/>
182-
<argument name="containerTargetIndex" value="2"/>
183-
</actionGroup>
184-
<actionGroup ref="validateContentTypeInsideContainerStorefront" stepKey="validateDividerPositionStorefront">
185-
<argument name="contentType" value="PageBuilderDividerContentType"/>
186-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
187-
<argument name="contentTypeIndex" value="1"/>
188-
<argument name="containerTargetIndex" value="1"/>
189-
</actionGroup>
97+
<!-- TODO - rename stepKey -->
98+
<amOnPage url="$$createPreReqCategory.name$$.html" stepKey="navigateToProductStorefront"/>
99+
<!-- TODO - rename stepKey -->
100+
<scrollTo selector="//div[@class='category-description']" stepKey="scrollToProductDescription"/>
190101
</test>
191102
</tests>

0 commit comments

Comments
 (0)