Skip to content

Commit aaa5af1

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'MC-4965-text-wrap' into cms-team-1-delivery
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest.xml
2 parents e6b26c8 + 51549b0 commit aaa5af1

25 files changed

+646
-27
lines changed

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

+15
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,19 @@
161161
<actualResult type="variable">textareaValue</actualResult>
162162
</assertEquals>
163163
</actionGroup>
164+
<actionGroup name="validateContentWordHeight">
165+
<arguments>
166+
<argument name="page"/>
167+
<argument name="height" type="string"/>
168+
<argument name="index" defaultValue="1" type="string"/>
169+
</arguments>
170+
<!-- Validate content height -->
171+
<comment userInput="Validate content height" stepKey="commentValidateContentHeight"/>
172+
<executeJS function="return {{page.contentJS(index)}}.getBoundingClientRect().height" stepKey="elementContentHeight"/>
173+
<executeJS function="return Math.round(({$elementContentHeight}/{{height}})*100)/100" stepKey="contentHeightRatio"/>
174+
<assertEquals stepKey="assertContentHeightRatio">
175+
<expectedResult type="int">1</expectedResult>
176+
<actualResult type="variable">contentHeightRatio</actualResult>
177+
</assertEquals>
178+
</actionGroup>
164179
</actionGroups>

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

+8
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,12 @@
113113
<data key="name">Box Shadow</data>
114114
<data key="value">rgb(153, 153, 153) 0px 0px 0px 1px</data>
115115
</entity>
116+
<!-- Message -->
117+
<entity name="PageBuilderMessageProperty_WordBreak" type="pagebuilder_message_property">
118+
<data key="name">Message Text</data>
119+
<data key="section">contents</data>
120+
<data key="role">textarea</data>
121+
<data key="fieldName">message</data>
122+
<data key="value">Magento1111111 Page11111111111</data>
123+
</entity>
116124
</entities>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<element name="backgroundImage" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
3232
<element name="noBackgroundImage" type="button" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'background-image:'))]" parameterized="true"/>
3333
<!-- Content Configuration -->
34+
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-role=banner] [data-element=content]')[{{arg1}} - 1]" parameterized="true"/>
3435
<element name="messageContent" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
3536
<element name="noMessageContent" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][.='Edit Banner Text'][not(*)]" parameterized="true"/>
3637
<element name="messageContentTextArea" type="text" selector="(//div[@data-role='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][.='{{arg2}}']" parameterized="true"/>
@@ -94,6 +95,7 @@
9495
<element name="backgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
9596
<element name="noBackgroundImage" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'background-image:'))]" parameterized="true"/>
9697
<!-- Content Configuration -->
98+
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-role=banner] div.inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
9799
<element name="messageContent" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
98100
<element name="noMessageContent" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='content'][.='Edit Banner Text'][not(*)]" parameterized="true"/>
99101
<element name="messageContentText" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{arg1}}]/div//div[contains(@class, 'pagebuilder-banner-text-content')]//*[contains(.,'{{arg2}}') and contains(@class, 'inline-wysiwyg')]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml

+2
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
<element name="backgroundRepeat" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
8888
<element name="backgroundAttachment" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
8989
<!-- Content Configuration -->
90+
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-role=slide] [data-element=content]')[{{arg1}} - 1]" parameterized="true"/>
9091
<element name="messageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
9192
<element name="noMessageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][not(*)]" parameterized="true"/>
9293
<element name="messageContentTextArea" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][.='{{arg2}}']" parameterized="true"/>
@@ -152,6 +153,7 @@
152153
<element name="backgroundRepeat" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
153154
<element name="backgroundAttachment" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
154155
<!-- Content Configuration -->
156+
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-role=slider] div.inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
155157
<element name="messageContentText" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg1}}]/div//*[contains(.,'{{arg2}}') and contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
156158
<element name="messageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//p[text()='{{arg2}}']" parameterized="true"/>
157159
<element name="noMessageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content'][.='Edit Slide Text'][not(*)]" parameterized="true"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection.xml

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
<element name="emptyTextInImportantStyle" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(normalize-space(@class), 'cms-content-important')]" parameterized="true"/>
2929
<element name="imageSource" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//img[contains(@src,'{{var1}}')]" parameterized="true"/>
3030
<element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
31+
<element name="wysiwyg" type="text" selector="(//div[@data-role='text'])[{{arg1}}][contains(@class,'inline-wysiwyg')]" parameterized="true"/>
32+
<element name="contentJS" type="text" selector="document.querySelectorAll('div[data-role=text].inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
3133
<!-- Advanced Configuration -->
3234
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
3335
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div[not(contains(@style,'text-align:'))]" parameterized="true"/>
@@ -79,6 +81,7 @@
7981
<element name="image" type="text" selector="//div[@data-role='text'][{{arg1}}]//img[contains(@src,'{{arg2}}')]" parameterized="true"/>
8082
<element name="textInImportantStyle" type="text" selector="//div[contains(normalize-space(@class), 'cms-content-important') and text()='{{arg1}}']" parameterized="true"/>
8183
<element name="emptyTextInImportantStyle" type="text" selector="//div[@data-role='text'][{{arg1}}]//div[@class='cms-content-important'][not(*)]" parameterized="true"/>
84+
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-role=text][data-element=main]')[{{arg1}} - 1]" parameterized="true"/>
8285
<!-- Advanced Configuration -->
8386
<element name="alignment" type="text" selector="(//div[@data-role='text'])[{{arg1}}][contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
8487
<element name="noAlignment" type="text" selector="(//div[@data-role='text'])[{{arg1}}][not(contains(@style,'text-align:'))]" parameterized="true"/>

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

