Skip to content

Commit 1ba4ccd

Browse files
author
Hwashiang Yu
committed
MC-5810: Improve naming of the critical variables/parameters in the code and configuration
- Resolved test generation failures - Updated group step keys to menu section
1 parent bc66676 commit 1ba4ccd

26 files changed

+160
-160
lines changed

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
<argument name="CMSPage" value="$$createCMSPage$$"/>
5151
</actionGroup>
5252
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage" after="navigateToCreatedCMSPage"/>
53-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStage">
53+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStage">
5454
<argument name="contentType" value="PageBuilderBlockContentType"/>
5555
</actionGroup>
56-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
56+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
5757
<argument name="contentType" value="PageBuilderBlockContentType"/>
5858
</actionGroup>
5959
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -122,10 +122,10 @@
122122
<argument name="CMSPage" value="$$createCMSPage$$"/>
123123
</actionGroup>
124124
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage" after="navigateToCreatedCMSPage"/>
125-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStage">
125+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStage">
126126
<argument name="contentType" value="PageBuilderBlockContentType"/>
127127
</actionGroup>
128-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
128+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
129129
<argument name="contentType" value="PageBuilderBlockContentType"/>
130130
</actionGroup>
131131
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -183,10 +183,10 @@
183183
<argument name="CMSPage" value="$$createCMSPage$$"/>
184184
</actionGroup>
185185
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage" after="navigateToCreatedCMSPage"/>
186-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStage">
186+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStage">
187187
<argument name="contentType" value="PageBuilderBlockContentType"/>
188188
</actionGroup>
189-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
189+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
190190
<argument name="contentType" value="PageBuilderBlockContentType"/>
191191
</actionGroup>
192192
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -244,10 +244,10 @@
244244
<argument name="CMSPage" value="$$createCMSPage$$"/>
245245
</actionGroup>
246246
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage" after="navigateToCreatedCMSPage"/>
247-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStage">
247+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStage">
248248
<argument name="contentType" value="PageBuilderBlockContentType"/>
249249
</actionGroup>
250-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
250+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
251251
<argument name="contentType" value="PageBuilderBlockContentType"/>
252252
</actionGroup>
253253
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -311,10 +311,10 @@
311311
<argument name="CMSPage" value="$$createCMSPage$$"/>
312312
</actionGroup>
313313
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage" after="navigateToCreatedCMSPage"/>
314-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStage">
314+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStage">
315315
<argument name="contentType" value="PageBuilderBlockContentType"/>
316316
</actionGroup>
317-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
317+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
318318
<argument name="contentType" value="PageBuilderBlockContentType"/>
319319
</actionGroup>
320320
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -371,10 +371,10 @@
371371
<argument name="CMSPage" value="$$createCMSPage$$"/>
372372
</actionGroup>
373373
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage" after="navigateToCreatedCMSPage"/>
374-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStage">
374+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStage">
375375
<argument name="contentType" value="PageBuilderBlockContentType"/>
376376
</actionGroup>
377-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
377+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
378378
<argument name="contentType" value="PageBuilderBlockContentType"/>
379379
</actionGroup>
380380
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -431,10 +431,10 @@
431431
<argument name="CMSPage" value="$$createCMSPage$$"/>
432432
</actionGroup>
433433
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage" after="navigateToCreatedCMSPage"/>
434-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStage">
434+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStage">
435435
<argument name="contentType" value="PageBuilderBlockContentType"/>
436436
</actionGroup>
437-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
437+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
438438
<argument name="contentType" value="PageBuilderBlockContentType"/>
439439
</actionGroup>
440440
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -491,10 +491,10 @@
491491
<argument name="CMSPage" value="$$createCMSPage$$"/>
492492
</actionGroup>
493493
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage" after="navigateToCreatedCMSPage"/>
494-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStage">
494+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStage">
495495
<argument name="contentType" value="PageBuilderBlockContentType"/>
496496
</actionGroup>
497-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
497+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
498498
<argument name="contentType" value="PageBuilderBlockContentType"/>
499499
</actionGroup>
500500
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -555,10 +555,10 @@
555555
<argument name="CMSPage" value="$$createCMSPage$$"/>
556556
</actionGroup>
557557
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage" after="navigateToCreatedCMSPage"/>
558-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStage">
558+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStage">
559559
<argument name="contentType" value="PageBuilderBlockContentType"/>
560560
</actionGroup>
561-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
561+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
562562
<argument name="contentType" value="PageBuilderBlockContentType"/>
563563
</actionGroup>
564564
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -610,10 +610,10 @@
610610
<argument name="CMSPage" value="$$createCMSPage$$"/>
611611
</actionGroup>
612612
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterBlock" after="navigateToCreatedCMSPage"/>
613-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStageAfterBlock">
613+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStageAfterBlock">
614614
<argument name="contentType" value="PageBuilderBlockContentType"/>
615615
</actionGroup>
616-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
616+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
617617
<argument name="contentType" value="PageBuilderBlockContentType"/>
618618
</actionGroup>
619619
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -666,10 +666,10 @@
666666
<argument name="CMSPage" value="$$createCMSPage$$"/>
667667
</actionGroup>
668668
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterBlock" after="navigateToCreatedCMSPage"/>
669-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStageAfterBlock">
669+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStageAfterBlock">
670670
<argument name="contentType" value="PageBuilderBlockContentType"/>
671671
</actionGroup>
672-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
672+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
673673
<argument name="contentType" value="PageBuilderBlockContentType"/>
674674
</actionGroup>
675675
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">
@@ -720,10 +720,10 @@
720720
<argument name="CMSPage" value="$$createCMSPage$$"/>
721721
</actionGroup>
722722
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterBlock" after="navigateToCreatedCMSPage"/>
723-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent" after="switchToPageBuilderStageAfterBlock">
723+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent" after="switchToPageBuilderStageAfterBlock">
724724
<argument name="contentType" value="PageBuilderBlockContentType"/>
725725
</actionGroup>
726-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandGroupAddContent">
726+
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage" after="expandMenuSectionAddContent">
727727
<argument name="contentType" value="PageBuilderBlockContentType"/>
728728
</actionGroup>
729729
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop" after="dragBlockIntoStage">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
</actionGroup>
267267
<!-- Add Divider to Column 2 -->
268268
<comment userInput="Add Divider to Column 2" stepKey="commentAddDividerToColumn2"/>
269-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupElements">
269+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionElements">
270270
<argument name="contentType" value="PageBuilderDividerContentType"/>
271271
</actionGroup>
272272
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerToColumn2">
@@ -537,7 +537,7 @@
537537
</after>
538538
<!-- Add Divider to Row -->
539539
<comment userInput="Add Divider to Row" stepKey="commentAddDividerToRow"/>
540-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupElements">
540+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionElements">
541541
<argument name="contentType" value="PageBuilderDividerContentType"/>
542542
</actionGroup>
543543
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerToRow">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@
910910
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
911911
<argument name="contentType" value="PageBuilderBannerContentType"/>
912912
</actionGroup>
913-
<actionGroup ref="expandPageBuilderPanelMenuSection" after="enterPageTitle" stepKey="expandGroup">
913+
<actionGroup ref="expandPageBuilderPanelMenuSection" after="enterPageTitle" stepKey="expandMenuSection">
914914
<argument name="contentType" value="PageBuilderBannerContentType"/>
915915
</actionGroup>
916916
<actionGroup ref="dragContentTypeToStage" after="commentConfigureContentType" stepKey="dragContentTypeToStage">

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,7 @@
12231223
<after>
12241224
<actionGroup ref="logout" stepKey="logout"/>
12251225
</after>
1226-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupMedia">
1226+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionMedia">
12271227
<argument name="contentType" value="PageBuilderBannerContentType"/>
12281228
</actionGroup>
12291229
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragBannerIntoStage">
@@ -1263,7 +1263,7 @@
12631263
</actionGroup>
12641264
<!-- Add Banner to Stage -->
12651265
<comment userInput="Add Banner to Stage" stepKey="addBannerToStage"/>
1266-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupMedia">
1266+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionMedia">
12671267
<argument name="contentType" value="PageBuilderBannerContentType"/>
12681268
</actionGroup>
12691269
<actionGroup ref="dragContentTypeToContainer" stepKey="dragBannerOntoColumn">
@@ -1347,7 +1347,7 @@
13471347
</actionGroup>
13481348
<!-- Add Banner to Stage -->
13491349
<comment userInput="Add Banner to Stage" stepKey="commentAddBannerToStage"/>
1350-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupInteractive">
1350+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionInteractive">
13511351
<argument name="contentType" value="PageBuilderBannerContentType"/>
13521352
</actionGroup>
13531353
<actionGroup ref="dragContentTypeToContainer" stepKey="dragBannerToColumn">
@@ -1887,7 +1887,7 @@
18871887
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
18881888
<argument name="contentType" value="PageBuilderBannerContentType"/>
18891889
</actionGroup>
1890-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupAddContent">
1890+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
18911891
<argument name="contentType" value="PageBuilderBannerContentType"/>
18921892
</actionGroup>
18931893
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
@@ -2119,7 +2119,7 @@
21192119
</actionGroup>
21202120
<!-- Add Banner to Column -->
21212121
<comment userInput="Add Banner to Column" stepKey="addBannerToColumn"/>
2122-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupElements">
2122+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionElements">
21232123
<argument name="contentType" value="PageBuilderBannerContentType"/>
21242124
</actionGroup>
21252125
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage">
@@ -2248,8 +2248,8 @@
22482248
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
22492249
<argument name="contentType" value="PageBuilderBannerContentType"/>
22502250
</actionGroup>
2251-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
2252-
<argument name="group" value="PageBuilderBannerContentType"/>
2251+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
2252+
<argument name="contentType" value="PageBuilderBannerContentType"/>
22532253
</actionGroup>
22542254
<actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
22552255
<argument name="contentType" value="PageBuilderBannerContentType"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1606,7 +1606,7 @@
16061606
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
16071607
<argument name="contentType" value="PageBuilderBannerContentType"/>
16081608
</actionGroup>
1609-
<actionGroup ref="expandPageBuilderPanelMenuSection" after="enterPageTitle" stepKey="expandGroup">
1609+
<actionGroup ref="expandPageBuilderPanelMenuSection" after="enterPageTitle" stepKey="expandMenuSection">
16101610
<argument name="contentType" value="PageBuilderBannerContentType"/>
16111611
</actionGroup>
16121612
<actionGroup ref="dragContentTypeToStage" after="commentConfigureContentType" stepKey="dragContentTypeToStage">
@@ -1815,7 +1815,7 @@
18151815
</actionGroup>
18161816
<!-- Add Banner to Stage -->
18171817
<comment userInput="Add Banner to Stage" stepKey="addBannerToStage"/>
1818-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandGroupMedia">
1818+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionMedia">
18191819
<argument name="contentType" value="PageBuilderBannerContentType"/>
18201820
</actionGroup>
18211821
<actionGroup ref="dragContentTypeToContainer" stepKey="dragBannerOntoColumn">

0 commit comments

Comments
 (0)