Skip to content

Commit 1ebf0bc

Browse files
anthoulaanthoula
committed
Merge remote-tracking branch 'mainline/develop' into MC-912-clean-config-fields
2 parents 98efa0e + 9d40f18 commit 1ebf0bc

22 files changed

+568
-28
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,12 @@
137137
<data key="fieldName">button_text</data>
138138
<data key="value">Editable</data>
139139
</entity>
140+
<entity name="PageBuilderBannerButtonTextProperty_Html" type="pagebuilder_banner_button_text_property">
141+
<data key="name">Button Text</data>
142+
<data key="section">contents</data>
143+
<data key="fieldName">button_text</data>
144+
<data key="value">&lt;div data-info=&quot;abc&quot;&gt;test&lt;br/&gt;html&lt;/div&gt;</data>
145+
</entity>
140146
<!-- Button Type -->
141147
<entity name="PageBuilderBannerButtonTypeDefaultProperty" type="pagebuilder_banner_buttonTypeDefault_property">
142148
<data key="name">Button Type</data>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@
5959
<entity name="PageBuilderButtonItemText_200Characters" type="pagebuilder_button_item_text_property" extends="PageBuilderButtonItemText_Template">
6060
<data key="value">01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789</data>
6161
</entity>
62+
<entity name="PageBuilderButtonItemText_Html" type="pagebuilder_button_item_text_property" extends="PageBuilderButtonItemText_Template">
63+
<data key="value">&lt;div data-info=&quot;abc&quot;&gt;test&lt;br/&gt;html&lt;/div&gt;</data>
64+
</entity>
6265
<!-- Button Type -->
6366
<entity name="PageBuilderButtonItemType_Template" type="pagebuilder_button_item_type_property">
6467
<data key="name">Button Type</data>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
<data key="value">poster</data>
2828
<data key="optionsList">Poster, Collage left, Collage centered, Collage right</data>
2929
</entity>
30+
<entity name="PageBuilderSlidePosterProperty" type="pagebuilder_appearance_property">
31+
<data key="name">Appearance</data>
32+
<data key="section">appearance_fieldset</data>
33+
<data key="fieldName">appearance</data>
34+
<data key="value">poster</data>
35+
</entity>
3036
<entity name="PageBuilderSlideCollageLeftProperty" type="pagebuilder_appearance_property">
3137
<data key="name">Appearance</data>
3238
<data key="section">appearance_fieldset</data>
@@ -81,6 +87,12 @@
8187
<data key="fieldName">button_text</data>
8288
<data key="value">Good Morning!</data>
8389
</entity>
90+
<entity name="PageBuilderSlideButtonTextProperty_Html" type="pagebuilder_Slide_buttonText_property">
91+
<data key="name">Button Text</data>
92+
<data key="section">general</data>
93+
<data key="fieldName">button_text</data>
94+
<data key="value">&lt;div data-info=&quot;abc&quot;&gt;test&lt;br/&gt;html&lt;/div&gt;</data>
95+
</entity>
8496
<entity name="PageBuilderSlideItemLinkURL1" type="pagebuilder_slide_property">
8597
<data key="name">Link</data>
8698
<data key="section">general</data>

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,4 +1142,72 @@
11421142
<switchToNextTab stepKey="switchToNextTab"/>
11431143
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlProperty.value}}" stepKey="seeCurrentUrlEquals"/>
11441144
</test>
1145+
<test name="BannerCollageCenterHtmlValueInButtons">
1146+
<annotations>
1147+
<features value="PageBuilder"/>
1148+
<stories value="Banner"/>
1149+
<title value="Collage Center - HTML Value In Buttons Does Not Render As HTML"/>
1150+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1151+
<severity value="MAJOR"/>
1152+
<useCaseId value="MC-849"/>
1153+
<testCaseId value="MC-3654"/>
1154+
<group value="pagebuilder"/>
1155+
<group value="pagebuilder-banner"/>
1156+
<group value="pagebuilder-bannerCollageCenter"/>
1157+
</annotations>
1158+
<before>
1159+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1160+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1161+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1162+
</before>
1163+
<after>
1164+
<actionGroup ref="logout" stepKey="logout"/>
1165+
</after>
1166+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1167+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1168+
</actionGroup>
1169+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1170+
<argument name="group" value="PageBuilderBannerContentType"/>
1171+
</actionGroup>
1172+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1173+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1174+
</actionGroup>
1175+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
1176+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1177+
</actionGroup>
1178+
<!-- Fill Out Edit Panel -->
1179+
<comment userInput="Fill Out Edit Panel" stepKey="commentFillEditPanel"/>
1180+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1181+
<argument name="property" value="PageBuilderBannerCollageCenteredProperty"/>
1182+
</actionGroup>
1183+
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
1184+
<argument name="property" value="PageBuilderBannerShowButtonAlwaysProperty"/>
1185+
</actionGroup>
1186+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterButtonText">
1187+
<argument name="property" value="PageBuilderBannerButtonTextProperty_Html"/>
1188+
</actionGroup>
1189+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1190+
<!-- Validate Stage -->
1191+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1192+
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStage"/>
1193+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1194+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1195+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
1196+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1197+
</actionGroup>
1198+
<!-- Validate Edit Panel -->
1199+
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
1200+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonTextOnForm">
1201+
<argument name="property" value="PageBuilderBannerButtonTextProperty_Html"/>
1202+
</actionGroup>
1203+
<!-- Validate Stage After Save -->
1204+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1205+
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStage2"/>
1206+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1207+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1208+
</actionGroup>
1209+
<!-- Validate Storefront -->
1210+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1211+
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStorefront"/>
1212+
</test>
11451213
</tests>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,4 +1142,21 @@
11421142
<switchToNextTab stepKey="switchToNextTab"/>
11431143
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlProperty.value}}" stepKey="seeCurrentUrlEquals"/>
11441144
</test>
1145+
<test name="BannerCollageLeftHtmlValueInButtons" extends="BannerCollageCenterHtmlValueInButtons">
1146+
<annotations>
1147+
<features value="PageBuilder"/>
1148+
<stories value="Banner"/>
1149+
<title value="Banner Collage Left - HTML Value In Buttons Does Not Render As HTML"/>
1150+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1151+
<severity value="MAJOR"/>
1152+
<useCaseId value="MC-849"/>
1153+
<testCaseId value="MC-3655"/>
1154+
<group value="pagebuilder"/>
1155+
<group value="pagebuilder-banner"/>
1156+
<group value="pagebuilder-bannerCollageLeft"/>
1157+
</annotations>
1158+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1159+
<argument name="property" value="PageBuilderBannerCollageLeftProperty"/>
1160+
</actionGroup>
1161+
</test>
11451162
</tests>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,4 +1142,21 @@
11421142
<switchToNextTab stepKey="switchToNextTab"/>
11431143
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlProperty.value}}" stepKey="seeCurrentUrlEquals"/>
11441144
</test>
1145+
<test name="BannerCollageRightHtmlValueInButtons" extends="BannerCollageCenterHtmlValueInButtons">
1146+
<annotations>
1147+
<features value="PageBuilder"/>
1148+
<stories value="Banner"/>
1149+
<title value="Banner Collage Right - HTML Value In Buttons Does Not Render As HTML"/>
1150+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1151+
<severity value="MAJOR"/>
1152+
<useCaseId value="MC-849"/>
1153+
<testCaseId value="MC-3656"/>
1154+
<group value="pagebuilder"/>
1155+
<group value="pagebuilder-banner"/>
1156+
<group value="pagebuilder-bannerCollageRight"/>
1157+
</annotations>
1158+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1159+
<argument name="property" value="PageBuilderBannerCollageRightProperty"/>
1160+
</actionGroup>
1161+
</test>
11451162
</tests>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1205,4 +1205,21 @@
12051205
<switchToNextTab stepKey="switchToNextTab"/>
12061206
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlProperty.value}}" stepKey="seeCurrentUrlEquals"/>
12071207
</test>
1208+
<test name="BannerPosterHtmlValueInButtons" extends="BannerCollageCenterHtmlValueInButtons">
1209+
<annotations>
1210+
<features value="PageBuilder"/>
1211+
<stories value="Banner"/>
1212+
<title value="Banner Poster - HTML Value In Buttons Does Not Render As HTML"/>
1213+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1214+
<severity value="MAJOR"/>
1215+
<useCaseId value="MC-849"/>
1216+
<testCaseId value="MC-3657"/>
1217+
<group value="pagebuilder"/>
1218+
<group value="pagebuilder-banner"/>
1219+
<group value="pagebuilder-bannerPoster"/>
1220+
</annotations>
1221+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1222+
<argument name="property" value="PageBuilderBannerAppearance_Poster"/>
1223+
</actionGroup>
1224+
</test>
12081225
</tests>

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

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,4 +1238,114 @@
12381238
</actionGroup>
12391239
<seeElement selector="{{ButtonItemOnStorefront.notHidden('1')}}" stepKey="seeContentTypeNotHiddenStorefront"/>
12401240
</test>
1241+
<test name="ButtonItemCanSaveButtonTextWithoutFocusingOutsideOfLiveEdit">
1242+
<annotations>
1243+
<features value="PageBuilder"/>
1244+
<stories value="Buttons"/>
1245+
<title value="Button Item - Can Save Button Text Without Focusing Outside of Live Edit"/>
1246+
<description value="A user should be able to edit a button item inline on the stage and save the edit without first focusing outside of the live edit area."/>
1247+
<severity value="AVERAGE"/>
1248+
<useCaseId value="MC-877"/>
1249+
<testCaseId value="MC-3672"/>
1250+
<group value="pagebuilder"/>
1251+
<group value="pagebuilder-buttons"/>
1252+
<group value="pagebuilder-buttonItem"/>
1253+
</annotations>
1254+
<before>
1255+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1256+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1257+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1258+
</before>
1259+
<after>
1260+
<actionGroup ref="logout" stepKey="logout"/>
1261+
</after>
1262+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1263+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1264+
</actionGroup>
1265+
<!-- Add Button Group -->
1266+
<comment userInput="Add Button Group" stepKey="commentAddButtonGroup"/>
1267+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1268+
<argument name="group" value="PageBuilderButtonsContentType"/>
1269+
</actionGroup>
1270+
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
1271+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1272+
</actionGroup>
1273+
<!-- Enter Text On Stage -->
1274+
<comment userInput="Enter Text On Stage" stepKey="commentEnterText"/>
1275+
<waitForElementVisible selector="{{ButtonItemOnStage.editableButtonItemElement('1')}}" stepKey="waitForButtonEditable"/>
1276+
<click selector="{{ButtonItemOnStage.editableButtonItemElement('1')}}" stepKey="clickButtonText"/>
1277+
<pressKey selector="{{ButtonItemOnStage.editableButtonItemElement('1')}}" userInput="{{PageBuilderButtonItemText_Common.value}}" stepKey="enterButtonText"/>
1278+
<!-- Click Save -->
1279+
<comment userInput="Click Save" stepKey="commentSave"/>
1280+
<moveMouseOver selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="moveMouseOverSave"/>
1281+
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveAndContinueEditCmsPage"/>
1282+
<waitForPageLoad stepKey="waitForCmsPageLoad"/>
1283+
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.cmsPageTitle}}" stepKey="waitForCmsPageTitle"/>
1284+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1285+
<!-- Validate Stage After Page Save -->
1286+
<comment userInput="Validate Stage After Page Save" stepKey="commentValidateStage2"/>
1287+
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButtonTextStage"/>
1288+
</test>
1289+
<test name="ButtonItemHtmlValueInButtons">
1290+
<annotations>
1291+
<features value="PageBuilder"/>
1292+
<stories value="Buttons"/>
1293+
<title value="Button Item - HTML Value In Buttons Does Not Render As HTML"/>
1294+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1295+
<severity value="MAJOR"/>
1296+
<useCaseId value="MC-849"/>
1297+
<testCaseId value="MC-3658"/>
1298+
<group value="pagebuilder"/>
1299+
<group value="pagebuilder-buttons"/>
1300+
<group value="pagebuilder-buttonItem"/>
1301+
</annotations>
1302+
<before>
1303+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1304+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1305+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1306+
</before>
1307+
<after>
1308+
<actionGroup ref="logout" stepKey="logout"/>
1309+
</after>
1310+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1311+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1312+
</actionGroup>
1313+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1314+
<argument name="group" value="PageBuilderButtonsContentType"/>
1315+
</actionGroup>
1316+
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
1317+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1318+
</actionGroup>
1319+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage">
1320+
<argument name="section" value="ButtonItemOnStage"/>
1321+
<argument name="targetIndex" value="1"/>
1322+
</actionGroup>
1323+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterButtonText">
1324+
<argument name="property" value="PageBuilderButtonItemText_Html"/>
1325+
</actionGroup>
1326+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1327+
<!-- Validate Stage -->
1328+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1329+
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Html.value)}}" stepKey="seeButtonTextStage"/>
1330+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1331+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1332+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage2">
1333+
<argument name="section" value="ButtonItemOnStage"/>
1334+
<argument name="targetIndex" value="1"/>
1335+
</actionGroup>
1336+
<!-- Validate Edit Panel -->
1337+
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
1338+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonTextOnForm">
1339+
<argument name="property" value="PageBuilderButtonItemText_Html"/>
1340+
</actionGroup>
1341+
<!-- Validate Stage After Save -->
1342+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1343+
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Html.value)}}" stepKey="seeButtonTextStage2"/>
1344+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1345+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1346+
</actionGroup>
1347+
<!-- Validate Storefront -->
1348+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1349+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Html.value)}}" stepKey="seeButtonTextStorefront"/>
1350+
</test>
12411351
</tests>

0 commit comments

Comments
 (0)