Skip to content

Commit 14c45a8

Browse files
dhaeckerdhaecker
committed
MC-3329: Add Missing P0-P1 MFTF Tests For PageBuilder On Catalog Product (Description, Short Description, Attribute)
 - Fixing PageBuilderWorksForEachProductAttribute test
1 parent e0bcc52 commit 14c45a8

File tree

4 files changed

+63
-54
lines changed

4 files changed

+63
-54
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>
2727
<argument name="sectionDependentSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}._show" type="string"/>
2828
</arguments>
29+
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
2930
<waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
3031
<conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
3132
<waitForPageLoad time="30" stepKey="waitForSectionToExpand"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<expectedResult type="variable">initialNumberOfChildContentTypesPlusOne</expectedResult>
9999
<actualResult type="variable">numberOfChildContentTypesAfterAdd</actualResult>
100100
</assertEquals>
101-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
101+
<click selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
102102
<waitForPageLoad stepKey="waitForAnimation2"/>
103103
</actionGroup>
104104
<actionGroup name="duplicateContentType">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<!-- This goes in CE repo -->
1616
<data key="attribute_code">short_description</data>
1717
</entity>
18-
<entity name="AddToDefaultSetContentSectionBelowShortDescription" type="ProductAttributeSet">
18+
<entity name="AddToDefaultSetTopOfContentSection" type="ProductAttributeSet">
1919
<!-- This goes in CE repo -->
2020
<var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
2121
<data key="attributeSetId">4</data>
2222
<data key="attributeGroupId">13</data>
23-
<data key="sortOrder">4</data>
23+
<data key="sortOrder">0</data>
2424
</entity>
2525
</entities>

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

