Skip to content

Commit 6adf298

Browse files
author
Hwashiang Yu
committed
MC-13917: Content types mark up within Text content type causes whole stage to become HTML
- Resolved mftf test failure from merging
1 parent b3d56b3 commit 6adf298

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@
1414
<entity name="cmsPageWithImage" type="cms_page">
1515
<data key="content">&lt;img src=&quot;{{media url='wysiwyg/home/home-t-shirts.png'}}&quot;/&gt;</data>
1616
</entity>
17-
<entity name="cmsPageNonexistentDataRole" type="cms_page">
17+
<entity name="cmsPageNonexistentDataContentType" type="cms_page">
1818
<data key="content">&lt;div data-content-type=&quot;row&quot;&gt;&lt;div data-content-type=&quot;non-existent-content-type&quot;&gt;&lt;/div&gt;&lt;/div&gt;</data>
1919
</entity>
2020
<entity name="_cmsPageWithNestedText" type="cms_page">
2121
<data key="title" unique="suffix">PageBuilder Nested Text Content Type CMS Page</data>
2222
<data key="identifier" unique="suffix">page-builder-nested-text-content-type-</data>
23-
<data key="content">&lt;div data-role=&quot;row&quot; data-appearance=&quot;&quot; data-element=&quot;main&quot;&gt;&lt;div data-enable-parallax=&quot;&quot; data-parallax-speed=&quot;&quot; data-background-images=&quot;{}&quot; data-element=&quot;inner&quot;&gt;&lt;div data-role=&quot;text&quot; data-appearance=&quot;default&quot; data-element=&quot;main&quot;&gt;&lt;div data-role=&quot;text&quot; data-appearance=&quot;default&quot; data-element=&quot;main&quot;&gt;test string&lt;/div&gt;&lt;/div&gt;&lt;/div&gt;&lt;/div&gt;</data>
23+
<data key="content">&lt;div data-content-type=&quot;row&quot; data-appearance=&quot;&quot; data-element=&quot;main&quot;&gt;&lt;div data-enable-parallax=&quot;&quot; data-parallax-speed=&quot;&quot; data-background-images=&quot;{}&quot; data-element=&quot;inner&quot;&gt;&lt;div data-content-type=&quot;text&quot; data-appearance=&quot;default&quot; data-element=&quot;main&quot;&gt;&lt;div data-content-type=&quot;text&quot; data-appearance=&quot;default&quot; data-element=&quot;main&quot;&gt;test string&lt;/div&gt;&lt;/div&gt;&lt;/div&gt;&lt;/div&gt;</data>
2424
</entity>
2525
<entity name="_cmsPageWithBannerNestedText" type="cms_page">
2626
<data key="title" unique="suffix">PageBuilder Nested Banner Text Content Type CMS Page</data>
2727
<data key="identifier" unique="suffix">page-builder-nested-banner-text-content-type-</data>
28-
<data key="content">&lt;div data-role=&quot;row&quot; data-appearance=&quot;contained&quot; data-element=&quot;main&quot;&gt;
28+
<data key="content">&lt;div data-content-type=&quot;row&quot; data-appearance=&quot;contained&quot; data-element=&quot;main&quot;&gt;
2929
&lt;div data-element=&quot;inner&quot;&gt;
30-
&lt;div data-role=&quot;banner&quot; data-appearance=&quot;poster&quot; data-element=&quot;main&quot;&gt;
30+
&lt;div data-content-type=&quot;banner&quot; data-appearance=&quot;poster&quot; data-element=&quot;main&quot;&gt;
3131
&lt;div data-element=&quot;empty_link&quot;&gt;
3232
&lt;div class=&quot;pagebuilder-banner-wrapper&quot; data-element=&quot;wrapper&quot;&gt;
3333
&lt;div class=&quot;pagebuilder-overlay pagebuilder-poster-overlay&quot; data-element=&quot;overlay&quot;&gt;
3434
&lt;div class=&quot;pagebuilder-poster-content&quot;&gt;
3535
&lt;div data-element=&quot;content&quot;&gt;
36-
&lt;div data-role=&quot;text&quot; data-appearance=&quot;default&quot; data-element=&quot;main&quot;&gt;Good Night!&lt;/div&gt;
36+
&lt;div data-content-type=&quot;text&quot; data-appearance=&quot;default&quot; data-element=&quot;main&quot;&gt;Good Night!&lt;/div&gt;
3737
&lt;/div&gt;
3838
&lt;/div&gt;
3939
&lt;/div&gt;
@@ -47,16 +47,16 @@
4747
<entity name="_cmsPageWithSliderNestedText" type="cms_page">
4848
<data key="title" unique="suffix">PageBuilder Nested Slider Text Content Type CMS Page</data>
4949
<data key="identifier" unique="suffix">page-builder-nested-slider-text-content-type-</data>
50-
<data key="content">&lt;div data-role=&quot;row&quot; data-appearance=&quot;contained&quot; data-element=&quot;main&quot;&gt;
50+
<data key="content">&lt;div data-content-type=&quot;row&quot; data-appearance=&quot;contained&quot; data-element=&quot;main&quot;&gt;
5151
&lt;div data-enable-parallax=&quot;0&quot; data-parallax-speed=&quot;0.5&quot; data-background-images=&quot;{}&quot; data-element=&quot;inner&quot;&gt;
52-
&lt;div class=&quot;pagebuilder-slider&quot; data-role=&quot;slider&quot; data-appearance=&quot;default&quot; data-autoplay=&quot;false&quot; data-autoplay-speed=&quot;4000&quot; data-fade=&quot;false&quot; data-infinite-loop=&quot;false&quot; data-show-arrows=&quot;false&quot; data-show-dots=&quot;true&quot; data-element=&quot;main&quot;&gt;
53-
&lt;div data-role=&quot;slide&quot; data-slide-name=&quot;&quot; data-appearance=&quot;poster&quot; data-show-button=&quot;never&quot; data-show-overlay=&quot;never&quot; data-element=&quot;main&quot; style=&quot;margin: 0px;&quot;&gt;
52+
&lt;div class=&quot;pagebuilder-slider&quot; data-content-type=&quot;slider&quot; data-appearance=&quot;default&quot; data-autoplay=&quot;false&quot; data-autoplay-speed=&quot;4000&quot; data-fade=&quot;false&quot; data-infinite-loop=&quot;false&quot; data-show-arrows=&quot;false&quot; data-show-dots=&quot;true&quot; data-element=&quot;main&quot;&gt;
53+
&lt;div data-content-type=&quot;slide&quot; data-slide-name=&quot;&quot; data-appearance=&quot;poster&quot; data-show-button=&quot;never&quot; data-show-overlay=&quot;never&quot; data-element=&quot;main&quot; style=&quot;margin: 0px;&quot;&gt;
5454
&lt;div data-element=&quot;empty_link&quot;&gt;
5555
&lt;div class=&quot;pagebuilder-slide-wrapper&quot; data-background-images=&quot;{}&quot; data-element=&quot;wrapper&quot;&gt;
5656
&lt;div class=&quot;pagebuilder-overlay pagebuilder-poster-overlay&quot; data-overlay-color=&quot;&quot; data-element=&quot;overlay&quot;&gt;
5757
&lt;div class=&quot;pagebuilder-poster-content&quot;&gt;
5858
&lt;div data-element=&quot;content&quot;&gt;
59-
&lt;div data-role=&quot;text&quot; data-appearance=&quot;default&quot; data-element=&quot;main&quot;&gt;Good Morning!&lt;/div&gt;
59+
&lt;div data-content-type=&quot;text&quot; data-appearance=&quot;default&quot; data-element=&quot;main&quot;&gt;Good Morning!&lt;/div&gt;
6060
&lt;/div&gt;
6161
&lt;/div&gt;
6262
&lt;/div&gt;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<element name="imageElement" type="button" selector="figure[data-content-type='image'] img:nth-child({{arg1}})" parameterized="true"/>
6161
<element name="imageElementCSS" type="text" selector="figure[data-content-type=image] img"/>
6262
<element name="imageHasAltText" type="button" selector="img.pagebuilder-mobile-hidden[alt='{{arg1}}']" parameterized="true"/>
63-
<element name="imageHasCaption" type="button" selector="figure[data-role='image'] figcaption"/>
63+
<element name="imageHasCaption" type="button" selector="figure[data-content-type='image'] figcaption"/>
6464
<element name="imageHasTitleTag" type="button" selector="img.pagebuilder-mobile-hidden[title='{{arg1}}']" parameterized="true"/>
6565
<element name="imageLink" type="button" selector="figure[data-content-type='image'] a[href='{{arg1}}']" parameterized="true"/>
6666
<element name="imageLinkTarget" type="button" selector="figure[data-content-type='image'] a[target='{{arg1}}']" parameterized="true"/>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<waitForPageLoad stepKey="waitForEditor"/>
125125
<click selector="{{CmsNewPagePageActionsSection.showHideEditor}}" stepKey="clickShowHideEditor"/>
126126
<waitForElementVisible time="1" selector="{{CmsNewPagePageActionsSection.content}}" stepKey="waitForContentField" />
127-
<fillField selector="{{CmsNewPagePageActionsSection.content}}" userInput="{{cmsPageNonexistentDataRole.content}}" stepKey="enterContent"/>
127+
<fillField selector="{{CmsNewPagePageActionsSection.content}}" userInput="{{cmsPageNonexistentDataContentType.content}}" stepKey="enterContent"/>
128128
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
129129
<actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilder"/>
130130
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToContentCreatedCMSPage2">

0 commit comments

Comments
 (0)