Skip to content

Commit f887efd

Browse files
davemacaulaydavemacaulay
committed
MC-13917: Content types mark up within Text content type causes whole stage to become HTML
- Resolve CR comments - Add new tests for slide and banner
1 parent 1a8db07 commit f887efd

File tree

5 files changed

+112
-12
lines changed

5 files changed

+112
-12
lines changed

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

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,57 @@
1717
<entity name="cmsPageNonexistentDataRole" type="cms_page">
1818
<data key="content">&lt;div data-role=&quot;row&quot;&gt;&lt;div data-role=&quot;non-existent-content-type&quot;&gt;&lt;/div&gt;&lt;/div&gt;</data>
1919
</entity>
20+
<entity name="_cmsPageWithNestedText" type="cms_page">
21+
<data key="title" unique="suffix">PageBuilder Nested Text Content Type CMS Page</data>
22+
<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>
24+
</entity>
25+
<entity name="_cmsPageWithBannerNestedText" type="cms_page">
26+
<data key="title" unique="suffix">PageBuilder Nested Banner Text Content Type CMS Page</data>
27+
<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;
29+
&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;
31+
&lt;div data-element=&quot;empty_link&quot;&gt;
32+
&lt;div class=&quot;pagebuilder-banner-wrapper&quot; data-element=&quot;wrapper&quot;&gt;
33+
&lt;div class=&quot;pagebuilder-overlay pagebuilder-poster-overlay&quot; data-element=&quot;overlay&quot;&gt;
34+
&lt;div class=&quot;pagebuilder-poster-content&quot;&gt;
35+
&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;
37+
&lt;/div&gt;
38+
&lt;/div&gt;
39+
&lt;/div&gt;
40+
&lt;/div&gt;
41+
&lt;/div&gt;
42+
&lt;/div&gt;
43+
&lt;/div&gt;
44+
&lt;/div&gt;
45+
</data>
46+
</entity>
47+
<entity name="_cmsPageWithSliderNestedText" type="cms_page">
48+
<data key="title" unique="suffix">PageBuilder Nested Slider Text Content Type CMS Page</data>
49+
<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;
51+
&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;
54+
&lt;div data-element=&quot;empty_link&quot;&gt;
55+
&lt;div class=&quot;pagebuilder-slide-wrapper&quot; data-background-images=&quot;{}&quot; data-element=&quot;wrapper&quot;&gt;
56+
&lt;div class=&quot;pagebuilder-overlay pagebuilder-poster-overlay&quot; data-overlay-color=&quot;&quot; data-element=&quot;overlay&quot;&gt;
57+
&lt;div class=&quot;pagebuilder-poster-content&quot;&gt;
58+
&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;
60+
&lt;/div&gt;
61+
&lt;/div&gt;
62+
&lt;/div&gt;
63+
&lt;/div&gt;
64+
&lt;/div&gt;
65+
&lt;/div&gt;
66+
&lt;/div&gt;
67+
&lt;/div&gt;
68+
&lt;/div&gt;
69+
</data>
70+
</entity>
2071
<entity name="_emptyCmsPage" type="cms_page">
2172
<!-- This goes in CE repo -->
2273
<data key="title" unique="suffix">Test CMS Page</data>

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,4 @@
6767
<data key="widgetType">Magento\Cms\Block\Widget\Page\Link</data>
6868
<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>
6969
</entity>
70-
<!-- CMS Page -->
71-
<entity name="PageBuilderTextTestString" type="pagebuilder_text_property">
72-
<data key="value">TestString</data>
73-
</entity>
74-
<entity name="_cmsPageWithNestedText" type="cms_page">
75-
<data key="title" unique="suffix">Test Text Page Builder CMS Page</data>
76-
<data key="identifier" unique="suffix">test-page-builder-text-</data>
77-
<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;TestString&lt;/div&gt;&lt;/div&gt;&lt;/div&gt;&lt;/div&gt;</data>
78-
</entity>
7970
</entities>

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,4 +2224,32 @@
22242224
<!-- Validate Image Editor On Storefront -->
22252225
<seeElement selector="{{BannerOnFrontend.messageContentTextAreaImage('1', PageBuilderBackgroundImage_JPG.value)}}" stepKey="validateImageFrontEnd"/>
22262226
</test>
2227+
<test name="BannerTextContainingPageBuilderMarkupWontBreakStage">
2228+
<annotations>
2229+
<features value="PageBuilder"/>
2230+
<stories value="Banner"/>
2231+
<title value="Banner - Nested Text"/>
2232+
<description value="Nested text content types within the banner text shouldn't cause the whole stage to break and render all content in a HTML content type"/>
2233+
<severity value="MAJOR"/>
2234+
<useCaseId value="MC-13917"/>
2235+
<testCaseId value="MC-13930"/>
2236+
<group value="pagebuilder"/>
2237+
<group value="pagebuilder-banner"/>
2238+
</annotations>
2239+
<before>
2240+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2241+
<createData entity="_cmsPageWithBannerNestedText" stepKey="createCMSPage"/>
2242+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToContentCreatedCMSPage">
2243+
<argument name="CMSPage" value="$$createCMSPage$$"/>
2244+
</actionGroup>
2245+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
2246+
</before>
2247+
<after>
2248+
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
2249+
<actionGroup ref="logout" stepKey="logout"/>
2250+
</after>
2251+
<dontSeeElement selector="{{HtmlOnStage.base('1')}}" stepKey="dontSeeHtmlCode" />
2252+
<waitForElementVisible selector="{{BannerOnBackend.base('1')}}" stepKey="waitForBannerVisible" />
2253+
<seeElement selector="{{BannerOnBackend.messageContentText('1', PageBuilderBannerMessageProperty.value)}}" stepKey="seeTestStringInBanner"/>
2254+
</test>
22272255
</tests>

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1862,4 +1862,33 @@
18621862
<waitForPageLoad stepKey="waitForPageLoad4"/>
18631863
<seeElement selector="{{SlideOnFrontend.messageContentTextAreaImage('1', PageBuilderImageProperty_StageJPG.value)}}" stepKey="validateImageFrontEnd"/>
18641864
</test>
1865+
<test name="SlideItemTextContainingPageBuilderMarkupWontBreakStage">
1866+
<annotations>
1867+
<features value="PageBuilder"/>
1868+
<stories value="Slider"/>
1869+
<title value="Slider - Nested Text"/>
1870+
<description value="Nested text content types within the slide items text shouldn't cause the whole stage to break and render all content in a HTML content type"/>
1871+
<severity value="MAJOR"/>
1872+
<useCaseId value="MC-13917"/>
1873+
<testCaseId value="MC-13931"/>
1874+
<group value="pagebuilder"/>
1875+
<group value="pagebuilder-slide"/>
1876+
<group value="pagebuilder-slideItemCommon"/>
1877+
</annotations>
1878+
<before>
1879+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
1880+
<createData entity="_cmsPageWithSliderNestedText" stepKey="createCMSPage"/>
1881+
<actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToContentCreatedCMSPage">
1882+
<argument name="CMSPage" value="$$createCMSPage$$"/>
1883+
</actionGroup>
1884+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1885+
</before>
1886+
<after>
1887+
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
1888+
<actionGroup ref="logout" stepKey="logout"/>
1889+
</after>
1890+
<dontSeeElement selector="{{HtmlOnStage.base('1')}}" stepKey="dontSeeHtmlCode" />
1891+
<waitForElementVisible selector="{{SlideOnBackend.base('1')}}" stepKey="waitForSlideItemVisible" />
1892+
<seeElement selector="{{SlideOnBackend.messageContentText('1', PageBuilderSlideItemButtonText_Common.value)}}" stepKey="seeTestStringInSlideItem"/>
1893+
</test>
18651894
</tests>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2647,12 +2647,12 @@
26472647
<actualResult type="variable">grabComputedTextAlignStoreFront</actualResult>
26482648
</assertEquals>
26492649
</test>
2650-
<test name="TextNestedTextWontBreakStage">
2650+
<test name="TextContainingPageBuilderMarkupWontBreakStage">
26512651
<annotations>
26522652
<features value="PageBuilder"/>
26532653
<stories value="Text"/>
26542654
<title value="Text - Nested Text"/>
2655-
<description value="Nested text content types shouldn't cause the whole stage to break"/>
2655+
<description value="Nested text content types shouldn't cause the whole stage to break and render all content in a HTML content type"/>
26562656
<severity value="MAJOR"/>
26572657
<useCaseId value="MC-13917"/>
26582658
<testCaseId value="MC-13920"/>
@@ -2668,11 +2668,12 @@
26682668
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
26692669
</before>
26702670
<after>
2671+
<deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
26712672
<actionGroup ref="logout" stepKey="logout"/>
26722673
</after>
26732674
<dontSeeElement selector="{{HtmlOnStage.base('1')}}" stepKey="dontSeeHtmlCode" />
26742675
<waitForElementVisible selector="{{TextOnStage.base('1')}}" stepKey="waitForTextVisible" />
26752676
<seeElement selector="{{TextOnStage.base('1')}}" stepKey="seeText" />
2676-
<seeElement selector="{{TextOnStage.text('1', PageBuilderTextTestString.value)}}" stepKey="seeTestStringInText"/>
2677+
<seeElement selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="seeTestStringInText"/>
26772678
</test>
26782679
</tests>

0 commit comments

Comments
 (0)