Skip to content

Commit c8a2eeb

Browse files
committed
MC-3908: Dragging a text content block into the stage causes global styles to be changed and fonts to flash
- Resolve test issues
1 parent 1a51cc6 commit c8a2eeb

7 files changed

+42
-0
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="clickOutsideTextInlineEditing">
12+
<comment userInput="Click outside text editable area" stepKey="commentClickOutside"/>
13+
<moveMouseOver selector="{{PageBuilderPanel.searchPanel}}" stepKey="moveMouseOutsideLiveEdit"/>
14+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
15+
<waitForPageLoad stepKey="waitForAnimation"/>
16+
</actionGroup>
17+
</actionGroups>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextIntoStage">
3838
<argument name="contentType" value="PageBuilderTextContentType"/>
3939
</actionGroup>
40+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
4041
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
4142
<argument name="contentType" value="PageBuilderTextContentType"/>
4243
</actionGroup>
@@ -187,6 +188,7 @@
187188
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
188189
<argument name="group" value="PageBuilderTextContentType"/>
189190
</actionGroup>
191+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
190192
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
191193
<argument name="contentType" value="PageBuilderTextContentType"/>
192194
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -874,6 +876,7 @@
874876
<argument name="containerTargetIndex" value="1"/>
875877
<argument name="contentTypeIndex" value="1"/>
876878
</actionGroup>
879+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
877880
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage1">
878881
<argument name="contentType" value="PageBuilderTextContentType"/>
879882
<argument name="contentTypeIndex" value="1"/>
@@ -1353,6 +1356,7 @@
13531356
<argument name="containerTargetIndex" value="1"/>
13541357
<argument name="contentTypeIndex" value="1"/>
13551358
</actionGroup>
1359+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
13561360
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
13571361
<argument name="contentType" value="PageBuilderTextContentType"/>
13581362
<argument name="contentTypeIndex" value="1"/>
@@ -1691,6 +1695,7 @@
16911695
<argument name="containerTargetIndex" value="1"/>
16921696
<argument name="contentTypeIndex" value="1"/>
16931697
</actionGroup>
1698+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
16941699
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage1">
16951700
<argument name="contentType" value="PageBuilderTextContentType"/>
16961701
<argument name="contentTypeIndex" value="1"/>
@@ -2093,6 +2098,7 @@
20932098
<argument name="containerTargetIndex" value="1"/>
20942099
<argument name="contentTypeIndex" value="1"/>
20952100
</actionGroup>
2101+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
20962102
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
20972103
<argument name="contentType" value="PageBuilderTextContentType"/>
20982104
<argument name="contentTypeIndex" value="1"/>
@@ -2417,6 +2423,7 @@
24172423
<argument name="containerTargetIndex" value="1"/>
24182424
<argument name="contentTypeIndex" value="1"/>
24192425
</actionGroup>
2426+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
24202427
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
24212428
<argument name="contentType" value="PageBuilderTextContentType"/>
24222429
<argument name="contentTypeIndex" value="1"/>
@@ -2492,6 +2499,7 @@
24922499
<argument name="containerTargetIndex" value="1"/>
24932500
<argument name="contentTypeIndex" value="1"/>
24942501
</actionGroup>
2502+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
24952503
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
24962504
<argument name="contentType" value="PageBuilderTextContentType"/>
24972505
<argument name="contentTypeIndex" value="1"/>
@@ -2605,6 +2613,7 @@
26052613
<argument name="containerTargetIndex" value="1"/>
26062614
<argument name="contentTypeIndex" value="1"/>
26072615
</actionGroup>
2616+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
26082617
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuOnStage">
26092618
<argument name="contentType" value="PageBuilderTextContentType"/>
26102619
<argument name="contentTypeIndex" value="1"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextIntoStage">
4545
<argument name="contentType" value="PageBuilderTextContentType"/>
4646
</actionGroup>
47+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
4748
<actionGroup ref="dragContentTypeToStage" stepKey="dragHeaderIntoStage">
4849
<argument name="contentType" value="PageBuilderHeadingContentType"/>
4950
</actionGroup>
@@ -1392,6 +1393,7 @@
13921393
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
13931394
<argument name="contentType" value="PageBuilderTextContentType"/>
13941395
</actionGroup>
1396+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
13951397
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
13961398
<argument name="contentType" value="PageBuilderTextContentType"/>
13971399
</actionGroup>
@@ -1508,6 +1510,7 @@
15081510
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
15091511
<argument name="contentType" value="PageBuilderTextContentType"/>
15101512
</actionGroup>
1513+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
15111514
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
15121515
<argument name="contentType" value="PageBuilderTextContentType"/>
15131516
</actionGroup>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@
625625
<argument name="containerTargetType" value="PageBuilderTabContentType"/>
626626
<argument name="containerTargetIndex" value="1" />
627627
</actionGroup>
628+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
628629
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
629630
<argument name="contentType" value="PageBuilderTextContentType"/>
630631
</actionGroup>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
<argument name="containerTargetType" value="PageBuilderTabContentType"/>
5454
<argument name="containerTargetIndex" value="1" />
5555
</actionGroup>
56+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
5657
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
5758
<argument name="contentType" value="PageBuilderTextContentType"/>
5859
</actionGroup>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@
231231
<argument name="containerTargetType" value="PageBuilderTabContentType"/>
232232
<argument name="containerTargetIndex" value="2" />
233233
</actionGroup>
234+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
234235
<comment userInput="User deletes tab with content from Tabs, user sees warning message" stepKey="AC3"/>
235236
<actionGroup ref="removeContentTypeFromStageSmallByIndex" stepKey="removeTabFromStage">
236237
<argument name="section" value="TabOnStage"/>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@
500500
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
501501
<argument name="contentType" value="PageBuilderTextContentType"/>
502502
</actionGroup>
503+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
503504
<!--Assert Text placeholder-->
504505
<comment userInput="Assert Text placeholder" stepKey="assertTextPlaceholder"/>
505506
<seeElement selector="{{TextOnStage.textPlaceholder('1')}}" stepKey="seeTextPlaceholder"/>
@@ -884,6 +885,7 @@
884885
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
885886
<argument name="contentType" value="PageBuilderTextContentType"/>
886887
</actionGroup>
888+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
887889
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
888890
<argument name="contentType" value="PageBuilderTextContentType"/>
889891
</actionGroup>
@@ -938,6 +940,7 @@
938940
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
939941
<argument name="contentType" value="PageBuilderTextContentType"/>
940942
</actionGroup>
943+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
941944
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
942945
<argument name="contentType" value="PageBuilderTextContentType"/>
943946
</actionGroup>
@@ -1003,6 +1006,7 @@
10031006
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
10041007
<argument name="contentType" value="PageBuilderTextContentType"/>
10051008
</actionGroup>
1009+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
10061010
<actionGroup ref="removeEmptyContentTypeFromStage" stepKey="removeEmptyContentTypeFromStage">
10071011
<argument name="contentType" value="PageBuilderTextContentType"/>
10081012
</actionGroup>
@@ -1037,6 +1041,7 @@
10371041
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextIntoStage">
10381042
<argument name="contentType" value="PageBuilderTextContentType"/>
10391043
</actionGroup>
1044+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
10401045
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
10411046
<argument name="contentType" value="PageBuilderTextContentType"/>
10421047
</actionGroup>
@@ -1165,6 +1170,7 @@
11651170
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
11661171
<argument name="contentType" value="PageBuilderTextContentType"/>
11671172
</actionGroup>
1173+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
11681174
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
11691175
<argument name="contentType" value="PageBuilderTextContentType"/>
11701176
</actionGroup>
@@ -1338,6 +1344,7 @@
13381344
<actionGroup ref="dragContentTypeToStage" stepKey="dragIntoStage">
13391345
<argument name="contentType" value="PageBuilderTextContentType"/>
13401346
</actionGroup>
1347+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
13411348
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
13421349
<argument name="contentType" value="PageBuilderTextContentType"/>
13431350
</actionGroup>
@@ -1553,6 +1560,7 @@
15531560
<actionGroup ref="dragContentTypeToStage" stepKey="dragIntoStage">
15541561
<argument name="contentType" value="PageBuilderTextContentType"/>
15551562
</actionGroup>
1563+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
15561564
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
15571565
<argument name="contentType" value="PageBuilderTextContentType"/>
15581566
</actionGroup>
@@ -1609,6 +1617,7 @@
16091617
<actionGroup ref="dragContentTypeToStage" stepKey="dragIntoStage">
16101618
<argument name="contentType" value="PageBuilderTextContentType"/>
16111619
</actionGroup>
1620+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
16121621
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
16131622
<argument name="contentType" value="PageBuilderTextContentType"/>
16141623
</actionGroup>
@@ -2233,6 +2242,7 @@
22332242
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
22342243
<argument name="contentType" value="PageBuilderTextContentType"/>
22352244
</actionGroup>
2245+
<actionGroup ref="clickOutsideTextInlineEditing" stepKey="closeLiveEdit"/>
22362246
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
22372247
<argument name="contentType" value="PageBuilderTextContentType"/>
22382248
</actionGroup>

0 commit comments

Comments
 (0)