Skip to content

Commit e836119

Browse files
raith-hamzahraith-hamzah
committed
Merge branch 'MC-3162-panel-regroup' of github.com:magento-obsessive-owls/bluefoot into MC-3162-panel-regroup
2 parents e886eec + 510e2fa commit e836119

25 files changed

+203
-33
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
4949
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
5050
</arguments>
51-
<scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
51+
<waitForElementVisible time="30" selector="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" stepKey="waitForContentTypeInPanel"/>
5252
<dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/>
5353
<waitForPageLoad stepKey="waitForAnimation" time="30"/>
5454
<waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage" />

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

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,9 @@
862862
</actionGroup>
863863
<!-- Add Border Color: Empty -->
864864
<comment userInput="Add Border Color: Empty" stepKey="commentAddBorderColorEmpty"/>
865+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
866+
<argument name="group" value="PageBuilderTextContentType"/>
867+
</actionGroup>
865868
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
866869
<argument name="contentType" value="PageBuilderTextContentType"/>
867870
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -908,9 +911,6 @@
908911
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
909912
<!-- Add Border Color: #FF0000 -->
910913
<comment userInput="Add Border Color: Hex #FF0000" stepKey="commentAddBorderColorHex"/>
911-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
912-
<argument name="group" value="PageBuilderTextContentType"/>
913-
</actionGroup>
914914
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage3">
915915
<argument name="contentType" value="PageBuilderTextContentType"/>
916916
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -1126,6 +1126,9 @@
11261126
</actionGroup>
11271127
<!-- Add Border Width: Empty -->
11281128
<comment userInput="Add Border Width: Empty" stepKey="commentAddBorderWidthEmpty"/>
1129+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1130+
<argument name="group" value="PageBuilderTextContentType"/>
1131+
</actionGroup>
11291132
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
11301133
<argument name="contentType" value="PageBuilderTextContentType"/>
11311134
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -1399,6 +1402,9 @@
13991402
</actionGroup>
14001403
<!-- Add Border Radius: Empty -->
14011404
<comment userInput="Add Border Radius: Empty" stepKey="commentAddBorderRadiusEmpty"/>
1405+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1406+
<argument name="group" value="PageBuilderTextContentType"/>
1407+
</actionGroup>
14021408
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
14031409
<argument name="contentType" value="PageBuilderTextContentType"/>
14041410
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -1636,6 +1642,9 @@
16361642
</actionGroup>
16371643
<!-- Add CSS Classes: Empty -->
16381644
<comment userInput="Add CSS Classes: Empty" stepKey="commentAddCSSClassesEmpty"/>
1645+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1646+
<argument name="group" value="PageBuilderTextContentType"/>
1647+
</actionGroup>
16391648
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
16401649
<argument name="contentType" value="PageBuilderTextContentType"/>
16411650
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -1803,6 +1812,9 @@
18031812
</actionGroup>
18041813
<!-- Add Margins: Empty -->
18051814
<comment userInput="Add Margins: Empty" stepKey="commentAddMarginsEmpty"/>
1815+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1816+
<argument name="group" value="PageBuilderTextContentType"/>
1817+
</actionGroup>
18061818
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
18071819
<argument name="contentType" value="PageBuilderTextContentType"/>
18081820
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -2090,6 +2102,9 @@
20902102
</actionGroup>
20912103
<!-- Add Padding: Empty -->
20922104
<comment userInput="Add Padding: Empty" stepKey="commentAddPaddingEmpty"/>
2105+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
2106+
<argument name="group" value="PageBuilderTextContentType"/>
2107+
</actionGroup>
20932108
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
20942109
<argument name="contentType" value="PageBuilderTextContentType"/>
20952110
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -2360,6 +2375,9 @@
23602375
</actionGroup>
23612376
<!-- Add Text To Stage -->
23622377
<comment userInput="Add Text To Stage" stepKey="commentAddText"/>
2378+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
2379+
<argument name="group" value="PageBuilderTextContentType"/>
2380+
</actionGroup>
23632381
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage">
23642382
<argument name="contentType" value="PageBuilderTextContentType"/>
23652383
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -2470,6 +2488,9 @@
24702488
</actionGroup>
24712489
<!-- Add Text To Stage -->
24722490
<comment userInput="Add Text To Stage" stepKey="commentAddText"/>
2491+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
2492+
<argument name="group" value="PageBuilderTextContentType"/>
2493+
</actionGroup>
24732494
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage">
24742495
<argument name="contentType" value="PageBuilderTextContentType"/>
24752496
<argument name="containerTargetType" value="PageBuilderRowContentType"/>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
<group value="pagebuilder"/>
5959
<group value="pagebuilder-banner"/>
6060
<group value="pagebuilder-bannerCommon"/>
61+
<!-- Skipped due to form key issues MC-3386 -->
62+
<group value="skip" />
6163
</annotations>
6264
<before>
6365
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -865,6 +867,8 @@
865867
<group value="pagebuilder"/>
866868
<group value="pagebuilder-banner"/>
867869
<group value="pagebuilder-bannerCommon"/>
870+
<!-- Skipped due to form key issues MC-3386 -->
871+
<group value="skip" />
868872
</annotations>
869873
<before>
870874
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,6 +1302,8 @@
13021302
<group value="pagebuilder"/>
13031303
<group value="pagebuilder-buttons"/>
13041304
<group value="pagebuilder-buttonGroup"/>
1305+
<!-- Skipped due to form key issues MC-3386 -->
1306+
<group value="skip" />
13051307
</annotations>
13061308
<before>
13071309
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,9 @@
216216
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
217217
<argument name="contentType" value="PageBuilderColumnContentType"/>
218218
</actionGroup>
219+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
220+
<argument name="group" value="PageBuilderHeadingContentType"/>
221+
</actionGroup>
219222
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingIntoColumn">
220223
<argument name="contentType" value="PageBuilderHeadingContentType"/>
221224
<argument name="contentTypeIndex" value="1"/>
@@ -326,6 +329,9 @@
326329
</actionGroup>
327330
<seeNumberOfElements selector="{{ColumnOnBackend.columnGroupColumns('1')}}" userInput="3" stepKey="seeThreeColumnsFirstGroup"/>
328331
<seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="5" stepKey="validateFiveTotalColumns"/>
332+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
333+
<argument name="group" value="PageBuilderHeadingContentType"/>
334+
</actionGroup>
329335
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingIntoColumn">
330336
<argument name="contentType" value="PageBuilderHeadingContentType"/>
331337
<argument name="contentTypeIndex" value="1"/>
@@ -384,6 +390,9 @@
384390
<actionGroup ref="dragContentTypeToStage" stepKey="dragFirstColumnIntoStage">
385391
<argument name="contentType" value="PageBuilderColumnContentType"/>
386392
</actionGroup>
393+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
394+
<argument name="group" value="PageBuilderHeadingContentType"/>
395+
</actionGroup>
387396
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingIntoColumn">
388397
<argument name="contentType" value="PageBuilderHeadingContentType"/>
389398
<argument name="contentTypeIndex" value="1"/>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@
201201
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
202202
</before>
203203
<after>
204+
<magentoCLI command="config:set cms/pagebuilder/column_grid_default 12" stepKey="setDefaultGridSize"/>
204205
<actionGroup ref="logout" stepKey="logOut"/>
205206
</after>
206207
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
@@ -261,6 +262,9 @@
261262
<waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2','3/6')}}" stepKey="validateRightColumnWidth"/>
262263
<!-- Drag divider into first column to clear history -->
263264
<comment userInput="Drag divider into first column to clear history" stepKey="commentAddDividerToColumn" />
265+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
266+
<argument name="group" value="PageBuilderDividerContentType"/>
267+
</actionGroup>
264268
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage">
265269
<argument name="contentType" value="PageBuilderDividerContentType"/>
266270
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -445,6 +449,9 @@
445449
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
446450
<argument name="contentType" value="PageBuilderColumnContentType"/>
447451
</actionGroup>
452+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
453+
<argument name="group" value="PageBuilderDividerContentType"/>
454+
</actionGroup>
448455
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage">
449456
<argument name="contentType" value="PageBuilderDividerContentType"/>
450457
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
<!-- Assert the width class changed to 100 correctly on the first column -->
5050
<waitForElement selector="{{ColumnOnBackend.columnByIndexAndWidthClass('1','100')}}" stepKey="assertWidthClass1"/>
5151
<!-- Add a new column -->
52+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
53+
<argument name="group" value="PageBuilderDividerContentType"/>
54+
</actionGroup>
5255
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage">
5356
<argument name="contentType" value="PageBuilderDividerContentType"/>
5457
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -125,6 +128,9 @@
125128
<!-- Assert the width classes are correct after manual resize -->
126129
<waitForElement selector="{{ColumnOnBackend.columnByIndexAndWidthClass('1','90')}}" stepKey="assertWidthClass1"/>
127130
<waitForElement selector="{{ColumnOnBackend.columnByIndexAndWidthClass('2','20')}}" stepKey="assertWidthClass2"/>
131+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
132+
<argument name="group" value="PageBuilderDividerContentType"/>
133+
</actionGroup>
128134
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
129135
<argument name="contentType" value="PageBuilderDividerContentType"/>
130136
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -213,6 +219,9 @@
213219
<argument name="contentType" value="PageBuilderColumnContentType"/>
214220
<argument name="contentTypeNumber" value="1"/>
215221
</actionGroup>
222+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
223+
<argument name="group" value="PageBuilderDividerContentType"/>
224+
</actionGroup>
216225
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
217226
<argument name="contentType" value="PageBuilderDividerContentType"/>
218227
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -400,6 +409,9 @@
400409
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
401410
<argument name="contentType" value="PageBuilderColumnContentType"/>
402411
</actionGroup>
412+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
413+
<argument name="group" value="PageBuilderDividerContentType"/>
414+
</actionGroup>
403415
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
404416
<argument name="contentType" value="PageBuilderDividerContentType"/>
405417
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -486,6 +498,9 @@
486498
<argument name="containerTargetIndex" value="2"/>
487499
</actionGroup>
488500
<dragAndDrop selector1="{{ColumnOnBackend.columnX('2')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('10')}}" x="$guideWidth" stepKey="resizeColumn2ToFive"/>
501+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
502+
<argument name="group" value="PageBuilderDividerContentType"/>
503+
</actionGroup>
489504
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
490505
<argument name="contentType" value="PageBuilderDividerContentType"/>
491506
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -599,6 +614,9 @@
599614
<argument name="containerTargetIndex" value="3"/>
600615
</actionGroup>
601616
<dragAndDrop selector1="{{ColumnOnBackend.columnX('3')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('10')}}" x="$guideWidth" stepKey="resizeSecondColumnToTwo"/>
617+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
618+
<argument name="group" value="PageBuilderDividerContentType"/>
619+
</actionGroup>
602620
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
603621
<argument name="contentType" value="PageBuilderDividerContentType"/>
604622
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -741,6 +759,9 @@
741759
<argument name="contentType" value="PageBuilderColumnContentType"/>
742760
<argument name="contentTypeNumber" value="1"/>
743761
</actionGroup>
762+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
763+
<argument name="group" value="PageBuilderDividerContentType"/>
764+
</actionGroup>
744765
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
745766
<argument name="contentType" value="PageBuilderDividerContentType"/>
746767
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@
259259
<argument name="property" value="PageBuilderVerticalAlignmentPropertyTop"/>
260260
</actionGroup>
261261
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsFirstColumn"/>
262+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
263+
<argument name="group" value="PageBuilderHeadingContentType"/>
264+
</actionGroup>
262265
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToFirstColumn">
263266
<argument name="contentType" value="PageBuilderHeadingContentType"/>
264267
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -368,6 +371,9 @@
368371
<argument name="property" value="PageBuilderVerticalAlignmentPropertyTop"/>
369372
</actionGroup>
370373
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsFirstColumn"/>
374+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
375+
<argument name="group" value="PageBuilderHeadingContentType"/>
376+
</actionGroup>
371377
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToFirstColumn">
372378
<argument name="contentType" value="PageBuilderHeadingContentType"/>
373379
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -931,6 +937,8 @@
931937
<testCaseId value="MC-2401"/>
932938
<group value="pagebuilder"/>
933939
<group value="pagebuilder-column"/>
940+
<!-- Skipped due to form key issues MC-3386 -->
941+
<group value="skip" />
934942
</annotations>
935943
<before>
936944
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -1253,6 +1261,9 @@
12531261
<argument name="containerTargetIndex" value="1"/>
12541262
<argument name="contentTypeIndex" value="1"/>
12551263
</actionGroup>
1264+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1265+
<argument name="group" value="PageBuilderHeadingContentType"/>
1266+
</actionGroup>
12561267
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeading1ToFirstColumn">
12571268
<argument name="contentType" value="PageBuilderHeadingContentType"/>
12581269
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -1372,7 +1383,10 @@
13721383
<seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpgCopy.fileName)}}" stepKey="seeMainImageSource3"/>
13731384
<seeElement selector="{{ImageOnConfigurationPanel.trashBinIcon}}" stepKey="seeTrashBinBtn"/>
13741385
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
1375-
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
1386+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1387+
<argument name="group" value="PageBuilderTextContentType"/>
1388+
</actionGroup>
1389+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
13761390
<argument name="contentType" value="PageBuilderTextContentType"/>
13771391
</actionGroup>
13781392
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">

0 commit comments

Comments
 (0)