Skip to content

Commit 8458df0

Browse files
committed
MC-4965: Text Wrapping Inside Inline WYSIWYG Editors Will Break On Words (Storefront as well for Slide & Banner)
- rename action group - move banner selectors - add banner group values - remove column resizing on banners
1 parent b945e3d commit 8458df0

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,16 @@
161161
<actualResult type="variable">textareaValue</actualResult>
162162
</assertEquals>
163163
</actionGroup>
164-
<actionGroup name="validateContentWordWrap">
164+
<actionGroup name="validateContentWordHeight">
165165
<arguments>
166166
<argument name="page"/>
167167
<argument name="height" type="string"/>
168168
<argument name="index" defaultValue="1" type="string"/>
169169
</arguments>
170170
<!-- Validate content height -->
171171
<comment userInput="Validate content height" stepKey="commentValidateContentHeight"/>
172-
<executeJS function="return {{page.contentJS(index)}}.getBoundingClientRect().height" stepKey="elHeight"/>
173-
<executeJS function="return Math.round(({$elHeight}/{{height}})*100)/100" stepKey="contentHeightRatio"/>
172+
<executeJS function="return {{page.contentJS(index)}}.getBoundingClientRect().height" stepKey="elementContentHeight"/>
173+
<executeJS function="return Math.round(({$elementContentHeight}/{{height}})*100)/100" stepKey="contentHeightRatio"/>
174174
<assertEquals stepKey="assertContentHeightRatio">
175175
<expectedResult type="int">1</expectedResult>
176176
<actualResult type="variable">contentHeightRatio</actualResult>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
<element name="variablePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{arg}}]//*[contains(@class, 'magento-variable magento-placeholder')]" parameterized="true"/>
7979
<element name="widgetPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{arg}}]//*[contains(@class, 'magento-placeholder magento-widget')]" parameterized="true"/>
8080
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
81-
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-role=banner] div.inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
8281
<!-- Appearance Configuration -->
8382
<element name="appearance" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
8483
<element name="posterMinimumHeight" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
@@ -93,6 +92,7 @@
9392
<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"/>
9493
<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"/>
9594
<!-- Content Configuration -->
95+
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-role=banner] div.inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
9696
<element name="messageContent" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
9797
<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"/>
9898
<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/Test/AdminPageBuilderBannerCollageLeftAppearanceTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,13 @@
316316
<testCaseId value="MC-5632"/>
317317
<group value="pagebuilder"/>
318318
<group value="pagebuilder-banner"/>
319+
<group value="pagebuilder-bannerCollageLeft"/>
320+
<group value="pagebuilder-wordWrap"/>
319321
</annotations>
320322
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
321323
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
322324
</actionGroup>
323-
<dragAndDrop selector1="{{ColumnOnBackend.columnX('1')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('6')}}" x="$guideWidth" stepKey="resizeColumn"/>
325+
<comment userInput="keyForRemoval" stepKey="duplicateColumn"/>
324326
</test>
325327
<test name="BannerCollageLeftButtonNeverShow">
326328
<annotations>

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,8 @@
466466
<testCaseId value="MC-5631"/>
467467
<group value="pagebuilder"/>
468468
<group value="pagebuilder-banner"/>
469+
<group value="pagebuilder-bannerPoster"/>
470+
<group value="pagebuilder-wordWrap"/>
469471
</annotations>
470472
<before>
471473
<resizeWindow width="1280" height="1024" stepKey="resetWindowToDesktopBefore"/>
@@ -485,6 +487,15 @@
485487
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
486488
<argument name="contentType" value="PageBuilderColumnContentType"/>
487489
</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="2"/>
496+
<argument name="contentTypeXCoordinate" value="10"/>
497+
<argument name="contentTypeYCoordinate" value="0"/>
498+
</actionGroup>
488499
<!-- Add content type to Column -->
489500
<comment userInput="Add content type to Column" stepKey="addContentTypeToColumn"/>
490501
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupElements">
@@ -506,22 +517,17 @@
506517
</actionGroup>
507518
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
508519
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
509-
<!-- Resize Columns -->
510-
<comment userInput="Resize Columns" stepKey="commentResizeColumns"/>
511-
<executeJS function="return document.querySelector('{{ColumnOnBackend.columnResizeGridLine('1')}}').clientWidth" stepKey="guideWidth"/>
512-
<dragAndDrop selector1="{{ColumnOnBackend.columnX('1')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('3')}}" x="$guideWidth" stepKey="resizeColumn"/>
513-
<waitForPageLoad stepKey="waitForDragAndDrop"/>
514520
<!-- Validate Height Before Save -->
515521
<comment userInput="Validate Height Before Save" stepKey="commentValidateBeforeSave"/>
516-
<actionGroup ref="validateContentWordWrap" stepKey="validateContentWordWrapStage">
522+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStage">
517523
<argument name="page" value="BannerOnBackend"/>
518524
<argument name="height" value="110"/>
519525
</actionGroup>
520526
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
521527
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
522528
<!-- Validate Height After Save -->
523529
<comment userInput="Validate Height After Save" stepKey="commentValidateAfterSave"/>
524-
<actionGroup ref="validateContentWordWrap" stepKey="validateContentWordWrapAfterSave">
530+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightAfterSave">
525531
<argument name="page" value="BannerOnBackend"/>
526532
<argument name="height" value="110"/>
527533
</actionGroup>
@@ -530,7 +536,7 @@
530536
</actionGroup>
531537
<!-- Validate Height Storefront -->
532538
<comment userInput="Validate Height Storefront" stepKey="commentValidateStorefront"/>
533-
<actionGroup ref="validateContentWordWrap" stepKey="validateContentWordWrapStorefront">
539+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStorefront">
534540
<argument name="page" value="BannerOnFrontend"/>
535541
<argument name="height" value="50"/>
536542
</actionGroup>

0 commit comments

Comments
 (0)