Skip to content

Commit f99d984

Browse files
author
Lukasz Borowiec
committed
Merge branch '512_content-snapshot-block-admin-page' into 513_content-snapshot-dynamic-block
2 parents eeb2fc2 + 6306983 commit f99d984

File tree

75 files changed

+935
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+935
-101
lines changed

‎app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function __construct(
5656
}
5757
} catch (NoSuchEntityException $e) {
5858
// This model is used by non product attributes
59-
$config['wysiwyg'] = false;
59+
$config['wysiwyg'] = true;
6060
}
6161
}
6262
$isEnablePageBuilder = isset($wysiwygConfigData['is_pagebuilder_enabled'])

‎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/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveButtonItemsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</actionGroup>
5858
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
5959
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1" after="saveEditPanelSettingsAfterBlock"/>
60-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen"/>
60+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen1"/>
6161
<!-- Validate CMS Page Storefront -->
6262
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">
6363
<argument name="page" value="$$createCMSPage.identifier$$"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveTabItemsTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3535
</after>
3636
<comment userInput="---merging to remove step---" stepKey="enterPageTitle"/>
37-
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
3837
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
38+
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage" after="exitPageBuilderFullScreen"/>
3939
<!-- Go to CMS Page and choose Block -->
4040
<comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="seeTab2NameStageAfterSave"/>
4141
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">
@@ -55,8 +55,8 @@
5555
<argument name="block" value="$$createPreReqBlock$$"/>
5656
</actionGroup>
5757
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
58-
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen" after="saveEditPanelSettingsAfterBlock"/>
59-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen"/>
58+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1" after="saveEditPanelSettingsAfterBlock"/>
59+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen1"/>
6060
<!-- Validate CMS Page Storefront -->
6161
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">
6262
<argument name="page" value="$$createCMSPage.identifier$$"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyPageBuilderEnableOnBlockPageWhenPageBuilderEnabledAndWYSIWYGDisabledTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
3434
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
3535
</actionGroup>
36-
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFromContentPreviewOverlay"/>
36+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
3737
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
3838
<argument name="contentType" value="PageBuilderTextContentType"/>
3939
</actionGroup>
@@ -45,10 +45,12 @@
4545
</actionGroup>
4646
<fillField selector="{{TextOnConfiguration.textArea}}" userInput="Hello CMS Block from PageBuilder" stepKey="addTextToEditor"/>
4747
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
48+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
4849
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>
4950
<actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToContentCreatedCMSBlockPage2">
5051
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
5152
</actionGroup>
53+
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen1"/>
5254
<actionGroup ref="verifyPageBuilderVisibleOnPage" stepKey="seePageBuilderOnPage"/>
5355
</test>
5456
</tests>

‎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">

0 commit comments

Comments
 (0)