Skip to content

Commit f7d43b6

Browse files
dhaeckerdhaecker
committed
MC-2212: Split ActionGroup File
- Removing unnecessary action group and updating tests
1 parent 54aad08 commit f7d43b6

File tree

3 files changed

+14
-38
lines changed

3 files changed

+14
-38
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,6 @@
8282
<fillField selector="{{PageBuilderActionsSection.panelFieldControl(property.section, property.fieldName)}}" userInput="{{property.value}}" stepKey="fillPropertyField"/>
8383
<click selector="{{PageBuilderActionsSection.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
8484
</actionGroup>
85-
<actionGroup name="fillSlideOutPanelFieldAlternate">
86-
<!-- todo: When is this used? -->
87-
<arguments>
88-
<argument name="property"/>
89-
<argument name="input"/>
90-
</arguments>
91-
<waitForElement selector="{{PageBuilderActionsSection.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElement"/>
92-
<fillField selector="{{PageBuilderActionsSection.panelFieldControl(property.section, property.fieldName)}}" userInput="{{input}}" stepKey="fillPropertyField"/>
93-
<click selector="{{PageBuilderActionsSection.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
94-
</actionGroup>
9585
<actionGroup name="fillSlideOutPanelFieldAndExpectToSeeErrorInFieldset">
9686
<arguments>
9787
<argument name="property"/>

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

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,8 @@
288288
<actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceAlignmentProperty">
289289
<argument name="property" value="PageBuilderBackgroundAppearanceProperty"/>
290290
</actionGroup>
291-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty">
291+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
292292
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
293-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
294293
</actionGroup>
295294
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty">
296295
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
@@ -348,9 +347,8 @@
348347
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForFirstColumn">
349348
<argument name="contentType" value="PageBuilderColumnContentType"/>
350349
</actionGroup>
351-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty1">
350+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty1">
352351
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
353-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
354352
</actionGroup>
355353
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty">
356354
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
@@ -378,9 +376,8 @@
378376
<argument name="contentType" value="PageBuilderColumnContentType"/>
379377
<argument name="contentTypeIndex" value="2"/>
380378
</actionGroup>
381-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty2">
379+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty2">
382380
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
383-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
384381
</actionGroup>
385382
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
386383
<actionGroup ref="saveCmsPage" stepKey="saveCmsPage"/>
@@ -440,9 +437,8 @@
440437
<actionGroup ref="chooseVisualSelectOption" stepKey="enterBackgroundAppearancePropertyBottom">
441438
<argument name="property" value="PageBuilderBackgroundAppearanceProperty"/>
442439
</actionGroup>
443-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty">
440+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
444441
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
445-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
446442
</actionGroup>
447443
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
448444
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForSecondColumn">
@@ -452,18 +448,16 @@
452448
<actionGroup ref="chooseVisualSelectOption" stepKey="enterBackgroundAppearancePropertyCentered">
453449
<argument name="property" value="PageBuilderBackgroundAppearancePropertyCentered"/>
454450
</actionGroup>
455-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty2">
451+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty2">
456452
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
457-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
458453
</actionGroup>
459454
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
460455
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForThirdColumn">
461456
<argument name="contentType" value="PageBuilderColumnContentType"/>
462457
<argument name="contentTypeIndex" value="3"/>
463458
</actionGroup>
464-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty3">
459+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty3">
465460
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
466-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
467461
</actionGroup>
468462
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
469463
<actionGroup ref="saveCmsPage" stepKey="saveCmsPage"/>
@@ -510,9 +504,8 @@
510504
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForFirstColumn">
511505
<argument name="contentType" value="PageBuilderColumnContentType"/>
512506
</actionGroup>
513-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty">
507+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
514508
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
515-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
516509
</actionGroup>
517510
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty">
518511
<argument name="property" value="PageBuilderBackgroundColorProperty_087E8B"/>
@@ -583,9 +576,8 @@
583576
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForFirstColumn">
584577
<argument name="contentType" value="PageBuilderColumnContentType"/>
585578
</actionGroup>
586-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty">
579+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
587580
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
588-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
589581
</actionGroup>
590582
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderFile">
591583
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
@@ -616,9 +608,8 @@
616608
<argument name="contentType" value="PageBuilderColumnContentType"/>
617609
</actionGroup>
618610
<actionGroup ref="openPageBuilderEditColumnPanel" stepKey="openEditPanel"/>
619-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty">
611+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
620612
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
621-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
622613
</actionGroup>
623614
<actionGroup ref="attachFileSlideOutProperty" stepKey="attachPageBuilderFile">
624615
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
@@ -670,9 +661,8 @@
670661
<actionGroup ref="chooseVisualSelectOption" stepKey="enterBackgroundAppearanceProperty1">
671662
<argument name="property" value="PageBuilderBackgroundAppearanceProperty"/>
672663
</actionGroup>
673-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty1">
664+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty1">
674665
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
675-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
676666
</actionGroup>
677667
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty1">
678668
<argument name="property" value="PageBuilderBackgroundColorProperty_087E8B"/>
@@ -685,9 +675,8 @@
685675
<actionGroup ref="chooseVisualSelectOption" stepKey="enterBackgroundAppearanceProperty2">
686676
<argument name="property" value="PageBuilderBackgroundAppearancePropertyCentered"/>
687677
</actionGroup>
688-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty2">
678+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty2">
689679
<argument name="property" value="PageBuilderAppearanceMinHeightProperty_300"/>
690-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty_300.value"/>
691680
</actionGroup>
692681
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty2">
693682
<argument name="property" value="PageBuilderBackgroundColorProperty_FF5A5F"/>
@@ -697,9 +686,8 @@
697686
<argument name="contentType" value="PageBuilderColumnContentType"/>
698687
<argument name="contentTypeIndex" value="3"/>
699688
</actionGroup>
700-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty3">
689+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty3">
701690
<argument name="property" value="PageBuilderAppearanceMinHeightProperty_200"/>
702-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty_200.value"/>
703691
</actionGroup>
704692
<comment userInput="I fill out color into Background Color using Color Picker" stepKey="comment"/>
705693
<actionGroup ref="fillOutColorPicker" stepKey="fillOutColor">

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,9 +561,8 @@
561561
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForFirstColumn">
562562
<argument name="contentType" value="PageBuilderColumnContentType"/>
563563
</actionGroup>
564-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty1">
564+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty1">
565565
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
566-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
567566
</actionGroup>
568567
<actionGroup ref="fillSlideOutPanelField" stepKey="enterBackgroundColorProperty">
569568
<argument name="property" value="PageBuilderBackgroundColorProperty"/>
@@ -573,9 +572,8 @@
573572
<argument name="contentType" value="PageBuilderColumnContentType"/>
574573
<argument name="contentTypeIndex" value="2"/>
575574
</actionGroup>
576-
<actionGroup ref="fillSlideOutPanelFieldAlternate" stepKey="enterMinHeightProperty2">
575+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty2">
577576
<argument name="property" value="PageBuilderAppearanceMinHeightProperty"/>
578-
<argument name="input" value="PageBuilderAppearanceMinHeightProperty.value"/>
579577
</actionGroup>
580578
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
581579
<actionGroup ref="saveCmsPage" stepKey="saveCmsPage"/>

0 commit comments

Comments
 (0)