Skip to content

Commit 1041047

Browse files
adifucanadifucan
committed
Merge remote-tracking branch 'origin/1.1-develop' into performance-MC-17868
2 parents 32b1ab1 + cf53a6d commit 1041047

File tree

15 files changed

+300
-112
lines changed

15 files changed

+300
-112
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,24 @@
176176
<waitForPageLoad stepKey="waitForPageLoad2"/>
177177
<waitForElementNotVisible selector="{{WYSIWYGInsertLinkModal.modal}}" stepKey="waitForInsertLinkModalGone"/>
178178
</actionGroup>
179+
<actionGroup name="insertLinkInWYSIWYGExistingText">
180+
<arguments>
181+
<argument name="section" defaultValue="TinyMCESection"/>
182+
<argument name="url" type="string"/>
183+
<argument name="title" type="string" defaultValue=""/>
184+
<argument name="wysiwygArea" defaultValue="{{WYSIWYGOnPageBuilderInline.notCss}}" type="string"/>
185+
</arguments>
186+
<comment userInput="insertLinkInWYSIWYGExistingText" stepKey="comment"/>
187+
<waitForElementVisible selector="{{wysiwygArea}} {{section.InsertLink}}" stepKey="waitForInsertLinkButton"/>
188+
<click selector="{{wysiwygArea}} {{section.InsertLink}}" stepKey="clickInsertLinkButton"/>
189+
<waitForPageLoad stepKey="waitForPageLoad"/>
190+
<waitForElementVisible selector="{{WYSIWYGInsertLinkModal.modal}}" stepKey="waitForInsertLinkModal"/>
191+
<fillField selector="{{WYSIWYGInsertLinkModal.urlInput}}" userInput="{{url}}" stepKey="insertUrl"/>
192+
<fillField selector="{{WYSIWYGInsertLinkModal.titleInput}}" userInput="{{title}}" stepKey="insertTitle"/>
193+
<click selector="{{WYSIWYGInsertLinkModal.okButton}}" stepKey="clickOkButton"/>
194+
<waitForPageLoad stepKey="waitForPageLoad2"/>
195+
<waitForElementNotVisible selector="{{WYSIWYGInsertLinkModal.modal}}" stepKey="waitForInsertLinkModalGone"/>
196+
</actionGroup>
179197
<actionGroup name="assertTextareaContainsValue">
180198
<arguments>
181199
<argument name="selector" type="string"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/TextData.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,9 @@
6767
<data key="editPanelValue">{{widget type="Magento\Cms\Block\Widget\Page\Link" template="widget/link/link_block.phtml" page_id="2" type_name="CMS Page Link"}}</data>
6868
<data key="identifier">home</data>
6969
</entity>
70+
<entity name="PageBuilderVariableWidgetText" type="pagebuilder_text_property">
71+
<data key="value">test string</data>
72+
<data key="expectedString1">test str</data>
73+
<data key="expectedString2">ing</data>
74+
</entity>
7075
</entities>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<element name="notHidden" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/parent::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
1515
<element name="textAreaTextContains" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//textarea[contains(@value,'{{arg2}}')]" parameterized="true"/>
1616
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div//*[contains(.,'{{arg2}}')]" parameterized="true"/>
17+
<element name="textAnchorText" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]/p/a[text()='{{arg2}}']" parameterized="true"/>
1718
<element name="directive" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div//span[contains(.,'{{arg2}}')]" parameterized="true"/>
1819
<element name="mcePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]/div//*[starts-with(@id, '{{arg2}}')]" parameterized="true"/>
1920
<element name="variablePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]/div//*[contains(@class, 'magento-variable magento-placeholder')]" parameterized="true"/>
@@ -100,6 +101,6 @@
100101
<element name="noMargins" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}][not(contains(@style,'margin:'))]" parameterized="true"/>
101102
<element name="padding" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
102103
<element name="noPadding" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}][not(contains(@style,'padding:'))]" parameterized="true"/>
103-
<element name="emptyText" type="text" selector="//div[@data-content-type='text']/p[not(text())]"/>
104+
<element name="emptyText" type="text" selector="//div[@data-content-type='text' and not(text())]"/>
104105
</section>
105106
</sections>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<element name="formatSelector" type="button" selector="//div[contains(@class, 'mce-tinymce') and not(contains(@class, 'mce-tinymce-inline'))]//span[text()='Formats']"/>
3131
</section>
3232
<section name="WYSIWYGOnPageBuilderInline">
33+
<element name="inlineCss" type="button" selector=".mce-tinymce.mce-tinymce-inline"/>
3334
<element name="notCss" type="button" selector=".mce-tinymce:not(.mce-tinymce-inline)"/>
3435
<element name="undo" type="button" selector=".mce-tinymce-inline div[aria-label='Undo']"/>
3536
<element name="redo" type="button" selector=".mce-tinymce-inline div[aria-label='Redo']"/>

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

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -2018,68 +2018,6 @@
20182018
<seeElement selector="{{BannerOnBackend.emptyBanner('1')}}" stepKey="seeBannerPlaceholder2"/>
20192019
<dontSeeElementInDOM selector="{{BannerOnBackend.imageOnStage('1',PageBuilderBackgroundImage_JPG.fileName)}}" stepKey="dontSeeImageInDOM2"/>
20202020
</test>
2021-
<test name="BannerInlineEditStaysFocusedWhileDraggingAndDropping">
2022-
<annotations>
2023-
<features value="PageBuilder"/>
2024-
<stories value="Banner"/>
2025-
<title value="Banner - Inline Edit Stays Focused While Dragging And Dropping"/>
2026-
<description value="Verify that the Banner inline edit stays in focus while users drag and drop content"/>
2027-
<severity value="MINOR"/>
2028-
<useCaseId value="MC-937"/>
2029-
<testCaseId value="MC-3840"/>
2030-
<group value="pagebuilder"/>
2031-
<group value="pagebuilder-banner"/>
2032-
</annotations>
2033-
<before>
2034-
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
2035-
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
2036-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2037-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2038-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2039-
</before>
2040-
<after>
2041-
<actionGroup ref="logout" stepKey="logout"/>
2042-
</after>
2043-
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
2044-
<argument name="contentType" value="PageBuilderBannerContentType"/>
2045-
</actionGroup>
2046-
<!-- Add Banner -->
2047-
<comment userInput="Add Banner" stepKey="commentAddBanner"/>
2048-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
2049-
<argument name="contentType" value="PageBuilderBannerContentType"/>
2050-
</actionGroup>
2051-
<actionGroup ref="dragContentTypeToContainer" stepKey="dragContentTypeIntoContainer">
2052-
<argument name="contentType" value="PageBuilderBannerContentType"/>
2053-
</actionGroup>
2054-
<!-- Activate Inline Edit -->
2055-
<comment userInput="Activate Inline Edit" stepKey="commentInlineEdit"/>
2056-
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(PageBuilderBannerContentType.role, '1')}}" stepKey="focusOnEditorArea"/>
2057-
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(PageBuilderBannerContentType.role, '1')}}" stepKey="waitForEditorPanel"/>
2058-
<!-- Add Columns -->
2059-
<comment userInput="Add Columns" stepKey="commentAddColumns"/>
2060-
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection2">
2061-
<argument name="contentType" value="PageBuilderColumnContentType"/>
2062-
</actionGroup>
2063-
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
2064-
<argument name="contentType" value="PageBuilderColumnContentType"/>
2065-
</actionGroup>
2066-
<!-- Verify Editor Still In Focus -->
2067-
<comment userInput="Verify Editor Still In Focus" stepKey="commentEditorInFocus"/>
2068-
<seeElement selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(PageBuilderBannerContentType.role, '1')}}" stepKey="seeEditorPanel"/>
2069-
<!-- Verify Content Type Option Menus Are Hidden -->
2070-
<comment userInput="Verify Content Type Option Menus Are Hidden" stepKey="commentOptionsHidden"/>
2071-
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStage(PageBuilderBannerContentType.role)}}" stepKey="mouseOverBanner"/>
2072-
<waitForPageLoad stepKey="waitForPageLoad"/>
2073-
<seeElementInDOM selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderBannerContentType.role)}}" stepKey="seeBannerOptionsInDOM"/>
2074-
<dontSeeElement selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderBannerContentType.role)}}" stepKey="dontSeeBannerOptions"/>
2075-
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStage(PageBuilderColumnContentType.role)}}" stepKey="mouseOverColumn"/>
2076-
<waitForPageLoad stepKey="waitForPageLoad2"/>
2077-
<seeElementInDOM selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderColumnContentType.role)}}" stepKey="seeColumnOptionsInDOM"/>
2078-
<dontSeeElement selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderColumnContentType.role)}}" stepKey="dontSeeColumnOptions"/>
2079-
<!-- Verify Editor Still In Focus 2 -->
2080-
<comment userInput="Verify Editor Still In Focus 2" stepKey="commentEditorInFocus2"/>
2081-
<seeElement selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(PageBuilderBannerContentType.role, '1')}}" stepKey="seeEditorPanel2"/>
2082-
</test>
20832021
<test name="BannerContentVariableCanWrap">
20842022
<annotations>
20852023
<features value="PageBuilder"/>

0 commit comments

Comments
 (0)