Skip to content

Commit 421bbf8

Browse files
dhaeckerdhaecker
committed
MC-3694: Add/Update MFTF Tests
- Updating tests to focus out of stage wysiwyg editor after edit panel close - Fixing broken banner button selector
1 parent 8702a36 commit 421bbf8

7 files changed

+56
-10
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<!-- Content Configuration -->
9898
<element name="messageContent" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
9999
<element name="noMessageContent" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='content'][.='Edit Banner Text'][not(*)]" parameterized="true"/>
100-
<element name="button" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//button" parameterized="true"/>
100+
<element name="button" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//button[@data-element='button']" parameterized="true"/>
101101
<element name="showButton" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-show-button='{{arg2}}']" parameterized="true"/>
102102
<element name="buttonType" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//button[contains(@class,'{{arg2}}')]" parameterized="true"/>
103103
<element name="buttonText" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//button//span[.='{{arg2}}']" parameterized="true"/>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
198198
</actionGroup>
199199
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
200+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
200201
<!-- Validate Stage -->
201202
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
202203
<actionGroup ref="validateBackgroundImage" stepKey="validateImageStage">
@@ -273,6 +274,7 @@
273274
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
274275
</actionGroup>
275276
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
277+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
276278
<!-- Validate Stage -->
277279
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
278280
<actionGroup ref="validateBackgroundImage" stepKey="validateImageStage">
@@ -344,6 +346,7 @@
344346
<argument name="property" value="PageBuilderBannerShowButtonNeverProperty"/>
345347
</actionGroup>
346348
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
349+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
347350
<!-- Validate Stage -->
348351
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
349352
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeCollageCenteredStage"/>
@@ -418,6 +421,7 @@
418421
<argument name="property" value="PageBuilderBannerShowButtonOnHoverProperty"/>
419422
</actionGroup>
420423
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
424+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
421425
<!-- Validate Stage -->
422426
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
423427
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeCollageCenteredStage"/>
@@ -495,6 +499,7 @@
495499
<argument name="property" value="PageBuilderBannerShowContentOverlayNeverShowProperty"/>
496500
</actionGroup>
497501
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
502+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
498503
<!-- Validate Stage -->
499504
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
500505
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeCollageCenteredStage"/>
@@ -575,6 +580,7 @@
575580
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
576581
</actionGroup>
577582
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
583+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
578584
<!-- Validate Stage -->
579585
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
580586
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeCollageCenteredStage"/>
@@ -658,6 +664,7 @@
658664
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
659665
</actionGroup>
660666
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
667+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
661668
<!-- Validate Stage -->
662669
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
663670
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeCollageCenteredStage"/>
@@ -737,6 +744,7 @@
737744
<argument name="property" value="PageBuilderBannerShowButtonAlwaysProperty"/>
738745
</actionGroup>
739746
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
747+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
740748
<!-- Validate Stage -->
741749
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
742750
<seeElementInDOM selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="seeButtonIsEditable"/>
@@ -825,6 +833,7 @@
825833
<argument name="property" value="PageBuilderBannerCollageCenterPaddingPropertyUnique"/>
826834
</actionGroup>
827835
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
836+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
828837
<!-- Validate Stage -->
829838
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
830839
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeAppearanceStage"/>
@@ -1055,6 +1064,7 @@
10551064
<argument name="property" value="PageBuilderBannerCollageCenterPaddingPropertyUnique"/>
10561065
</actionGroup>
10571066
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1067+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
10581068
<!-- Validate Stage -->
10591069
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
10601070
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageCenteredProperty.value)}}" stepKey="seeAppearanceStage"/>
@@ -1317,6 +1327,7 @@
13171327
<argument name="property" value="PageBuilderBannerButtonTextProperty_Html"/>
13181328
</actionGroup>
13191329
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1330+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
13201331
<!-- Validate Stage -->
13211332
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
13221333
<seeElement selector="{{BannerOnBackend.buttonText('1', PageBuilderBannerButtonTextProperty_Html.value)}}" stepKey="seeButtonTextStage"/>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
198198
</actionGroup>
199199
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
200+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
200201
<!-- Validate Stage -->
201202
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
202203
<actionGroup ref="validateBackgroundImage" stepKey="validateImageStage">
@@ -273,6 +274,7 @@
273274
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
274275
</actionGroup>
275276
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
277+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
276278
<!-- Validate Stage -->
277279
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
278280
<actionGroup ref="validateBackgroundImage" stepKey="validateImageStage">
@@ -344,6 +346,7 @@
344346
<argument name="property" value="PageBuilderBannerShowButtonNeverProperty"/>
345347
</actionGroup>
346348
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
349+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
347350
<!-- Validate Stage -->
348351
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
349352
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeCollageLeftStage"/>
@@ -418,6 +421,7 @@
418421
<argument name="property" value="PageBuilderBannerShowButtonOnHoverProperty"/>
419422
</actionGroup>
420423
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
424+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
421425
<!-- Validate Stage -->
422426
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
423427
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeCollageLeftStage"/>
@@ -495,6 +499,7 @@
495499
<argument name="property" value="PageBuilderBannerShowContentOverlayNeverShowProperty"/>
496500
</actionGroup>
497501
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
502+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
498503
<!-- Validate Stage -->
499504
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
500505
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeCollageLeftStage"/>
@@ -575,6 +580,7 @@
575580
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
576581
</actionGroup>
577582
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
583+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
578584
<!-- Validate Stage -->
579585
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
580586
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeCollageLeftStage"/>
@@ -658,6 +664,7 @@
658664
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
659665
</actionGroup>
660666
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
667+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
661668
<!-- Validate Stage -->
662669
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
663670
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeCollageLeftStage"/>
@@ -737,6 +744,7 @@
737744
<argument name="property" value="PageBuilderBannerShowButtonAlwaysProperty"/>
738745
</actionGroup>
739746
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
747+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
740748
<!-- Validate Stage -->
741749
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
742750
<seeElementInDOM selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="seeButtonIsEditable"/>
@@ -825,6 +833,7 @@
825833
<argument name="property" value="PageBuilderBannerCollageLeftPaddingPropertyUnique"/>
826834
</actionGroup>
827835
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
836+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
828837
<!-- Validate Stage -->
829838
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
830839
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeAppearanceStage"/>
@@ -1055,6 +1064,7 @@
10551064
<argument name="property" value="PageBuilderBannerCollageLeftPaddingPropertyUnique"/>
10561065
</actionGroup>
10571066
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1067+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
10581068
<!-- Validate Stage -->
10591069
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
10601070
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageLeftProperty.value)}}" stepKey="seeAppearanceStage"/>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
<argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
198198
</actionGroup>
199199
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
200+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
200201
<!-- Validate Stage -->
201202
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
202203
<actionGroup ref="validateBackgroundImage" stepKey="validateImageStage">
@@ -273,6 +274,7 @@
273274
<argument name="property" value="PageBuilderBackgroundImage_JPG"/>
274275
</actionGroup>
275276
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
277+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
276278
<!-- Validate Stage -->
277279
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
278280
<actionGroup ref="validateBackgroundImage" stepKey="validateImageStage">
@@ -344,6 +346,7 @@
344346
<argument name="property" value="PageBuilderBannerShowButtonNeverProperty"/>
345347
</actionGroup>
346348
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
349+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
347350
<!-- Validate Stage -->
348351
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
349352
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeCollageRightStage"/>
@@ -418,6 +421,7 @@
418421
<argument name="property" value="PageBuilderBannerShowButtonOnHoverProperty"/>
419422
</actionGroup>
420423
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
424+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
421425
<!-- Validate Stage -->
422426
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
423427
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeCollageRightStage"/>
@@ -495,6 +499,7 @@
495499
<argument name="property" value="PageBuilderBannerShowContentOverlayNeverShowProperty"/>
496500
</actionGroup>
497501
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
502+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
498503
<!-- Validate Stage -->
499504
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
500505
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeCollageRightStage"/>
@@ -575,6 +580,7 @@
575580
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
576581
</actionGroup>
577582
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
583+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
578584
<!-- Validate Stage -->
579585
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
580586
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeCollageRightStage"/>
@@ -658,6 +664,7 @@
658664
<argument name="property" value="PageBuilderBannerOverlayTransparencyProperty"/>
659665
</actionGroup>
660666
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
667+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
661668
<!-- Validate Stage -->
662669
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
663670
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeCollageRightStage"/>
@@ -737,6 +744,7 @@
737744
<argument name="property" value="PageBuilderBannerShowButtonAlwaysProperty"/>
738745
</actionGroup>
739746
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
747+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
740748
<!-- Validate Stage -->
741749
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
742750
<seeElementInDOM selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="seeButtonIsEditable"/>
@@ -825,6 +833,7 @@
825833
<argument name="property" value="PageBuilderBannerCollageRightPaddingPropertyUnique"/>
826834
</actionGroup>
827835
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
836+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
828837
<!-- Validate Stage -->
829838
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
830839
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeAppearanceStage"/>
@@ -1055,6 +1064,7 @@
10551064
<argument name="property" value="PageBuilderBannerCollageRightPaddingPropertyUnique"/>
10561065
</actionGroup>
10571066
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
1067+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
10581068
<!-- Validate Stage -->
10591069
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
10601070
<seeElement selector="{{BannerOnBackend.appearance('1', PageBuilderBannerCollageRightProperty.value)}}" stepKey="seeAppearanceStage"/>

0 commit comments

Comments
 (0)