Skip to content

Commit 871d508

Browse files
dvoskoboinikovdvoskoboinikov
committed
Merge branch '1.3-develop' into MC-37775
2 parents e41020e + b1335b2 commit 871d508

21 files changed

+301
-39
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@
7474
<waitForElementVisible selector="{{section.text(index, labelValue)}}" stepKey="waitForVariable"/>
7575
<seeElement selector="{{section.text(index, labelValue)}}" stepKey="seeVariable"/>
7676
</actionGroup>
77-
<actionGroup name="addVariableToTinyMCE3" extends="addVariableToTinyMCE">
77+
<actionGroup name="addVariableToTinyMCE3" extends="addVariableToTinyMCE" deprecated="This version of TinyMCE is no longer supported">
7878
<arguments>
7979
<argument name="variable" defaultValue=""/>
8080
</arguments>
8181
<comment userInput="Adding Variable To TinyMCE3" stepKey="commentAddVariableToTinyMCE"/>
82-
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCE3VariableBtn}}" stepKey="waitForInsertVariable1"/>
83-
<click selector="{{TextOnConfiguration.tinyMCE3VariableBtn}}" stepKey="clickInsertVariable1"/>
84-
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCE3VariableBtn}}" stepKey="waitForVariableModalToClose"/>
82+
<comment userInput="removing deprecated element" stepKey="waitForInsertVariable1"/>
83+
<comment userInput="removing deprecated element" stepKey="clickInsertVariable1"/>
84+
<comment userInput="removing deprecated element" stepKey="waitForVariableModalToClose"/>
8585
</actionGroup>
8686
<actionGroup name="addPageLinkVariableWYSIWYGDisabled">
8787
<arguments>
@@ -135,15 +135,15 @@
135135
<waitForElementVisible selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="waitForInsertWidget1"/>
136136
<click selector="{{TinyMCESection.InsertWidgetIcon}}" stepKey="clickAddWidgetBtn"/>
137137
</actionGroup>
138-
<actionGroup name="addPageLinkWidgetToTinyMCE3" extends="addPageLinkWidgetToTinyMCE">
138+
<actionGroup name="addPageLinkWidgetToTinyMCE3" extends="addPageLinkWidgetToTinyMCE" deprecated="This version of TinyMCE is no longer supported">
139139
<arguments>
140140
<argument name="widget" defaultValue=""/>
141141
<argument name="page" defaultValue="" type="string"/>
142142
</arguments>
143143
<comment userInput="Adding Widget To TinyMCE3" stepKey="commentAddWidget"/>
144-
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCE3WidgetBtn}}" stepKey="waitForInsertWidget1"/>
145-
<click selector="{{TextOnConfiguration.tinyMCE3WidgetBtn}}" stepKey="clickAddWidgetBtn"/>
146-
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCE3WidgetBtn}}" stepKey="waitForInsertWidgetModalToClose"/>
144+
<comment userInput="removing deprecated element" stepKey="waitForInsertWidget1"/>
145+
<comment userInput="removing deprecated element" stepKey="clickAddWidgetBtn"/>
146+
<comment userInput="removing deprecated element" stepKey="waitForInsertWidgetModalToClose"/>
147147
</actionGroup>
148148
<actionGroup name="addPageLinkWidgetWYSIWYGDisabled" extends="addPageLinkWidgetToTinyMCE">
149149
<arguments>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,12 @@
6060
<element name="tinyMCEVariable" type="text" selector="(//body//span[contains(@class,'magento-variable') and .='{{arg1}}'])[{{arg2}}]" parameterized="true"/>
6161
<element name="tinyMCEWidget" type="text" selector="(//body//span[contains(@class,'magento-widget') and .='{{arg1}}'])[{{arg2}}]" parameterized="true"/>
6262
<element name="tinyMCEImage" type="text" selector="//img[contains(@src,'{{arg}}')]" parameterized="true"/>
63-
<element name="tinyMCE3" type="text" selector="#pagebuilder_text_form_content_tbl"/>
64-
<element name="tinyMCE3VariableBtn" type="text" selector="#pagebuilder_text_form_content_magentovariable"/>
65-
<element name="tinyMCE3WidgetBtn" type="text" selector="#pagebuilder_text_form_content_magentowidget"/>
63+
<element name="tinyMCE3" type="text" selector="#pagebuilder_text_form_content_tbl" deprecated="this version of TinyMCE is no longer supported, please use tinyMCE"/>
64+
<element name="tinyMCE3VariableBtn" type="text" selector="#pagebuilder_text_form_content_magentovariable" deprecated="this version of TinyMCE is no longer supported, please use tinyMCEVariableBtn"/>
65+
<element name="tinyMCE3WidgetBtn" type="text" selector="#pagebuilder_text_form_content_magentowidget" deprecated="this version of TinyMCE is no longer supported, please use tinyMCEWidgetBtn"/>
66+
<element name="tinyMCE" type="text" selector="#pagebuilder_text_form_content_tbl"/>
67+
<element name="tinyMCEVariableBtn" type="text" selector="#pagebuilder_text_form_content_magentovariable"/>
68+
<element name="tinyMCEWidgetBtn" type="text" selector="#pagebuilder_text_form_content_magentowidget"/>
6669
<!-- WYSIWYG Disabled -->
6770
<element name="textArea" type="text" selector="#pagebuilder_text_form_content"/>
6871
<element name="textAreaId" type="text" selector="pagebuilder_text_form_content"/>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,12 @@
1515
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="adminLogout"/>
1616
</after>
1717
</test>
18-
<test name="AdminAddImageToCMSPageTinyMCE3Test">
18+
<test name="AdminAddImageToCMSPageTinyMCE3Test" deprecated="This version of TinyMCE is no longer supported">
19+
<annotations>
20+
<skip>
21+
<issueId value="DEPRECATED">This version of TinyMCE is no longer supported</issueId>
22+
</skip>
23+
</annotations>
1924
<before>
2025
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" before="loginAsAdmin"/>
2126
</before>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</actionGroup>
100100
<seeElement selector="{{BannerOnFrontend.messageContentTextArea('1', PageBuilderBannerMessageProperty.value)}}" stepKey="seeMessageContentStorefront"/>
101101
</test>
102-
<test name="BannerCollageCenterTinyMCE3InlineEdit" extends="BannerPosterCanInlineEditContent">
102+
<test name="BannerCollageCenterTinyMCE3InlineEdit" extends="BannerPosterCanInlineEditContent" deprecated="This version of TinyMCE is no longer supported">
103103
<annotations>
104104
<features value="PageBuilder"/>
105105
<stories value="Banner"/>
@@ -111,6 +111,9 @@
111111
<group value="pagebuilder"/>
112112
<group value="pagebuilder-banner"/>
113113
<group value="pagebuilder-bannerCollageCenter"/>
114+
<skip>
115+
<issueId value="DEPRECATED">This version of TinyMCE is no longer supported</issueId>
116+
</skip>
114117
</annotations>
115118
<before>
116119
<remove keyForRemoval="enableTinyMCE4"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</actionGroup>
100100
<seeElement selector="{{BannerOnFrontend.messageContentTextArea('1', PageBuilderBannerMessageProperty.value)}}" stepKey="seeMessageContentStorefront"/>
101101
</test>
102-
<test name="BannerCollageLeftTinyMCE3InlineEdit" extends="BannerPosterCanInlineEditContent">
102+
<test name="BannerCollageLeftTinyMCE3InlineEdit" extends="BannerPosterCanInlineEditContent" deprecated="This version of TinyMCE is no longer supported">
103103
<annotations>
104104
<features value="PageBuilder"/>
105105
<stories value="Banner"/>
@@ -111,6 +111,9 @@
111111
<group value="pagebuilder"/>
112112
<group value="pagebuilder-banner"/>
113113
<group value="pagebuilder-bannerCollageLeft"/>
114+
<skip>
115+
<issueId value="DEPRECATED">This version of TinyMCE is no longer supported</issueId>
116+
</skip>
114117
</annotations>
115118
<before>
116119
<remove keyForRemoval="enableTinyMCE4"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
</actionGroup>
100100
<seeElement selector="{{BannerOnFrontend.messageContentTextArea('1', PageBuilderBannerMessageProperty.value)}}" stepKey="seeMessageContentStorefront"/>
101101
</test>
102-
<test name="BannerCollageRightTinyMCE3InlineEdit" extends="BannerPosterCanInlineEditContent">
102+
<test name="BannerCollageRightTinyMCE3InlineEdit" extends="BannerPosterCanInlineEditContent" deprecated="This version of TinyMCE is no longer supported">
103103
<annotations>
104104
<features value="PageBuilder"/>
105105
<stories value="Banner"/>
@@ -111,6 +111,9 @@
111111
<group value="pagebuilder"/>
112112
<group value="pagebuilder-banner"/>
113113
<group value="pagebuilder-bannerCollageRight"/>
114+
<skip>
115+
<issueId value="DEPRECATED">This version of TinyMCE is no longer supported</issueId>
116+
</skip>
114117
</annotations>
115118
<before>
116119
<remove keyForRemoval="enableTinyMCE4"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
</actionGroup>
194194
<seeElement selector="{{BannerOnFrontend.messageContentTextArea('1', PageBuilderBannerMessageProperty.value)}}" stepKey="seeMessageContentStorefront"/>
195195
</test>
196-
<test name="BannerPosterTinyMCE3InlineEdit" extends="BannerPosterCanInlineEditContent">
196+
<test name="BannerPosterTinyMCE3InlineEdit" extends="BannerPosterCanInlineEditContent" deprecated="This version of TinyMCE is no longer supported">
197197
<annotations>
198198
<features value="PageBuilder"/>
199199
<stories value="Banner"/>
@@ -205,6 +205,9 @@
205205
<group value="pagebuilder"/>
206206
<group value="pagebuilder-banner"/>
207207
<group value="pagebuilder-bannerPoster"/>
208+
<skip>
209+
<issueId value="DEPRECATED">This version of TinyMCE is no longer supported</issueId>
210+
</skip>
208211
</annotations>
209212
<before>
210213
<remove keyForRemoval="enableTinyMCE4"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</actionGroup>
6565
<seeElement selector="{{SlideOnFrontend.messageContentTextArea('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeMessageContentStorefront"/>
6666
</test>
67-
<test name="SlideItemCollageCenterTinyMCE3InlineEdit" extends="SlideItemPosterCanInlineEditContent">
67+
<test name="SlideItemCollageCenterTinyMCE3InlineEdit" extends="SlideItemPosterCanInlineEditContent" deprecated="This version of TinyMCE is no longer supported">
6868
<annotations>
6969
<features value="PageBuilder"/>
7070
<stories value="Slider"/>
@@ -76,6 +76,9 @@
7676
<group value="pagebuilder"/>
7777
<group value="pagebuilder-slide"/>
7878
<group value="pagebuilder-slideItemCollageCenter"/>
79+
<skip>
80+
<issueId value="DEPRECATED">This version of TinyMCE is no longer supported</issueId>
81+
</skip>
7982
</annotations>
8083
<before>
8184
<remove keyForRemoval="enableTinyMCE4"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</actionGroup>
6565
<seeElement selector="{{SlideOnFrontend.messageContentTextArea('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeMessageContentStorefront"/>
6666
</test>
67-
<test name="SlideItemCollageLeftTinyMCE3InlineEdit" extends="SlideItemPosterCanInlineEditContent">
67+
<test name="SlideItemCollageLeftTinyMCE3InlineEdit" extends="SlideItemPosterCanInlineEditContent" deprecated="This version of TinyMCE is no longer supported">
6868
<annotations>
6969
<features value="PageBuilder"/>
7070
<stories value="Slider"/>
@@ -76,6 +76,9 @@
7676
<group value="pagebuilder"/>
7777
<group value="pagebuilder-slide"/>
7878
<group value="pagebuilder-slideItemCollageLeft"/>
79+
<skip>
80+
<issueId value="DEPRECATED">This version of TinyMCE is no longer supported</issueId>
81+
</skip>
7982
</annotations>
8083
<before>
8184
<remove keyForRemoval="enableTinyMCE4"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</actionGroup>
6565
<seeElement selector="{{SlideOnFrontend.messageContentTextArea('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeMessageContentStorefront"/>
6666
</test>
67-
<test name="SlideItemCollageRightTinyMCE3InlineEdit" extends="SlideItemPosterCanInlineEditContent">
67+
<test name="SlideItemCollageRightTinyMCE3InlineEdit" extends="SlideItemPosterCanInlineEditContent" deprecated="This version of TinyMCE is no longer supported">
6868
<annotations>
6969
<features value="PageBuilder"/>
7070
<stories value="Slider"/>
@@ -76,6 +76,9 @@
7676
<group value="pagebuilder"/>
7777
<group value="pagebuilder-slide"/>
7878
<group value="pagebuilder-slideItemCollageRight"/>
79+
<skip>
80+
<issueId value="DEPRECATED">This version of TinyMCE is no longer supported</issueId>
81+
</skip>
7982
</annotations>
8083
<before>
8184
<remove keyForRemoval="enableTinyMCE4"/>

0 commit comments

Comments
 (0)