+19
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,25 @@
305305
<argument name="pageNamePrefix" value="banner"/>
306306
</actionGroup>
307307
</test>
308+
<test name="BannerCollageLeftContentCanWordWrap" extends="BannerPosterContentCanWordWrap">
309+
<annotations>
310+
<features value="PageBuilder"/>
311+
<stories value="Banner"/>
312+
<title value="Collage Left - Banner content can wrap words to multiple lines"/>
313+
<description value="A user can see banner collage left content word wrap to multiple lines"/>
314+
<severity value="CRITICAL"/>
315+
<useCaseId value="MC-4965"/>
316+
<testCaseId value="MC-5632"/>
317+
<group value="pagebuilder"/>
318+
<group value="pagebuilder-banner"/>
319+
<group value="pagebuilder-bannerCollageLeft"/>
320+
<group value="pagebuilder-wordWrap"/>
321+
</annotations>
322+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
323+
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
324+
</actionGroup>
325+
<comment userInput="keyForRemoval" stepKey="duplicateColumn"/>
326+
</test>
308327
<test name="BannerCollageLeftButtonNeverShow">
309328
<annotations>
310329
<features value="PageBuilder"/>

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

+86
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,92 @@
455455
<resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
456456
<seeElement selector="{{BannerOnFrontend.wysiwygLinkUrl('1', ExternalLink.googleUrl)}}" stepKey="waitForBannerStorefrontMobile"/>
457457
</test>
458+
<test name="BannerPosterContentCanWordWrap">
459+
<annotations>
460+
<features value="PageBuilder"/>
461+
<stories value="Banner"/>
462+
<title value="Poster - Banner content can wrap words to multiple lines"/>
463+
<description value="A user can see banner poster content word wrap to multiple lines"/>
464+
<severity value="CRITICAL"/>
465+
<useCaseId value="MC-4965"/>
466+
<testCaseId value="MC-5631"/>
467+
<group value="pagebuilder"/>
468+
<group value="pagebuilder-banner"/>
469+
<group value="pagebuilder-bannerPoster"/>
470+
<group value="pagebuilder-wordWrap"/>
471+
</annotations>
472+
<before>
473+
<resizeWindow width="1280" height="1024" stepKey="resetWindowToDesktopBefore"/>
474+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
475+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
476+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
477+
</before>
478+
<after>
479+
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktopAfter"/>
480+
<actionGroup ref="logout" stepKey="logout"/>
481+
</after>
482+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
483+
<argument name="contentType" value="PageBuilderBannerContentType"/>
484+
</actionGroup>
485+
<!-- Add Column to Stage -->
486+
<comment userInput="Add Column to Stage" stepKey="addColumnToStage"/>
487+
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
488+
<argument name="contentType" value="PageBuilderColumnContentType"/>
489+
</actionGroup>
490+
<!-- Duplicate Column to create small width -->
491+
<comment userInput="Duplicate Column to create small width" stepKey="commentDuplicateColumnToCreateSmallWidth"/>
492+
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
493+
<argument name="contentType" value="PageBuilderColumnContentType"/>
494+
<argument name="targetIndex" value="1"/>
495+
<argument name="expectedIndex" value="3"/>
496+
<argument name="contentTypeXCoordinate" value="10"/>
497+
<argument name="contentTypeYCoordinate" value="0"/>
498+
</actionGroup>
499+
<!-- Add content type to Column -->
500+
<comment userInput="Add content type to Column" stepKey="addContentTypeToColumn"/>
501+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupElements">
502+
<argument name="group" value="PageBuilderBannerContentType"/>
503+
</actionGroup>
504+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage">
505+
<argument name="contentType" value="PageBuilderBannerContentType"/>
506+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
507+
</actionGroup>
508+
<actionGroup ref="inlineEditWYSIWYGFromStage" stepKey="inlineEdit">
509+
<argument name="contentType" value="PageBuilderBannerContentType"/>
510+
<argument name="content" value="{{PageBuilderMessageProperty_WordBreak.value}}"/>
511+
</actionGroup>
512+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
513+
<argument name="contentType" value="PageBuilderBannerContentType"/>
514+
</actionGroup>
515+
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
516+
<argument name="property" value="PageBuilderAppearance_Poster"/>
517+
</actionGroup>
518+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
519+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
520+
<!-- Validate Height Before Save -->
521+
<comment userInput="Validate Height Before Save" stepKey="commentValidateBeforeSave"/>
522+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStage">
523+
<argument name="page" value="BannerOnBackend"/>
524+
<argument name="height" value="110"/>
525+
</actionGroup>
526+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
527+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
528+
<!-- Validate Height After Save -->
529+
<comment userInput="Validate Height After Save" stepKey="commentValidateAfterSave"/>
530+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightAfterSave">
531+
<argument name="page" value="BannerOnBackend"/>
532+
<argument name="height" value="110"/>
533+
</actionGroup>
534+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
535+
<argument name="contentType" value="PageBuilderBannerContentType"/>
536+
</actionGroup>
537+
<!-- Validate Height Storefront -->
538+
<comment userInput="Validate Height Storefront" stepKey="commentValidateStorefront"/>
539+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStorefront">
540+
<argument name="page" value="BannerOnFrontend"/>
541+
<argument name="height" value="50"/>
542+
</actionGroup>
543+
</test>
458544
<test name="BannerPosterButtonNeverShow">
459545
<annotations>
460546
<features value="PageBuilder"/>

0 commit comments

Comments
 (0)