Skip to content

Commit 8e205c3

Browse files
hannahnidahannahnida
committed
Merge branch '511_content-snapshot-product-admin-page' of github:magento/magento2-page-builder into 510_content-snapshot-cms-admin-page
2 parents d7d59b5 + db6e435 commit 8e205c3

File tree

26 files changed

+747
-30
lines changed

26 files changed

+747
-30
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidatePageBuilderPreviewActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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="validatePageBuilderPreviewActionGroup">
10+
<actionGroup name="ValidatePageBuilderPreviewActionGroup">
1111
<annotations>
1212
<description>Verifies Page Builder preview has the 'Edit with Page Builder' button, has an overlay, does not have the Page Builder left panel, does not have the Page Builder template buttons, and does not open content type option menus.</description>
1313
</annotations>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
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="addPageLinkWidgetToTinyMCE3" extends="addPageLinkWidgetToTinyMCE">
10+
<actionGroup name="addPageLinkWidgetToTinyMCE3" extends="addPageLinkWidgetToTinyMCE" deprecated="This version of TinyMCE is no longer supported">
1111
<arguments>
1212
<argument name="page" defaultValue="" type="string"/>
1313
</arguments>
1414
<comment userInput="Adding Widget To TinyMCE3" stepKey="commentAddWidget"/>
15-
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCE3WidgetBtn}}" stepKey="waitForInsertWidget1"/>
16-
<click selector="{{TextOnConfiguration.tinyMCE3WidgetBtn}}" stepKey="clickAddWidgetBtn"/>
17-
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCE3WidgetBtn}}" stepKey="waitForInsertWidgetModalToClose"/>
15+
<comment userInput="removing deprecated element" stepKey="waitForInsertWidget1"/>
16+
<comment userInput="removing deprecated element" stepKey="clickAddWidgetBtn"/>
17+
<comment userInput="removing deprecated element" stepKey="waitForInsertWidgetModalToClose"/>
1818
</actionGroup>
1919
</actionGroups>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
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="addVariableToTinyMCE3" extends="addVariableToTinyMCE">
10+
<actionGroup name="addVariableToTinyMCE3" extends="addVariableToTinyMCE" deprecated="This version of TinyMCE is no longer supported">
1111
<arguments>
1212
<argument name="variable" defaultValue=""/>
1313
</arguments>
1414
<comment userInput="Adding Variable To TinyMCE3" stepKey="commentAddVariableToTinyMCE"/>
15-
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCE3VariableBtn}}" stepKey="waitForInsertVariable1"/>
16-
<click selector="{{TextOnConfiguration.tinyMCE3VariableBtn}}" stepKey="clickInsertVariable1"/>
17-
<waitForElementVisible selector="{{TextOnConfiguration.tinyMCE3VariableBtn}}" stepKey="waitForVariableModalToClose"/>
15+
<comment userInput="removing deprecated element" stepKey="waitForInsertVariable1"/>
16+
<comment userInput="removing deprecated element" stepKey="clickInsertVariable1"/>
17+
<comment userInput="removing deprecated element" stepKey="waitForVariableModalToClose"/>
1818
</actionGroup>
1919
</actionGroups>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
<element name="tinyMCEVariable" type="text" selector="(//body//span[contains(@class,'magento-variable') and .='{{arg1}}'])[{{arg2}}]" parameterized="true"/>
1515
<element name="tinyMCEWidget" type="text" selector="(//body//span[contains(@class,'magento-widget') and .='{{arg1}}'])[{{arg2}}]" parameterized="true"/>
1616
<element name="tinyMCEImage" type="text" selector="//img[contains(@src,'{{arg}}')]" parameterized="true"/>
17-
<element name="tinyMCE3" type="text" selector="#pagebuilder_text_form_content_tbl"/>
18-
<element name="tinyMCE3VariableBtn" type="text" selector="#pagebuilder_text_form_content_magentovariable"/>
19-
<element name="tinyMCE3WidgetBtn" type="text" selector="#pagebuilder_text_form_content_magentowidget"/>
17+
<element name="tinyMCE3" type="text" selector="#pagebuilder_text_form_content_tbl" deprecated="TinyMCE3 is no long supported use tinyMCE"/>
18+
<element name="tinyMCE3VariableBtn" type="text" selector="#pagebuilder_text_form_content_magentovariable" deprecated="TinyMCE3 is no long supported use tinyMCEVariableBtn"/>
19+
<element name="tinyMCE3WidgetBtn" type="text" selector="#pagebuilder_text_form_content_magentowidget" deprecated="TinyMCE3 is no long supported use tinyMCEWidgetBtn"/>
20+
<element name="tinyMCE" type="text" selector="#pagebuilder_text_form_content_tbl"/>
21+
<element name="tinyMCEVariableBtn" type="text" selector="#pagebuilder_text_form_content_magentovariable"/>
22+
<element name="tinyMCEWidgetBtn" type="text" selector="#pagebuilder_text_form_content_magentowidget"/>
2023
<!-- WYSIWYG Disabled -->
2124
<element name="textArea" type="text" selector="#pagebuilder_text_form_content"/>
2225
<element name="textAreaId" type="text" selector="pagebuilder_text_form_content"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddImageToCMSPageTinyMCE3Test.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="AdminAddImageToCMSPageTinyMCE3Test">
10+
<test name="AdminAddImageToCMSPageTinyMCE3Test" deprecated="TinyMCE3 is no longer supported">
11+
<annotations>
12+
<skip>
13+
<issueId value="DEPRECATED">TinyMCE3 is no longer supported</issueId>
14+
</skip>
15+
</annotations>
1116
<before>
1217
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" before="loginAsAdmin"/>
1318
</before>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderWorksForEachCatalogProductAttributeTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingIntoRow">
7979
<argument name="contentType" value="PageBuilderHeadingContentType"/>
8080
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
81-
<argument name="containerTargetIndex" value="2"/>
8281
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea($$createProductAttribute.attribute_code$$)}}"/>
8382
</actionGroup>
8483
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
@@ -113,7 +112,7 @@
113112
<actionGroup ref="dragContentTypeToContainer" stepKey="dragButtonsToRow">
114113
<argument name="contentType" value="PageBuilderButtonsContentType"/>
115114
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
116-
<argument name="containerTargetIndex" value="4"/>
115+
<argument name="containerTargetIndex" value="3"/>
117116
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('description')}}"/>
118117
</actionGroup>
119118
<!-- Edit Button Item -->
@@ -155,7 +154,7 @@
155154
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerIntoRow">
156155
<argument name="contentType" value="PageBuilderDividerContentType"/>
157156
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
158-
<argument name="containerTargetIndex" value="5"/>
157+
<argument name="containerTargetIndex" value="2"/>
159158
<argument name="pageBuilderArea" value="{{PageBuilderProductAttribute.PageBuilderArea('short_description')}}"/>
160159
</actionGroup>
161160
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForDivider">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogCategoryContentSnapshotTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3232
</after>
3333
<!-- Verify Page Builder preview is ready -->
34-
<actionGroup ref="validatePageBuilderPreviewActionGroup" stepKey="verifyPageBuilderPreview"/>
34+
<actionGroup ref="ValidatePageBuilderPreviewActionGroup" stepKey="verifyPageBuilderPreview"/>
3535
<!-- Verify Empty Row -->
3636
<actionGroup ref="verifyEmptyStage" stepKey="verifyPreviewEmptyRow"/>
3737
<!-- Open Page Builder Full Screen -->
@@ -55,7 +55,7 @@
5555
<!-- Verify no Empty Preview Message on Stage -->
5656
<dontSeeElementInDOM selector="{{RowOnStage.empty('1')}}" stepKey="dontSeeEmptyRowOnPreview"/>
5757
<!-- Verify Page Builder preview is ready -->
58-
<actionGroup ref="validatePageBuilderPreviewActionGroup" stepKey="verifyPageBuilderPreviewAfterFullScreen"/>
58+
<actionGroup ref="ValidatePageBuilderPreviewActionGroup" stepKey="verifyPageBuilderPreviewAfterFullScreen"/>
5959
<!-- Verify Page Builder Full Screen -->
6060
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen2"/>
6161
</test>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="BannerCollageCenterTinyMCE3InlineEditTest" extends="BannerPosterCanInlineEditContentTest">
10+
<test name="BannerCollageCenterTinyMCE3InlineEditTest" extends="BannerPosterCanInlineEditContentTest" deprecated="TinyMCE3 is no longer supported">
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Banner"/>
@@ -19,6 +19,9 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-bannerCollageCenter"/>
22+
<skip>
23+
<issueId value="DEPRECATED">TinyMCE3 is no longer supported</issueId>
24+
</skip>
2225
</annotations>
2326
<before>
2427
<remove keyForRemoval="enableTinyMCE4"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="BannerCollageLeftTinyMCE3InlineEditTest" extends="BannerPosterCanInlineEditContentTest">
10+
<test name="BannerCollageLeftTinyMCE3InlineEditTest" extends="BannerPosterCanInlineEditContentTest" deprecated="TinyMCE3 is no longer supported">
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Banner"/>
@@ -19,6 +19,9 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-bannerCollageLeft"/>
22+
<skip>
23+
<issueId value="DEPRECATED">TinyMCE3 is no longer supported</issueId>
24+
</skip>
2225
</annotations>
2326
<before>
2427
<remove keyForRemoval="enableTinyMCE4"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="BannerCollageRightTinyMCE3InlineEditTest" extends="BannerPosterCanInlineEditContentTest">
10+
<test name="BannerCollageRightTinyMCE3InlineEditTest" extends="BannerPosterCanInlineEditContentTest" deprecated="TinyMCE3 is no longer supported">
1111
<annotations>
1212
<features value="PageBuilder"/>
1313
<stories value="Banner"/>
@@ -19,6 +19,9 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-banner"/>
2121
<group value="pagebuilder-bannerCollageRight"/>
22+
<skip>
23+
<issueId value="DEPRECATED">TinyMCE3 is no longer supported</issueId>
24+
</skip>
2225
</annotations>
2326
<before>
2427
<remove keyForRemoval="enableTinyMCE4"/>

0 commit comments

Comments
 (0)