Skip to content

Commit ba5afee

Browse files
author
joiecaquicla
committed
magento2/magento2-page-builder#637: Form field/field group viewport scope - applied requested changes
1 parent b649902 commit ba5afee

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEMobileFormActionGroup.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,16 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="addTextToTinyMCEMobile">
10+
<actionGroup name="AddTextToTinyMCEMobileFormActionGroup" extends="addTextToTinyMCE">
11+
<annotations>
12+
<description>Adds content to the TinyMCE editor on a content type's edit panel when editing in the mobile viewport.</description>
13+
</annotations>
1114
<arguments>
1215
<argument name="property" defaultValue=""/>
1316
<argument name="section" defaultValue="TextOnConfiguration"/>
1417
</arguments>
15-
<comment userInput="Adding Text To Tiny MCE Mobile Form" stepKey="commentAddTextToTinyMCE"/>
1618
<waitForElementVisible selector="#{{section.tinyMCEIFrameMobile}}" stepKey="waitForIFrame"/>
17-
<executeJS function="tinymce.activeEditor.setContent(tinymce.activeEditor.getContent() + '{{property.value}}')" stepKey="addTextToWYSIWYG"/>
18-
<!-- Must click Tiny MCE or form will not recognize that text has been added -->
1919
<click selector="#{{section.tinyMCEIFrameMobile}}" stepKey="clickIFrame"/>
2020
<switchToIFrame selector="{{section.tinyMCEIFrameMobile}}" stepKey="switchToIFrame"/>
21-
<waitForElementVisible selector="{{section.textInIFrame(property.value)}}" stepKey="waitForTextVisible"/>
22-
<switchToIFrame stepKey="exitIFrame"/>
2321
</actionGroup>
2422
</actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerPosterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="setBackgroundRepeat">
8989
<argument name="property" value="PageBuilderBackgroundRepeat_Enabled"/>
9090
</actionGroup>
91-
<actionGroup ref="addTextToTinyMCEMobile" stepKey="addTextToTinyMCE">
91+
<actionGroup ref="AddTextToTinyMCEMobileFormActionGroup" stepKey="addTextToTinyMCE">
9292
<argument name="property" value="PageBuilderBannerMessageProperty"/>
9393
<argument name="section" value="BannerOnConfigurationPanel"/>
9494
</actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveSlideItemsTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterSlideNameText1">
5252
<argument name="property" value="PageBuilderSlideItemSlideName_Slide1"/>
5353
</actionGroup>
54-
<actionGroup ref="addTextToTinyMCEMobile" stepKey="addTextToTinyMCE">
54+
<actionGroup ref="AddTextToTinyMCEMobileFormActionGroup" stepKey="addTextToTinyMCE">
5555
<argument name="property" value="PageBuilderSlideItemContent_Slide1"/>
5656
<argument name="section" value="SlideOnConfigurationPanel"/>
5757
</actionGroup>
@@ -68,7 +68,7 @@
6868
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterSlideNameText2">
6969
<argument name="property" value="PageBuilderSlideItemSlideName_Slide2"/>
7070
</actionGroup>
71-
<actionGroup ref="addTextToTinyMCEMobile" stepKey="addTextToTinyMCESlide2">
71+
<actionGroup ref="AddTextToTinyMCEMobileFormActionGroup" stepKey="addTextToTinyMCESlide2">
7272
<argument name="property" value="PageBuilderSlideItemContent_Slide2"/>
7373
<argument name="section" value="SlideOnConfigurationPanel"/>
7474
</actionGroup>
@@ -84,7 +84,7 @@
8484
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterSlideNameText3">
8585
<argument name="property" value="PageBuilderSlideItemSlideName_Slide3"/>
8686
</actionGroup>
87-
<actionGroup ref="addTextToTinyMCEMobile" stepKey="addTextToTinyMCESlide3">
87+
<actionGroup ref="AddTextToTinyMCEMobileFormActionGroup" stepKey="addTextToTinyMCESlide3">
8888
<argument name="property" value="PageBuilderSlideItemContent_Slide3"/>
8989
<argument name="section" value="SlideOnConfigurationPanel"/>
9090
</actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemPosterAppearanceThroughBlockContentTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="setBackgroundRepeat">
8989
<argument name="property" value="PageBuilderBackgroundRepeat_Enabled"/>
9090
</actionGroup>
91-
<actionGroup ref="addTextToTinyMCEMobile" stepKey="addTextToTinyMCE">
91+
<actionGroup ref="AddTextToTinyMCEMobileFormActionGroup" stepKey="addTextToTinyMCE">
9292
<argument name="property" value="PageBuilderSlideItemContent_Slide1"/>
9393
<argument name="section" value="SlideOnConfigurationPanel"/>
9494
</actionGroup>

0 commit comments

Comments
 (0)