Skip to content

Commit 110a56b

Browse files
davemacaulaydavemacaulay
committed
MC-4129: Edit Panel Opens After Dragging & Dropping Content Types
- Update tests to handle the edit panel no longer opening by default
1 parent 06b4a0a commit 110a56b

16 files changed

+518
-127
lines changed

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

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
4040
<argument name="contentType" value="PageBuilderBlockContentType"/>
4141
</actionGroup>
42+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
43+
<argument name="contentType" value="PageBuilderBlockContentType"/>
44+
</actionGroup>
4245
<actionGroup ref="closeEditPanelSettings" stepKey="closeSlideEditPanel"/>
4346
<waitForElementVisible selector="{{BlockOnStage.status('1', 'Empty Block')}}" stepKey="seeEmptyBlockPlaceHolder"/>
4447
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
@@ -79,6 +82,9 @@
7982
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
8083
<argument name="contentType" value="PageBuilderBlockContentType"/>
8184
</actionGroup>
85+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
86+
<argument name="contentType" value="PageBuilderBlockContentType"/>
87+
</actionGroup>
8288
<waitForElementVisible selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
8389
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
8490
<argument name="block" value="$$createPreReqBlock$$"/>
@@ -133,6 +139,9 @@
133139
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
134140
<argument name="contentType" value="PageBuilderBlockContentType"/>
135141
</actionGroup>
142+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
143+
<argument name="contentType" value="PageBuilderBlockContentType"/>
144+
</actionGroup>
136145
<waitForElementVisible selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
137146
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
138147
<argument name="block" value="$$createPreReqBlock$$"/>
@@ -208,7 +217,10 @@
208217
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupAddContent">
209218
<argument name="group" value="PageBuilderBlockContentType"/>
210219
</actionGroup>
211-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
220+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
221+
<argument name="contentType" value="PageBuilderBlockContentType"/>
222+
</actionGroup>
223+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
212224
<argument name="contentType" value="PageBuilderBlockContentType"/>
213225
</actionGroup>
214226
<waitForElementVisible selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
@@ -272,6 +284,9 @@
272284
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
273285
<argument name="contentType" value="PageBuilderBlockContentType"/>
274286
</actionGroup>
287+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
288+
<argument name="contentType" value="PageBuilderBlockContentType"/>
289+
</actionGroup>
275290
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
276291
<argument name="block" value="$$createPreReqBlock$$"/>
277292
</actionGroup>
@@ -349,10 +364,9 @@
349364
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupAddContent">
350365
<argument name="group" value="PageBuilderBlockContentType"/>
351366
</actionGroup>
352-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
367+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
353368
<argument name="contentType" value="PageBuilderBlockContentType"/>
354369
</actionGroup>
355-
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
356370
<actionGroup ref="removeEmptyContentTypeFromStage" stepKey="removeEmptyContentTypeFromStage">
357371
<argument name="contentType" value="PageBuilderBlockContentType"/>
358372
</actionGroup>
@@ -388,6 +402,9 @@
388402
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
389403
<argument name="contentType" value="PageBuilderBlockContentType"/>
390404
</actionGroup>
405+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
406+
<argument name="contentType" value="PageBuilderBlockContentType"/>
407+
</actionGroup>
391408
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
392409
<argument name="block" value="$createPreReqBlock$"/>
393410
</actionGroup>
@@ -433,7 +450,10 @@
433450
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupAddContent">
434451
<argument name="group" value="PageBuilderBlockContentType"/>
435452
</actionGroup>
436-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
453+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
454+
<argument name="contentType" value="PageBuilderBlockContentType"/>
455+
</actionGroup>
456+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
437457
<argument name="contentType" value="PageBuilderBlockContentType"/>
438458
</actionGroup>
439459
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
@@ -564,7 +584,10 @@
564584
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
565585
<argument name="group" value="PageBuilderBlockContentType"/>
566586
</actionGroup>
567-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
587+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
588+
<argument name="contentType" value="PageBuilderBlockContentType"/>
589+
</actionGroup>
590+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
568591
<argument name="contentType" value="PageBuilderBlockContentType"/>
569592
</actionGroup>
570593
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
@@ -767,11 +790,14 @@
767790
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupAddContent">
768791
<argument name="group" value="PageBuilderBlockContentType"/>
769792
</actionGroup>
770-
<actionGroup ref="dragContentTypeToContainerAndExpectEditPanel" stepKey="dragBlockOntoColumn">
793+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragBlockOntoColumn">
771794
<argument name="contentType" value="PageBuilderBlockContentType"/>
772795
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
773796
<argument name="containerTargetIndex" value="2" />
774797
</actionGroup>
798+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
799+
<argument name="contentType" value="PageBuilderBlockContentType"/>
800+
</actionGroup>
775801
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanel"/>
776802
<!-- Validate Stage -->
777803
<comment userInput="User sees Block displayed in column on Stage" stepKey="confirmBlockOnStage"/>
@@ -875,6 +901,9 @@
875901
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
876902
<argument name="contentType" value="PageBuilderBlockContentType"/>
877903
</actionGroup>
904+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
905+
<argument name="contentType" value="PageBuilderBlockContentType"/>
906+
</actionGroup>
878907
<waitForElementVisible selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
879908
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
880909
<argument name="block" value="$$createPreReqBlock$$"/>
@@ -947,6 +976,9 @@
947976
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
948977
<argument name="contentType" value="PageBuilderBlockContentType"/>
949978
</actionGroup>
979+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
980+
<argument name="contentType" value="PageBuilderBlockContentType"/>
981+
</actionGroup>
950982
<waitForElementVisible selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
951983
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
952984
<argument name="block" value="$$createPreReqBlock$$"/>
@@ -1009,6 +1041,9 @@
10091041
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
10101042
<argument name="contentType" value="PageBuilderBlockContentType"/>
10111043
</actionGroup>
1044+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
1045+
<argument name="contentType" value="PageBuilderBlockContentType"/>
1046+
</actionGroup>
10121047
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
10131048
<argument name="block" value="$$createPreReqBlock$$"/>
10141049
</actionGroup>
@@ -1063,6 +1098,9 @@
10631098
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
10641099
<argument name="contentType" value="PageBuilderBlockContentType"/>
10651100
</actionGroup>
1101+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
1102+
<argument name="contentType" value="PageBuilderBlockContentType"/>
1103+
</actionGroup>
10661104
<waitForElementVisible selector="{{BlockOnForm.title('Not Selected')}}" stepKey="seeNotSelectedBlock"/>
10671105
<actionGroup ref="searchBlockInGrid" stepKey="searchBlockInGrid">
10681106
<argument name="block" value="$$createPreReqBlock$$"/>

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

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@
3737
</actionGroup>
3838
<!-- Add Map -->
3939
<comment userInput="Add Map" stepKey="commentAddMap"/>
40-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragContentTypeIntoStage">
40+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeIntoStage">
41+
<argument name="contentType" value="PageBuilderMapContentType"/>
42+
</actionGroup>
43+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
4144
<argument name="contentType" value="PageBuilderMapContentType"/>
4245
</actionGroup>
4346
<!-- Validate Edit Panel: Empty Locations Grid -->
@@ -212,7 +215,10 @@
212215
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupMedia">
213216
<argument name="group" value="PageBuilderMapContentType"/>
214217
</actionGroup>
215-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragContentTypeIntoStage">
218+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeIntoStage">
219+
<argument name="contentType" value="PageBuilderMapContentType"/>
220+
</actionGroup>
221+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
216222
<argument name="contentType" value="PageBuilderMapContentType"/>
217223
</actionGroup>
218224
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
@@ -247,7 +253,10 @@
247253
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupMedia">
248254
<argument name="group" value="PageBuilderMapContentType"/>
249255
</actionGroup>
250-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragContentTypeIntoStage">
256+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeIntoStage">
257+
<argument name="contentType" value="PageBuilderMapContentType"/>
258+
</actionGroup>
259+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
251260
<argument name="contentType" value="PageBuilderMapContentType"/>
252261
</actionGroup>
253262
<!-- Validate Default Values -->
@@ -368,7 +377,10 @@
368377
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
369378
<argument name="group" value="PageBuilderMapContentType"/>
370379
</actionGroup>
371-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragContentTypeIntoStage">
380+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeIntoStage">
381+
<argument name="contentType" value="PageBuilderMapContentType"/>
382+
</actionGroup>
383+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
372384
<argument name="contentType" value="PageBuilderMapContentType"/>
373385
</actionGroup>
374386
<!-- Add Location -->
@@ -540,7 +552,10 @@
540552
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupMedia">
541553
<argument name="group" value="PageBuilderMapContentType"/>
542554
</actionGroup>
543-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragContentTypeIntoStage">
555+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeIntoStage">
556+
<argument name="contentType" value="PageBuilderMapContentType"/>
557+
</actionGroup>
558+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
544559
<argument name="contentType" value="PageBuilderMapContentType"/>
545560
</actionGroup>
546561
<!-- Add Location 1 -->
@@ -1006,7 +1021,10 @@
10061021
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupMedia">
10071022
<argument name="group" value="PageBuilderMapContentType"/>
10081023
</actionGroup>
1009-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragContentTypeIntoStage">
1024+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeIntoStage">
1025+
<argument name="contentType" value="PageBuilderMapContentType"/>
1026+
</actionGroup>
1027+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
10101028
<argument name="contentType" value="PageBuilderMapContentType"/>
10111029
</actionGroup>
10121030
<!-- Add Location 1 -->
@@ -1656,10 +1674,9 @@
16561674
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupMedia">
16571675
<argument name="group" value="PageBuilderMapContentType"/>
16581676
</actionGroup>
1659-
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragContentTypeIntoStage">
1677+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeIntoStage">
16601678
<argument name="contentType" value="PageBuilderMapContentType"/>
16611679
</actionGroup>
1662-
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanel"/>
16631680
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
16641681
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
16651682
<!-- Delete Map -->
@@ -1747,11 +1764,14 @@
17471764
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupMedia">
17481765
<argument name="group" value="PageBuilderMapContentType"/>
17491766
</actionGroup>
1750-
<actionGroup ref="dragContentTypeToContainerAndExpectEditPanel" stepKey="dragMapOntoColumnAndExpectEditPanel">
1767+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragMapOntoColumnAndExpectEditPanel">
17511768
<argument name="contentType" value="PageBuilderMapContentType"/>
17521769
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
17531770
<argument name="containerTargetIndex" value="2" />
17541771
</actionGroup>
1772+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
1773+
<argument name="contentType" value="PageBuilderMapContentType"/>
1774+
</actionGroup>
17551775
<!-- Update Edit Panel -->
17561776
<comment userInput="Update Edit Panel" stepKey="commentEdit"/>
17571777
<actionGroup ref="clickAddLocationButton" stepKey="clickAddLocationButton"/>
@@ -1854,6 +1874,9 @@
18541874
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
18551875
<argument name="containerTargetIndex" value="2" />
18561876
</actionGroup>
1877+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
1878+
<argument name="contentType" value="PageBuilderMapContentType"/>
1879+
</actionGroup>
18571880
<!-- Update Edit Panel -->
18581881
<comment userInput="Update Edit Panel" stepKey="commentEdit"/>
18591882
<actionGroup ref="clickAddLocationButton" stepKey="clickAddLocationButton"/>

0 commit comments

Comments
 (0)