Skip to content

Commit b5e9130

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'origin/MC-3889-adding-space-to-button-heading-text-on-sage-results-in-nbsp-string-literal' into cms-team-1-delivery
2 parents 2dc82ab + c01947c commit b5e9130

19 files changed

+413
-11
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
@@ -143,6 +143,12 @@
143143
<data key="fieldName">button_text</data>
144144
<data key="value">&lt;div data-info=&quot;abc&quot;&gt;test&lt;br/&gt;html&lt;/div&gt;</data>
145145
</entity>
146+
<entity name="PageBuilderBannerButtonTextProperty_Non_Breaking_Space" type="pagebuilder_banner_button_text_property">
147+
<data key="name">Button Text</data>
148+
<data key="section">contents</data>
149+
<data key="fieldName">button_text</data>
150+
<data key="value"> nbsp nbsp </data>
151+
</entity>
146152
<!-- Button Type -->
147153
<entity name="PageBuilderBannerButtonTypeDefaultProperty" type="pagebuilder_banner_buttonTypeDefault_property">
148154
<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
@@ -106,4 +106,7 @@
106106
<data key="value">false</data>
107107
<data key="stageValue"/>
108108
</entity>
109+
<entity name="PageBuilderButtonItemText_NBSP" type="pagebuilder_button_item_text_property" extends="PageBuilderButtonItemText_Template">
110+
<data key="value"> nbsp nbsp </data>
111+
</entity>
109112
</entities>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,10 @@
8080
<data key="fieldName">heading_text</data>
8181
<data key="value" unique="prefix">-Title</data>
8282
</entity>
83+
<entity name="PageBuilderHeadingNonBreakingSpaceProperty" type="pagebuilder_heading_text_property">
84+
<data key="name">Heading Text</data>
85+
<data key="section">general</data>
86+
<data key="fieldName">heading_text</data>
87+
<data key="value"> nbsp nbsp </data>
88+
</entity>
8389
</entities>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@
115115
<data key="fieldName">button_text</data>
116116
<data key="value">&lt;div data-info=&quot;abc&quot;&gt;test&lt;br/&gt;html&lt;/div&gt;</data>
117117
</entity>
118+
<entity name="PageBuilderSlideItemButtonText_Non_Breaking_Space" type="pagebuilder_slide_item_button_text_property">
119+
<data key="name">Button Text</data>
120+
<data key="section">general</data>
121+
<data key="fieldName">button_text</data>
122+
<data key="value"> nbsp nbsp </data>
123+
</entity>
118124
<!-- Button Type -->
119125
<entity name="PageBuilderSlideItemButtonType_Primary" type="pagebuilder_slide_item_button_type_property">
120126
<data key="name">Button Type</data>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
<data key="fieldName">tab_name</data>
4646
<data key="value">First Tab copy</data>
4747
</entity>
48+
<entity name="PageBuilderTabNameNonBreakingSpace" type="pagebuilder_tab_property">
49+
<data key="name">Tab Name</data>
50+
<data key="section">general</data>
51+
<data key="fieldName">tab_name</data>
52+
<data key="value"> nbsp nbsp </data>
53+
</entity>
4854
<!-- Minimum Height -->
4955
<entity name="PageBuilderTabMinimumHeightDefaultProperty" type="pagebuilder_tab_property">
5056
<data key="name">Minimum Height</data>

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

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@
940940
<annotations>
941941
<features value="PageBuilder"/>
942942
<stories value="Banner"/>
943-
<title value="Banner Collage Center - Update All Attributes"/>
943+
<title value="Collage Center - Update All Attributes"/>
944944
<description value="A user should be able to add a collage center banner with all attribute fields filled."/>
945945
<severity value="CRITICAL"/>
946946
<useCaseId value="MC-1433"/>
@@ -1286,7 +1286,7 @@
12861286
<annotations>
12871287
<features value="PageBuilder"/>
12881288
<stories value="Banner"/>
1289-
<title value="Banner Collage Center - HTML Value In Buttons Does Not Render As HTML"/>
1289+
<title value="Collage Center - HTML Value In Buttons Does Not Render As HTML"/>
12901290
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
12911291
<severity value="MAJOR"/>
12921292
<useCaseId value="MC-849"/>
@@ -1351,4 +1351,65 @@
13511351
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
13521352
<seeElement selector="{{BannerOnFrontend.buttonText('1', PageBuilderBannerButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStorefront"/>
13531353
</test>
1354+
<test name="BannerCollageCenterNonBreakingSpaceValueInButtons">
1355+
<annotations>
1356+
<features value="PageBuilder"/>
1357+
<stories value="Banner"/>
1358+
<title value="Collage Center - Non Breaking Space In Button Does Not Render as nbsp;"/>
1359+
<description value="Validate that non breaking space can be entered into the button and that the html doesn't render on stage and storefront as nbsp."/>
1360+
<severity value="MAJOR"/>
1361+
<useCaseId value="MC-3889"/>
1362+
<testCaseId value="MC-4196"/>
1363+
<group value="pagebuilder"/>
1364+
<group value="pagebuilder-banner"/>
1365+
<group value="pagebuilder-bannerCollageCenter"/>
1366+
</annotations>
1367+
<before>
1368+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1369+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1370+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1371+
</before>
1372+
<after>
1373+
<actionGroup ref="logout" stepKey="logout"/>
1374+
</after>
1375+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1376+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1377+
</actionGroup>
1378+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1379+
<argument name="group" value="PageBuilderBannerContentType"/>
1380+
</actionGroup>
1381+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
1382+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1383+
</actionGroup>
1384+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
1385+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1386+
</actionGroup>
1387+
<!-- Fill Out Edit Panel -->
1388+
<comment userInput="Fill Out Edit Panel" stepKey="commentFillEditPanel"/>
1389+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1390+
<argument name="property" value="PageBuilderBannerCollageCenteredProperty"/>
1391+
</actionGroup>
1392+
<actionGroup ref="selectSlideOutPanelField" stepKey="selectShowButtonAlwaysProperty">
1393+
<argument name="property" value="PageBuilderBannerShowButtonAlwaysProperty"/>
1394+
</actionGroup>
1395+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1396+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
1397+
<!-- Validate Stage -->
1398+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1399+
<waitForElementVisible selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="waitForButtonIsEditable"/>
1400+
<click selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="clickButtonToEdit"/>
1401+
<pressKey selector="{{BannerOnBackend.editableButtonOnStage('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="enterButtonText"/>
1402+
<see selector="{{BannerOnBackend.editableButtonOnStage('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="seeStageNBSPBannerButtonText"/>
1403+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1404+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
1405+
<!-- Validate Stage After Save-->
1406+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1407+
<see selector="{{BannerOnBackend.editableButtonOnStage('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="seeStageNBSPBannerButtonTextAfterSave"/>
1408+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1409+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1410+
</actionGroup>
1411+
<!-- Validate Storefront -->
1412+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
1413+
<see selector="{{BannerOnFrontend.button('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="seeStorefrontNBSPButtonAfterSave"/>
1414+
</test>
13541415
</tests>

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@
940940
<annotations>
941941
<features value="PageBuilder"/>
942942
<stories value="Banner"/>
943-
<title value="Banner Collage Left - Update All Attributes"/>
943+
<title value="Collage Left - Update All Attributes"/>
944944
<description value="A user should be able to add a collage left banner with all attribute fields filled."/>
945945
<severity value="CRITICAL"/>
946946
<useCaseId value="MC-1433"/>
@@ -1286,7 +1286,7 @@
12861286
<annotations>
12871287
<features value="PageBuilder"/>
12881288
<stories value="Banner"/>
1289-
<title value="Banner Collage Left - HTML Value In Buttons Does Not Render As HTML"/>
1289+
<title value="Collage Left - HTML Value In Buttons Does Not Render As HTML"/>
12901290
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
12911291
<severity value="MAJOR"/>
12921292
<useCaseId value="MC-849"/>
@@ -1299,4 +1299,21 @@
12991299
<argument name="property" value="PageBuilderBannerCollageLeftProperty"/>
13001300
</actionGroup>
13011301
</test>
1302+
<test name="BannerCollageLeftNonBreakingSpaceValueInButtons" extends="BannerCollageCenterNonBreakingSpaceValueInButtons">
1303+
<annotations>
1304+
<features value="PageBuilder"/>
1305+
<stories value="Banner"/>
1306+
<title value="Collage Left - Non Breaking Space In Button Does Not Render as nbsp;"/>
1307+
<description value="Validate that non breaking space can be entered into the button and that the html doesn't render on stage and storefront as nbsp."/>
1308+
<severity value="MAJOR"/>
1309+
<useCaseId value="MC-3889"/>
1310+
<testCaseId value="MC-4197"/>
1311+
<group value="pagebuilder"/>
1312+
<group value="pagebuilder-banner"/>
1313+
<group value="pagebuilder-bannerCollageLeft"/>
1314+
</annotations>
1315+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1316+
<argument name="property" value="PageBuilderBannerCollageLeftProperty"/>
1317+
</actionGroup>
1318+
</test>
13021319
</tests>

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@
940940
<annotations>
941941
<features value="PageBuilder"/>
942942
<stories value="Banner"/>
943-
<title value="Banner Collage Right - Update All Attributes"/>
943+
<title value="Collage Right - Update All Attributes"/>
944944
<description value="A user should be able to add a collage right banner with all attribute fields filled."/>
945945
<severity value="CRITICAL"/>
946946
<useCaseId value="MC-1433"/>
@@ -1286,7 +1286,7 @@
12861286
<annotations>
12871287
<features value="PageBuilder"/>
12881288
<stories value="Banner"/>
1289-
<title value="Banner Collage Right - HTML Value In Buttons Does Not Render As HTML"/>
1289+
<title value="Collage Right - HTML Value In Buttons Does Not Render As HTML"/>
12901290
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
12911291
<severity value="MAJOR"/>
12921292
<useCaseId value="MC-849"/>
@@ -1299,4 +1299,21 @@
12991299
<argument name="property" value="PageBuilderBannerCollageRightProperty"/>
13001300
</actionGroup>
13011301
</test>
1302+
<test name="BannerCollageRightNonBreakingSpaceValueInButtons" extends="BannerCollageCenterNonBreakingSpaceValueInButtons">
1303+
<annotations>
1304+
<features value="PageBuilder"/>
1305+
<stories value="Banner"/>
1306+
<title value="Collage Right - Non Breaking Space In Button Does Not Render as nbsp;"/>
1307+
<description value="Validate that non breaking space can be entered into the button and that the html doesn't render on stage and storefront as nbsp."/>
1308+
<severity value="MAJOR"/>
1309+
<useCaseId value="MC-3889"/>
1310+
<testCaseId value="MC-4198"/>
1311+
<group value="pagebuilder"/>
1312+
<group value="pagebuilder-banner"/>
1313+
<group value="pagebuilder-bannerCollageRight"/>
1314+
</annotations>
1315+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1316+
<argument name="property" value="PageBuilderBannerCollageRightProperty"/>
1317+
</actionGroup>
1318+
</test>
13021319
</tests>

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@
10871087
<annotations>
10881088
<features value="PageBuilder"/>
10891089
<stories value="Banner"/>
1090-
<title value="Banner Poster - Update All Attributes"/>
1090+
<title value="Poster - Update All Attributes"/>
10911091
<description value="A user should be able to add a poster banner with all attribute fields filled."/>
10921092
<severity value="CRITICAL"/>
10931093
<useCaseId value="MC-1433"/>
@@ -1433,7 +1433,7 @@
14331433
<annotations>
14341434
<features value="PageBuilder"/>
14351435
<stories value="Banner"/>
1436-
<title value="Banner Poster - HTML Value In Buttons Does Not Render As HTML"/>
1436+
<title value="Poster - HTML Value In Buttons Does Not Render As HTML"/>
14371437
<description value="Validate that html can be entered into the button and that the html doesn't render on stage and storefront."/>
14381438
<severity value="MAJOR"/>
14391439
<useCaseId value="MC-849"/>
@@ -1446,4 +1446,21 @@
14461446
<argument name="property" value="PageBuilderBannerAppearance_Poster"/>
14471447
</actionGroup>
14481448
</test>
1449+
<test name="BannerPosterNonBreakingSpaceValueInButtons" extends="BannerCollageCenterNonBreakingSpaceValueInButtons">
1450+
<annotations>
1451+
<features value="PageBuilder"/>
1452+
<stories value="Banner"/>
1453+
<title value="Poster - Non Breaking Space In Button Does Not Render as nbsp;"/>
1454+
<description value="Validate that non breaking space can be entered into the button and that the html doesn't render on stage and storefront as nbsp."/>
1455+
<severity value="MAJOR"/>
1456+
<useCaseId value="MC-3889"/>
1457+
<testCaseId value="MC-4199"/>
1458+
<group value="pagebuilder"/>
1459+
<group value="pagebuilder-banner"/>
1460+
<group value="pagebuilder-bannerPoster"/>
1461+
</annotations>
1462+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
1463+
<argument name="property" value="PageBuilderBannerAppearance_Poster"/>
1464+
</actionGroup>
1465+
</test>
14491466
</tests>

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,4 +1348,55 @@
13481348
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
13491349
<seeElement selector="{{ButtonItemOnStorefront.buttonItemText('1', PageBuilderButtonItemText_Html.value)}}" stepKey="seeButtonTextStorefront"/>
13501350
</test>
1351+
<test name="ButtonItemEditNonBreakingSpaceStage">
1352+
<annotations>
1353+
<features value="PageBuilder"/>
1354+
<stories value="Buttons"/>
1355+
<title value="Button Item - Non Breaking Space"/>
1356+
<description value="Validate that non breaking space can be entered into the button and that the string literal is not in stage after save."/>
1357+
<severity value="MAJOR"/>
1358+
<useCaseId value="MC-3889"/>
1359+
<testCaseId value="MC-4200"/>
1360+
<group value="pagebuilder"/>
1361+
<group value="pagebuilder-buttons"/>
1362+
<group value="pagebuilder-buttonItem"/>
1363+
</annotations>
1364+
<before>
1365+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1366+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
1367+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1368+
</before>
1369+
<after>
1370+
<actionGroup ref="logout" stepKey="logout"/>
1371+
</after>
1372+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
1373+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1374+
</actionGroup>
1375+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1376+
<argument name="group" value="PageBuilderButtonsContentType"/>
1377+
</actionGroup>
1378+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragButtonsIntoStage">
1379+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1380+
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
1381+
<argument name="containerTargetIndex" value="1"/>
1382+
<argument name="contentTypeIndex" value="1"/>
1383+
</actionGroup>
1384+
<!--Edit button item text inline on stage -->
1385+
<comment userInput="Edit button item text inline on stage" stepKey="commentEditButtonItem"/>
1386+
<pressKey selector="{{ButtonItemOnStage.editableButtonItemElement('1')}}" userInput="{{PageBuilderButtonItemText_NBSP.value}}" stepKey="enterNBSPButtonItemText"/>
1387+
<!-- Stage: Check NBSP in button item -->
1388+
<comment userInput="Check NBSP in button item" stepKey="commentStageCheckNBSP"/>
1389+
<see selector="{{ButtonItemOnStage.base('1')}}" userInput="{{PageBuilderButtonItemText_NBSP.value}}" stepKey="seeStageNBSPButtonItemText"/>
1390+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1391+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
1392+
<!-- Stage: Check NBSP in button item after save -->
1393+
<comment userInput="Stage: Check NBSP in button item after save" stepKey="commentStageCheckNBSPAfterSave"/>
1394+
<see selector="{{ButtonItemOnStage.base('1')}}" userInput="{{PageBuilderButtonItemText_NBSP.value}}" stepKey="seeStageNBSPButtonItemTextAfterSave"/>
1395+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
1396+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1397+
</actionGroup>
1398+
<!-- Storefront: Check NBSP in button item -->
1399+
<comment userInput="Storefront: Check NBSP in button item" stepKey="commentStorefrontCheckNBSP"/>
1400+
<see selector="{{ButtonItemOnStorefront.base('1')}}" userInput="{{PageBuilderButtonItemText_NBSP.value}}" stepKey="seeStorefrontNBSPButtonItemTextAfterSave"/>
1401+
</test>
13511402
</tests>

0 commit comments

Comments
 (0)