Lines changed: 59 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@
11041104
<before>
11051105
<createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
11061106
<createData entity="productAttributeWysiwyg" stepKey="createProductAttribute"/>
1107-
<createData entity="AddToDefaultSetContentSectionBelowShortDescription" stepKey="addAttributeToDefaultAttributeSet">
1107+
<createData entity="AddToDefaultSetTopOfContentSection" stepKey="addAttributeToDefaultAttributeSet">
11081108
<requiredEntity createDataKey="createProductAttribute"/>
11091109
</createData>
11101110
<createData entity="_defaultProduct" stepKey="createProduct">
@@ -1125,6 +1125,10 @@
11251125
<actionGroup ref="navigateToCreatedProductEditPage" stepKey="navigateToCreatedProductEditPage">
11261126
<argument name="product" value="$$createProduct$$"/>
11271127
</actionGroup>
1128+
<actionGroup ref="setLayout" stepKey="setFullWidthLayout">
1129+
<argument name="designSection" value="ProductDesignSection"/>
1130+
<argument name="layoutOption" value="PageBuilderFullWidthLayout.product"/>
1131+
</actionGroup>
11281132
<actionGroup ref="expandAdminProductSection" stepKey="expandAdminProductSection"/>
11291133
</before>
11301134
<after>
@@ -1141,17 +1145,55 @@
11411145
<actionGroup ref="NavigateToAndResetProductAttributeGridToDefaultView" stepKey="NavigateToAndResetProductAttributeGridToDefaultView"/>
11421146
<actionGroup ref="logout" stepKey="logout"/>
11431147
</after>
1148+
<!-- Edit Product Custom Attribute -->
1149+
<comment userInput="Edit Product Custom Attribute" stepKey="commentEditProductCustomAttribute"/>
1150+
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForCustomAttribute">
1151+
<argument name="attributeCode" value="$$createProductAttribute.attribute_code$$"/>
1152+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
1153+
</actionGroup>
1154+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPanelGroupHeading">
1155+
<argument name="group" value="PageBuilderHeadingContentType"/>
1156+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
1157+
</actionGroup>
1158+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingIntoRow">
1159+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1160+
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1161+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
1162+
</actionGroup>
1163+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
1164+
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
1165+
</actionGroup>
1166+
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
1167+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
1168+
</actionGroup>
1169+
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForHeading">
1170+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1171+
</actionGroup>
1172+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterHeadingTypePropertyH1">
1173+
<argument name="property" value="PageBuilderHeadingTypeProperty_H1"/>
1174+
</actionGroup>
1175+
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditFormForHeading"/>
1176+
<!-- Validate Product Custom Attribute Stage -->
1177+
<comment userInput="Validate Product Custom Attribute Stage" stepKey="commentValidateCustomAttributeStage"/>
1178+
<seeElement selector="{{HeadingOnStage.headingType(PageBuilderHeadingTypeProperty_H1.value, '1')}}" stepKey="seeHeadingStyleStage"/>
1179+
<seeElement selector="{{HeadingOnStage.headingText(PageBuilderHeadingTypeProperty_H1.value, PageBuilderHeadingTextProperty.value, '1')}}" stepKey="seeHeadingTextStage"/>
1180+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenCustomAttribute"/>
11441181
<!-- Edit Product Description -->
11451182
<comment userInput="Edit Product Description" stepKey="commentEditProductDescription"/>
1146-
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForDescription"/>
1183+
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForDescription">
1184+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('description')}}"/>
1185+
</actionGroup>
11471186
<!-- Add Buttons -->
11481187
<comment userInput="Add Buttons" stepKey="commentAddButtons"/>
11491188
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPanelGroupButtons">
11501189
<argument name="group" value="PageBuilderButtonsContentType"/>
1190+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('description')}}"/>
11511191
</actionGroup>
11521192
<actionGroup ref="dragContentTypeToContainer" stepKey="dragButtonsToRow">
11531193
<argument name="contentType" value="PageBuilderButtonsContentType"/>
11541194
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1195+
<argument name="containerTargetIndex" value="2"/>
1196+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('description')}}"/>
11551197
</actionGroup>
11561198
<!-- Edit Button Item -->
11571199
<comment userInput="Edit Button Item" stepKey="commentEditButtonItem"/>
@@ -1166,10 +1208,12 @@
11661208
<comment userInput="Add 2nd Button" stepKey="commentAddSecondButton"/>
11671209
<actionGroup ref="addChildContentTypeFromOptionMenu" stepKey="addChildContentType">
11681210
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1211+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('description')}}"/>
11691212
</actionGroup>
11701213
<actionGroup ref="inlineEditButton" stepKey="inlineEditButton2">
11711214
<argument name="text" value="PageBuilderButtonItemText_Second"/>
11721215
<argument name="index" value="2"/>
1216+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('description')}}"/>
11731217
</actionGroup>
11741218
<!-- Validate Product Description Stage -->
11751219
<comment userInput="Validate Product Description Stage" stepKey="commentValidateProductDescriptionStage"/>
@@ -1190,7 +1234,7 @@
11901234
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerIntoRow">
11911235
<argument name="contentType" value="PageBuilderDividerContentType"/>
11921236
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1193-
<argument name="containerTargetIndex" value="2"/>
1237+
<argument name="containerTargetIndex" value="3"/>
11941238
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('short_description')}}"/>
11951239
</actionGroup>
11961240
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForDivider">
@@ -1204,52 +1248,25 @@
12041248
<comment userInput="Validate Product Short Description Stage" stepKey="commentValidateShortProductDescriptionStage"/>
12051249
<seeElement selector="{{DividerOnStage.color('1', PageBuilderDividerLineColor_FF5733.rgb)}}" stepKey="seeDividerColorStage"/>
12061250
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenShortDescription"/>
1207-
<!-- Edit Product Custom Attribute -->
1208-
<comment userInput="Edit Product Custom Attribute" stepKey="commentEditProductCustomAttribute"/>
1209-
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForCustomAttribute">
1210-
<argument name="attributeCode" value="$$createProductAttribute.attribute_code$$"/>
1211-
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
1212-
</actionGroup>
1213-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPanelGroupHeading">
1214-
<argument name="group" value="PageBuilderHeadingContentType"/>
1215-
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
1216-
</actionGroup>
1217-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingIntoRow">
1218-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1219-
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1220-
<argument name="containerTargetIndex" value="3"/>
1221-
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
1222-
</actionGroup>
1223-
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
1224-
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
1225-
</actionGroup>
1226-
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
1227-
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
1228-
</actionGroup>
1229-
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForHeading">
1230-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
1231-
</actionGroup>
1232-
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterHeadingTypePropertyH1">
1233-
<argument name="property" value="PageBuilderHeadingTypeProperty_H1"/>
1234-
</actionGroup>
1235-
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditFormForHeading"/>
1236-
<!-- Validate Product Custom Attribute Stage -->
1237-
<comment userInput="Validate Product Custom Attribute Stage" stepKey="commentValidateCustomAttributeStage"/>
1238-
<seeElement selector="{{HeadingOnStage.headingType(PageBuilderHeadingTypeProperty_H1.value, '1')}}" stepKey="seeHeadingStyleStage"/>
1239-
<seeElement selector="{{HeadingOnStage.headingText(PageBuilderHeadingTypeProperty_H1.value, PageBuilderHeadingTextProperty.value, '1')}}" stepKey="seeHeadingTextStage"/>
1240-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenCustomAttribute"/>
1241-
<actionGroup ref="setLayout" stepKey="setFullWidthLayout">
1242-
<argument name="designSection" value="ProductDesignSection"/>
1243-
<argument name="layoutOption" value="PageBuilderFullWidthLayout.product"/>
1244-
</actionGroup>
12451251
<!-- Save Product -->
12461252
<comment userInput="Save Product" stepKey="commentSaveProduct"/>
12471253
<actionGroup ref="saveProductForm" stepKey="saveProduct"/>
12481254
<waitForPageLoad stepKey="waitForPageLoadSaveProduct"/>
12491255
<actionGroup ref="expandAdminProductSection" stepKey="expandAdminProductSection"/>
1256+
<!-- Validate Product Custom Attribute Stage After Save -->
1257+
<comment userInput="Validate Product Custom Attribute Stage After Save" stepKey="commentValidateProductCustomAttributeStageAfterSave"/>
1258+
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForCustomAttributeAfterSave">
1259+
<argument name="attributeCode" value="$$createProductAttribute.attribute_code$$"/>
1260+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
1261+
</actionGroup>
1262+
<seeElement selector="{{HeadingOnStage.headingType(PageBuilderHeadingTypeProperty_H1.value, '1')}}" stepKey="seeHeadingStyleStageAfterSave"/>
1263+
<seeElement selector="{{HeadingOnStage.headingText(PageBuilderHeadingTypeProperty_H1.value, PageBuilderHeadingTextProperty.value, '1')}}" stepKey="seeHeadingTextStageAfterSave"/>
1264+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenCustomAttributeAfterSave"/>
12501265
<!-- Validate Product Description Stage After Save -->
12511266
<comment userInput="Validate Product Description Stage After Save" stepKey="commentValidateProductDescriptionStageAfterSave"/>
1252-
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForDescriptionAfterSave"/>
1267+
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForDescriptionAfterSave">
1268+
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('description')}}"/>
1269+
</actionGroup>
12531270
<seeNumberOfElements selector="{{ButtonItemOnStage.all}}" userInput="2" stepKey="see2ButtonItemsStageAfterSave"/>
12541271
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_First.value)}}" stepKey="seeButton1TextStageAfterSave"/>
12551272
<seeElement selector="{{ButtonItemOnStage.buttonItemText('2', PageBuilderButtonItemText_Second.value)}}" stepKey="seeButton2TextStageAfterSave"/>
@@ -1262,15 +1279,6 @@
12621279
</actionGroup>
12631280
<seeElement selector="{{DividerOnStage.color('1', PageBuilderDividerLineColor_FF5733.rgb)}}" stepKey="seeDividerColorStageAfterSave"/>
12641281
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenShortDescriptionAfterSave"/>
1265-
<!-- Validate Product Custom Attribute Stage After Save -->
1266-
<comment userInput="Validate Product Custom Attribute Stage After Save" stepKey="commentValidateProductCustomAttributeStageAfterSave"/>
1267-
<actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderForCustomAttributeAfterSave">
1268-
<argument name="attributeCode" value="$$createProductAttribute.attribute_code$$"/>
1269-
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
1270-
</actionGroup>
1271-
<seeElement selector="{{HeadingOnStage.headingType(PageBuilderHeadingTypeProperty_H1.value, '1')}}" stepKey="seeHeadingStyleStageAfterSave"/>
1272-
<seeElement selector="{{HeadingOnStage.headingText(PageBuilderHeadingTypeProperty_H1.value, PageBuilderHeadingTextProperty.value, '1')}}" stepKey="seeHeadingTextStageAfterSave"/>
1273-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenCustomAttributeAfterSave"/>
12741282
<actionGroup ref="navigateToStorefrontForCreatedPage" stepKey="navigateToStoreFront">
12751283
<argument name="page" value="$$createProduct.name$$.html"/>
12761284
</actionGroup>

0 commit comments

Comments
 (0)