Skip to content

Commit b7b9b60

Browse files
tjwiebelltjwiebell
committed
Merge remote-tracking branch 'origin/MC-849-html-on-buttons' into cms-team-2-button-bugs
2 parents 68f7e05 + abad037 commit b7b9b60

19 files changed

+407
-17
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
@@ -37,6 +37,12 @@
3737
<data key="value">poster</data>
3838
<data key="optionsList">Poster, Collage left, Collage centered, Collage right</data>
3939
</entity>
40+
<entity name="PageBuilderSlidePosterProperty" type="pagebuilder_appearance_property">
41+
<data key="name">Appearance</data>
42+
<data key="section">appearance_fieldset</data>
43+
<data key="fieldName">appearance</data>
44+
<data key="value">poster</data>
45+
</entity>
4046
<entity name="PageBuilderSlideCollageLeftProperty" type="pagebuilder_appearance_property">
4147
<data key="name">Appearance</data>
4248
<data key="section">appearance_fieldset</data>
@@ -121,6 +127,12 @@
121127
<data key="fieldName">button_text</data>
122128
<data key="value">Good Morning!</data>
123129
</entity>
130+
<entity name="PageBuilderSlideButtonTextProperty_Html" type="pagebuilder_Slide_buttonText_property">
131+
<data key="name">Button Text</data>
132+
<data key="section">general</data>
133+
<data key="fieldName">button_text</data>
134+
<data key="value">&lt;div data-info=&quot;abc&quot;&gt;test&lt;br/&gt;html&lt;/div&gt;</data>
135+
</entity>
124136
<entity name="PageBuilderSlideItemLinkURL1" type="pagebuilder_slide_property">
125137
<data key="name">Link URL</data>
126138
<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
@@ -1198,4 +1198,72 @@
11981198
<switchToNextTab stepKey="switchToNextTab"/>
11991199
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlProperty.value}}" stepKey="seeCurrentUrlEquals"/>
12001200
</test>
1201+
<test name="BannerCollageCenterHtmlValueInButtons">
1202+
<annotations>
1203+
<features value="PageBuilder"/>
1204+
<stories value="Banner"/>
1205+
<title value="Collage Center - HTML Value In Buttons Does Not Render As HTML"/>
1206+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1207+
<severity value="MAJOR"/>
1208+
<useCaseId value="MC-849"/>
1209+
<testCaseId value="MC-3654"/>
1210+
<group value="pagebuilder"/>
1211+
<group value="pagebuilder-banner"/>
1212+
<group value="pagebuilder-bannerCollageCenter"/>
1213+
</annotations>
1214+
<before>
1215+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1216+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1217+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1218+
</before>
1219+
<after>
1220+
<actionGroup ref="logout" stepKey="logout"/>
1221+
</after>
1222+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1223+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1224+
</actionGroup>
1225+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1226+
<argument name="group" value="PageBuilderBannerContentType"/>
1227+
</actionGroup>
1228+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1229+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1230+
</actionGroup>
1231+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
1232+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1233+
</actionGroup>
1234+
<!-- Fill Out Edit Panel -->
1235+
<comment userInput="Fill Out Edit Panel" stepKey="commentFillEditPanel"/>
1236+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1237+
<argument name="property" value="PageBuilderBannerCollageCenteredProperty"/>
1238+
</actionGroup>
1239+
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
1240+
<argument name="property" value="PageBuilderBannerShowButtonAlwaysProperty"/>
1241+
</actionGroup>
1242+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterButtonText">
1243+
<argument name="property" value="PageBuilderBannerButtonTextProperty_Html"/>
1244+
</actionGroup>
1245+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1246+
<!-- Validate Stage -->
1247+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1248+
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStage"/>
1249+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1250+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1251+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
1252+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1253+
</actionGroup>
1254+
<!-- Validate Edit Panel -->
1255+
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
1256+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonTextOnForm">
1257+
<argument name="property" value="PageBuilderBannerButtonTextProperty_Html"/>
1258+
</actionGroup>
1259+
<!-- Validate Stage After Save -->
1260+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1261+
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStage2"/>
1262+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1263+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1264+
</actionGroup>
1265+
<!-- Validate Storefront -->
1266+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1267+
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStorefront"/>
1268+
</test>
12011269
</tests>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,4 +1198,21 @@
11981198
<switchToNextTab stepKey="switchToNextTab"/>
11991199
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlProperty.value}}" stepKey="seeCurrentUrlEquals"/>
12001200
</test>
1201+
<test name="BannerCollageLeftHtmlValueInButtons" extends="BannerCollageCenterHtmlValueInButtons">
1202+
<annotations>
1203+
<features value="PageBuilder"/>
1204+
<stories value="Banner"/>
1205+
<title value="Banner Collage Left - HTML Value In Buttons Does Not Render As HTML"/>
1206+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1207+
<severity value="MAJOR"/>
1208+
<useCaseId value="MC-849"/>
1209+
<testCaseId value="MC-3655"/>
1210+
<group value="pagebuilder"/>
1211+
<group value="pagebuilder-banner"/>
1212+
<group value="pagebuilder-bannerCollageLeft"/>
1213+
</annotations>
1214+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1215+
<argument name="property" value="PageBuilderBannerCollageLeftProperty"/>
1216+
</actionGroup>
1217+
</test>
12011218
</tests>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,4 +1198,21 @@
11981198
<switchToNextTab stepKey="switchToNextTab"/>
11991199
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlProperty.value}}" stepKey="seeCurrentUrlEquals"/>
12001200
</test>
1201+
<test name="BannerCollageRightHtmlValueInButtons" extends="BannerCollageCenterHtmlValueInButtons">
1202+
<annotations>
1203+
<features value="PageBuilder"/>
1204+
<stories value="Banner"/>
1205+
<title value="Banner Collage Right - HTML Value In Buttons Does Not Render As HTML"/>
1206+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1207+
<severity value="MAJOR"/>
1208+
<useCaseId value="MC-849"/>
1209+
<testCaseId value="MC-3656"/>
1210+
<group value="pagebuilder"/>
1211+
<group value="pagebuilder-banner"/>
1212+
<group value="pagebuilder-bannerCollageRight"/>
1213+
</annotations>
1214+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1215+
<argument name="property" value="PageBuilderBannerCollageRightProperty"/>
1216+
</actionGroup>
1217+
</test>
12011218
</tests>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,4 +1260,21 @@
12601260
<switchToNextTab stepKey="switchToNextTab"/>
12611261
<seeCurrentUrlEquals url="{{PageBuilderBannerLinkUrlProperty.value}}" stepKey="seeCurrentUrlEquals"/>
12621262
</test>
1263+
<test name="BannerPosterHtmlValueInButtons" extends="BannerCollageCenterHtmlValueInButtons">
1264+
<annotations>
1265+
<features value="PageBuilder"/>
1266+
<stories value="Banner"/>
1267+
<title value="Banner Poster - HTML Value In Buttons Does Not Render As HTML"/>
1268+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1269+
<severity value="MAJOR"/>
1270+
<useCaseId value="MC-849"/>
1271+
<testCaseId value="MC-3657"/>
1272+
<group value="pagebuilder"/>
1273+
<group value="pagebuilder-banner"/>
1274+
<group value="pagebuilder-bannerPoster"/>
1275+
</annotations>
1276+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1277+
<argument name="property" value="PageBuilderBannerAppearance_Poster"/>
1278+
</actionGroup>
1279+
</test>
12631280
</tests>

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,4 +1239,66 @@
12391239
<comment userInput="Validate Stage After Page Save" stepKey="commentValidateStage2"/>
12401240
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Common.value)}}" stepKey="seeButtonTextStage"/>
12411241
</test>
1242+
<test name="ButtonItemHtmlValueInButtons">
1243+
<annotations>
1244+
<features value="PageBuilder"/>
1245+
<stories value="Buttons"/>
1246+
<title value="Button Item - HTML Value In Buttons Does Not Render As HTML"/>
1247+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1248+
<severity value="MAJOR"/>
1249+
<useCaseId value="MC-849"/>
1250+
<testCaseId value="MC-3658"/>
1251+
<group value="pagebuilder"/>
1252+
<group value="pagebuilder-buttons"/>
1253+
<group value="pagebuilder-buttonItem"/>
1254+
</annotations>
1255+
<before>
1256+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1257+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1258+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1259+
</before>
1260+
<after>
1261+
<actionGroup ref="logout" stepKey="logout"/>
1262+
</after>
1263+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1264+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1265+
</actionGroup>
1266+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1267+
<argument name="group" value="PageBuilderButtonsContentType"/>
1268+
</actionGroup>
1269+
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
1270+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1271+
</actionGroup>
1272+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage">
1273+
<argument name="section" value="ButtonItemOnStage"/>
1274+
<argument name="targetIndex" value="1"/>
1275+
</actionGroup>
1276+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterButtonText">
1277+
<argument name="property" value="PageBuilderButtonItemText_Html"/>
1278+
</actionGroup>
1279+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1280+
<!-- Validate Stage -->
1281+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1282+
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Html.value)}}" stepKey="seeButtonTextStage"/>
1283+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1284+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1285+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage2">
1286+
<argument name="section" value="ButtonItemOnStage"/>
1287+
<argument name="targetIndex" value="1"/>
1288+
</actionGroup>
1289+
<!-- Validate Edit Panel -->
1290+
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
1291+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonTextOnForm">
1292+
<argument name="property" value="PageBuilderButtonItemText_Html"/>
1293+
</actionGroup>
1294+
<!-- Validate Stage After Save -->
1295+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1296+
<seeElement selector="{{ButtonItemOnStage.buttonItemText('1', PageBuilderButtonItemText_Html.value)}}" stepKey="seeButtonTextStage2"/>
1297+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1298+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1299+
</actionGroup>
1300+
<!-- Validate Storefront -->
1301+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1302+
<seeElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Html.value)}}" stepKey="seeButtonTextStorefront"/>
1303+
</test>
12421304
</tests>

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

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,4 +1090,69 @@
10901090
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
10911091
<seeElement selector="{{SliderOnFrontend.buttonText(PageBuilderSlideButtonTextProperty2.value)}}" stepKey="seeButtonTextStorefront"/>
10921092
</test>
1093+
<test name="SliderCollageCenterHtmlValueInButtons">
1094+
<annotations>
1095+
<features value="PageBuilder"/>
1096+
<stories value="Slider"/>
1097+
<title value="Collage Center - HTML Value In Buttons Does Not Render As HTML"/>
1098+
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
1099+
<severity value="MAJOR"/>
1100+
<useCaseId value="MC-849"/>
1101+
<testCaseId value="MC-3659"/>
1102+
<group value="pagebuilder"/>
1103+
<group value="pagebuilder-slider"/>
1104+
<group value="pagebuilder-sliderCollageCenter"/>
1105+
</annotations>
1106+
<before>
1107+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1108+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1109+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1110+
</before>
1111+
<after>
1112+
<actionGroup ref="logout" stepKey="logout"/>
1113+
</after>
1114+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1115+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1116+
</actionGroup>
1117+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1118+
<argument name="group" value="PageBuilderSliderContentType"/>
1119+
</actionGroup>
1120+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragSliderIntoStage">
1121+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1122+
</actionGroup>
1123+
<!-- Fill Out Edit Panel -->
1124+
<comment userInput="Fill Out Edit Panel" stepKey="commentFillEditPanel"/>
1125+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
1126+
<argument name="property" value="PageBuilderSlideCollageCenteredProperty"/>
1127+
</actionGroup>
1128+
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
1129+
<argument name="property" value="PageBuilderSlideShowButtonAlwaysProperty"/>
1130+
</actionGroup>
1131+
<actionGroup ref="fillSlideOutPanelField" stepKey="enterButtonText">
1132+
<argument name="property" value="PageBuilderSlideButtonTextProperty_Html"/>
1133+
</actionGroup>
1134+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1135+
<!-- Validate Stage -->
1136+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1137+
<seeElement selector="{{SlideOnBackend.buttonText(PageBuilderSlideButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStage"/>
1138+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1139+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1140+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel">
1141+
<argument name="section" value="SlideOnBackend"/>
1142+
</actionGroup>
1143+
<!-- Validate Edit Panel -->
1144+
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
1145+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeButtonTextOnForm">
1146+
<argument name="property" value="PageBuilderSlideButtonTextProperty_Html"/>
1147+
</actionGroup>
1148+
<!-- Validate Stage After Save -->
1149+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1150+
<seeElement selector="{{SlideOnBackend.buttonText(PageBuilderSlideButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStage2"/>
1151+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1152+
<argument name="contentType" value="PageBuilderSliderContentType"/>
1153+
</actionGroup>
1154+
<!-- Validate Storefront -->
1155+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1156+
<seeElement selector="{{SliderOnFrontend.buttonText(PageBuilderSlideButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStorefront"/>
1157+
</test>
10931158
</tests>

0 commit comments

Comments
 (0)