Skip to content

Commit 1693f2a

Browse files
tjwiebelltjwiebell
authored
Merge pull request #127 from magento-obsessive-owls/cms-team-2-button-bugs
[CMS Team 2 - Sprint 15] Button Bugs
2 parents 18d3e66 + d90142b commit 1693f2a

20 files changed

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

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)