Skip to content

Commit 28c8a04

Browse files
omiroshnichenkoomiroshnichenko
committed
Merge branch 'MC-35220' of github.com:magento-tsg-csl3/magento2-page-builder into 544_configurable-page-builder-full-screen-mode
2 parents e0a95f5 + 47b2686 commit 28c8a04

File tree

3 files changed

+77
-0
lines changed

3 files changed

+77
-0
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/AdminSaveCmsPageAfterCopyFromHeadingAndPasteToTextTest.xml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminSaveCmsPageAfterCopyFromHeadingAndPasteToTextTest">
11+
<annotations>
12+
<features value="PageBuilder"/>
13+
<stories value="Text"/>
14+
<title value="Save page after copy and paste between heading and text elements"/>
15+
<description value="Ensure cms page can be saved after copy text from one page builder element to another"/>
16+
<severity value="CRITICAL"/>
17+
<useCaseId value="MC-35220"/>
18+
<testCaseId value="MC-36666"/>
19+
<group value="pagebuilder"/>
20+
<group value="pagebuilder-heading"/>
21+
<group value="pagebuilder-text"/>
22+
</annotations>
23+
<before>
24+
<createData entity="_emptyCmsPage" stepKey="createCmsPage"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
26+
<actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCmsPage">
27+
<argument name="CMSPage" value="$createCmsPage$"/>
28+
</actionGroup>
29+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
30+
</before>
31+
<after>
32+
<deleteData createDataKey="createCmsPage" stepKey="deleteCmsPage"/>
33+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
34+
</after>
35+
<!-- Add Text and Heading -->
36+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
37+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
38+
</actionGroup>
39+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextIntoStage">
40+
<argument name="contentType" value="PageBuilderTextContentType"/>
41+
</actionGroup>
42+
<actionGroup ref="dragContentTypeToStage" stepKey="dragHeadingIntoStage">
43+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
44+
</actionGroup>
45+
<!-- Enter Heading Content -->
46+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
47+
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
48+
</actionGroup>
49+
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
50+
<argument name="index" value="1"/>
51+
</actionGroup>
52+
<actionGroup ref="clickInsideLiveEditHeading" stepKey="clickInsideLiveEditHeading">
53+
<argument name="index" value="1"/>
54+
</actionGroup>
55+
<!-- Select all Heading content and copy, paste into Text -->
56+
<executeJS function="document.execCommand('selectall', null, false);" stepKey="selectAllText"/>
57+
<waitForPageLoad stepKey="waitForTextSelect"/>
58+
<pressKey selector="{{HeadingOnStage.baseByTagName(PageBuilderHeadingTypeProperty_H2.value, '1')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::CONTROL, \Facebook\WebDriver\WebDriverKeys::INSERT]" stepKey="copyAllText"/>
59+
<waitForPageLoad stepKey="waitForTextCopy"/>
60+
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeadingAfterCopy">
61+
<argument name="index" value="1"/>
62+
</actionGroup>
63+
<clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnTextEditorArea"/>
64+
<pressKey selector="{{TextOnStage.tinymce('1')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::SHIFT, \Facebook\WebDriver\WebDriverKeys::INSERT]" stepKey="pasteAllText"/>
65+
<waitForPageLoad stepKey="waitForTextPaste"/>
66+
<!-- Save page and verify copy, paste -->
67+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
68+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="SaveAndContinueEdit"/>
69+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterSave"/>
70+
<waitForElementVisible selector="{{HeadingOnStage.headingText(PageBuilderHeadingTypeProperty_H2.value, PageBuilderHeadingTextProperty.value, '1')}}" stepKey="waitForHeadingVisible"/>
71+
<waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderHeadingTextProperty.value)}}" stepKey="waitForTextVisible"/>
72+
</test>
73+
</tests>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/text/preview.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/preview.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ export default class Preview extends BasePreview {
153153

154154
const wysiwygConfig = this.config.additional_data.wysiwygConfig.wysiwygConfigData;
155155

156+
wysiwygConfig.adapter.settings.paste_as_text = true;
157+
156158
if (focus) {
157159
wysiwygConfig.adapter.settings.auto_focus = this.element.id;
158160
wysiwygConfig.adapter.settings.init_instance_callback = () => {

0 commit comments

Comments
 (0)