Skip to content

Commit 6d6869a

Browse files
committed
MC-2259: Build Stabilization
Expect edit panel on dropping Block to stage, and close after
1 parent 58a42ee commit 6d6869a

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Data/ContentTypeData.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
<data key="name">Block</data>
124124
<data key="section">Magento</data>
125125
<data key="role">block</data>
126+
<data key="editPanelName">Block</data>
126127
<data key="pageNamePrefix">block</data>
127128
</entity>
128129
<entity name="PageBuilderProductsContentType" type="pagebuilder_content_type">

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@
4040
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
4141
<argument name="group" value="PageBuilderBlockContentType"/>
4242
</actionGroup>
43-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
43+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
4444
<argument name="contentType" value="PageBuilderBlockContentType"/>
4545
</actionGroup>
46+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
4647
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
4748
<argument name="contentType" value="PageBuilderBlockContentType"/>
4849
</actionGroup>
@@ -88,9 +89,10 @@
8889
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
8990
<argument name="group" value="PageBuilderBlockContentType"/>
9091
</actionGroup>
91-
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
92+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
9293
<argument name="contentType" value="PageBuilderBlockContentType"/>
9394
</actionGroup>
95+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
9496
<actionGroup ref="removeEmptyContentTypeFromStage" stepKey="removeEmptyContentTypeFromStage">
9597
<argument name="contentType" value="PageBuilderBlockContentType"/>
9698
</actionGroup>
@@ -126,9 +128,10 @@
126128
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
127129
<argument name="group" value="PageBuilderBlockContentType"/>
128130
</actionGroup>
129-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
131+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
130132
<argument name="contentType" value="PageBuilderBlockContentType"/>
131133
</actionGroup>
134+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
132135
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
133136
<argument name="contentType" value="PageBuilderBlockContentType"/>
134137
</actionGroup>
@@ -260,9 +263,10 @@
260263
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
261264
<argument name="group" value="PageBuilderBlockContentType"/>
262265
</actionGroup>
263-
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
266+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
264267
<argument name="contentType" value="PageBuilderBlockContentType"/>
265268
</actionGroup>
269+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
266270
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
267271
<argument name="contentType" value="PageBuilderBlockContentType"/>
268272
</actionGroup>
@@ -341,7 +345,7 @@
341345
<actionGroup ref="seeInPaddingFieldsSlideOutPanel" stepKey="validatePadding">
342346
<argument name="property" value="PageBuilderPaddingPropertyUnique"/>
343347
</actionGroup>
344-
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
348+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
345349
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
346350
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
347351
<!-- Validate Stage After Save -->

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,10 @@
7272
<argument name="contentType" value="PageBuilderNewsletterContentType"/>
7373
</actionGroup>
7474
<click selector="{{PageBuilderPanel.magentoGroup}}" stepKey="clickMagentoGroup"/>
75-
<actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
75+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
7676
<argument name="contentType" value="PageBuilderBlockContentType"/>
7777
</actionGroup>
78+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
7879
<actionGroup ref="dragContentTypeToStage" stepKey="dragProductIntoStage">
7980
<argument name="contentType" value="PageBuilderProductsContentType"/>
8081
</actionGroup>

0 commit comments

Comments
 (0)