Skip to content

Commit 04bf1a2

Browse files
dhaeckerdhaecker
committed
MC-4231: MFTF Rewrite Selectors/ActionGroups To Allow Using PageBuilder In Non-CMS Page Areas
 - Fixing broken tests
1 parent d5081d4 commit 04bf1a2

File tree

3 files changed

+19
-30
lines changed

3 files changed

+19
-30
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@
9898
<expectedResult type="variable">initialNumberOfChildContentTypesPlusOne</expectedResult>
9999
<actualResult type="variable">numberOfChildContentTypesAfterAdd</actualResult>
100100
</assertEquals>
101+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
102+
<waitForPageLoad stepKey="waitForAnimation2"/>
101103
</actionGroup>
102104
<actionGroup name="duplicateContentType">
103105
<arguments>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,9 +2066,8 @@
20662066
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup2">
20672067
<argument name="group" value="PageBuilderColumnContentType"/>
20682068
</actionGroup>
2069-
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragContentTypeToDropZone">
2069+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
20702070
<argument name="contentType" value="PageBuilderColumnContentType"/>
2071-
<argument name="dropZoneIndex" value="2"/>
20722071
</actionGroup>
20732072
<!-- Verify Editor Still In Focus -->
20742073
<comment userInput="Verify Editor Still In Focus" stepKey="commentEditorInFocus"/>

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

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnGroupToStage">
330330
<argument name="contentType" value="PageBuilderColumnContentType"/>
331331
</actionGroup>
332-
<actionGroup ref="dragContentTypeToStage" stepKey="dragThirdColumnIntoStage">
332+
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType">
333333
<argument name="contentType" value="PageBuilderColumnContentType"/>
334334
</actionGroup>
335335
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForFirstColumn">
@@ -344,17 +344,14 @@
344344
</actionGroup>
345345
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsFirstColumn"/>
346346
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
347-
<argument name="group" value="PageBuilderHeadingContentType"/>
347+
<argument name="group" value="PageBuilderDividerContentType"/>
348348
</actionGroup>
349-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToFirstColumn">
350-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
349+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerToFirstColumn">
350+
<argument name="contentType" value="PageBuilderDividerContentType"/>
351351
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
352352
<argument name="containerTargetIndex" value="1"/>
353353
<argument name="contentTypeIndex" value="1"/>
354354
</actionGroup>
355-
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading1">
356-
<argument name="index" value="1"/>
357-
</actionGroup>
358355
<!-- Configure Second Column - Vertical Align Center -->
359356
<comment userInput="Configure vertical align center" stepKey="commentConfigureVerticalAlignCenter"/>
360357
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForSecondColumn">
@@ -365,15 +362,12 @@
365362
<argument name="property" value="PageBuilderVerticalAlignmentPropertyCenter"/>
366363
</actionGroup>
367364
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsSecondColumn"/>
368-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToSecondColumn">
369-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
365+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerToSecondColumn">
366+
<argument name="contentType" value="PageBuilderDividerContentType"/>
370367
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
371368
<argument name="containerTargetIndex" value="2"/>
372369
<argument name="contentTypeIndex" value="1"/>
373370
</actionGroup>
374-
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading2">
375-
<argument name="index" value="2"/>
376-
</actionGroup>
377371
<!-- Configure Third Column - Vertical Align Bottom -->
378372
<comment userInput="Configure vertical align bottom" stepKey="commentConfigureVerticalAlignBottom"/>
379373
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForThirdColumn">
@@ -384,8 +378,8 @@
384378
<argument name="property" value="PageBuilderVerticalAlignmentPropertyBottom"/>
385379
</actionGroup>
386380
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsThirdColumn"/>
387-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToThirdColumn">
388-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
381+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerToThirdColumn">
382+
<argument name="contentType" value="PageBuilderDividerContentType"/>
389383
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
390384
<argument name="containerTargetIndex" value="3"/>
391385
<argument name="contentTypeIndex" value="1"/>
@@ -438,7 +432,7 @@
438432
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnGroupToStage">
439433
<argument name="contentType" value="PageBuilderColumnContentType"/>
440434
</actionGroup>
441-
<actionGroup ref="dragContentTypeToStage" stepKey="dragFirstColumnIntoStage">
435+
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType">
442436
<argument name="contentType" value="PageBuilderColumnContentType"/>
443437
</actionGroup>
444438
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForFirstColumn">
@@ -456,17 +450,14 @@
456450
</actionGroup>
457451
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsFirstColumn"/>
458452
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
459-
<argument name="group" value="PageBuilderHeadingContentType"/>
453+
<argument name="group" value="PageBuilderDividerContentType"/>
460454
</actionGroup>
461-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToFirstColumn">
462-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
455+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerToFirstColumn">
456+
<argument name="contentType" value="PageBuilderDividerContentType"/>
463457
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
464458
<argument name="containerTargetIndex" value="1"/>
465459
<argument name="contentTypeIndex" value="1"/>
466460
</actionGroup>
467-
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading1">
468-
<argument name="index" value="1"/>
469-
</actionGroup>
470461
<!-- Configure Second Column - Vertical Align Center -->
471462
<comment userInput="Configure vertical align center" stepKey="commentConfigureVerticalAlignCenter"/>
472463
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForSecondColumn">
@@ -483,15 +474,12 @@
483474
<argument name="property" value="PageBuilderVerticalAlignmentPropertyCenter"/>
484475
</actionGroup>
485476
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsSecondColumn"/>
486-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToSecondColumn">
487-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
477+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerToSecondColumn">
478+
<argument name="contentType" value="PageBuilderDividerContentType"/>
488479
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
489480
<argument name="containerTargetIndex" value="2"/>
490481
<argument name="contentTypeIndex" value="1"/>
491482
</actionGroup>
492-
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading2">
493-
<argument name="index" value="2"/>
494-
</actionGroup>
495483
<!-- Configure Third Column - Vertical Align Bottom -->
496484
<comment userInput="Configure vertical align bottom" stepKey="commentConfigureVerticalAlignBottom"/>
497485
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanelForThirdColumn">
@@ -508,8 +496,8 @@
508496
<argument name="property" value="PageBuilderVerticalAlignmentPropertyBottom"/>
509497
</actionGroup>
510498
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsThirdColumn"/>
511-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToThirdColumn">
512-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
499+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerToThirdColumn">
500+
<argument name="contentType" value="PageBuilderDividerContentType"/>
513501
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
514502
<argument name="containerTargetIndex" value="3"/>
515503
<argument name="contentTypeIndex" value="1"/>

0 commit comments

Comments
 (0)