Skip to content

Commit c8e4555

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 slider selectors - add slider group values - remove column resizing on slider
1 parent 8458df0 commit c8e4555

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@
135135
<element name="variablePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg}}]//*[contains(@class, 'magento-variable magento-placeholder')]" parameterized="true"/>
136136
<element name="widgetPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg}}]//*[contains(@class, 'magento-placeholder magento-widget')]" parameterized="true"/>
137137
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
138-
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-role=slider] div.inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
139138
<!-- Appearance Configuration -->
140139
<element name="appearance" type="text" selector="(//div[@data-role='slide'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
141140
<element name="slideName" type="button" selector="(//div[@data-role='slide'])[{{arg1}}][@data-slide-name='{{arg2}}']" parameterized="true"/>
@@ -151,6 +150,7 @@
151150
<element name="backgroundRepeat" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
152151
<element name="backgroundAttachment" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
153152
<!-- Content Configuration -->
153+
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-role=slider] div.inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
154154
<element name="messageContentText" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg1}}]/div//*[contains(.,'{{arg2}}') and contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
155155
<element name="messageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//p[text()='{{arg2}}']" parameterized="true"/>
156156
<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/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTests.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,15 @@
130130
<group value="pagebuilder"/>
131131
<group value="pagebuilder-slide"/>
132132
<group value="pagebuilder-slideItemCollageLeft"/>
133+
<group value="pagebuilder-wordWrap"/>
133134
</annotations>
134135
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
135136
<argument name="contentType" value="PageBuilderSliderContentType"/>
136137
</actionGroup>
137138
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupElements">
138139
<argument name="group" value="PageBuilderSliderContentType"/>
139140
</actionGroup>
141+
<comment userInput="keyForRemoval" stepKey="duplicateColumn"/>
140142
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage">
141143
<argument name="contentType" value="PageBuilderSliderContentType"/>
142144
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -145,25 +147,24 @@
145147
<argument name="contentType" value="PageBuilderSliderContentType"/>
146148
<argument name="content" value="{{PageBuilderMessageProperty_WordBreak.value}}"/>
147149
</actionGroup>
148-
<dragAndDrop selector1="{{ColumnOnBackend.columnX('1')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('6')}}" x="$guideWidth" stepKey="resizeColumn"/>
149150
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage">
150151
<argument name="section" value="SlideOnBackend"/>
151152
</actionGroup>
152153
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
153154
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
154155
</actionGroup>
155-
<actionGroup ref="validateContentWordWrap" stepKey="validateContentWordWrapStage">
156+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStage">
156157
<argument name="page" value="SlideOnBackend"/>
157158
<argument name="height" value="110"/>
158159
</actionGroup>
159-
<actionGroup ref="validateContentWordWrap" stepKey="validateContentWordWrapAfterSave">
160+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightAfterSave">
160161
<argument name="page" value="SlideOnBackend"/>
161162
<argument name="height" value="80"/>
162163
</actionGroup>
163164
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
164165
<argument name="contentType" value="PageBuilderSliderContentType"/>
165166
</actionGroup>
166-
<actionGroup ref="validateContentWordWrap" stepKey="validateContentWordWrapStorefront">
167+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStorefront">
167168
<argument name="page" value="SlideOnFrontend"/>
168169
<argument name="height" value="50"/>
169170
</actionGroup>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@
247247
<group value="pagebuilder"/>
248248
<group value="pagebuilder-slide"/>
249249
<group value="pagebuilder-slideItemPoster"/>
250+
<group value="pagebuilder-wordWrap"/>
250251
</annotations>
251252
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
252253
<argument name="contentType" value="PageBuilderSliderContentType"/>
@@ -265,18 +266,18 @@
265266
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage">
266267
<argument name="section" value="SlideOnBackend"/>
267268
</actionGroup>
268-
<actionGroup ref="validateContentWordWrap" stepKey="validateContentWordWrapStage">
269+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStage">
269270
<argument name="page" value="SlideOnBackend"/>
270271
<argument name="height" value="110"/>
271272
</actionGroup>
272-
<actionGroup ref="validateContentWordWrap" stepKey="validateContentWordWrapAfterSave">
273+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightAfterSave">
273274
<argument name="page" value="SlideOnBackend"/>
274275
<argument name="height" value="80"/>
275276
</actionGroup>
276277
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
277278
<argument name="contentType" value="PageBuilderSliderContentType"/>
278279
</actionGroup>
279-
<actionGroup ref="validateContentWordWrap" stepKey="validateContentWordWrapStorefront">
280+
<actionGroup ref="validateContentWordHeight" stepKey="validateContentWordHeightStorefront">
280281
<argument name="page" value="SlideOnFrontend"/>
281282
<argument name="height" value="50"/>
282283
</actionGroup>

0 commit comments

Comments
 (0)