Skip to content

Commit 2b3b263

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #656 from bluemwhitew/558_extending-mftf-tests
Extending MFTF Tests
2 parents cb24d11 + a242097 commit 2b3b263

File tree

5 files changed

+284
-4
lines changed

5 files changed

+284
-4
lines changed

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,18 @@
311311
<data key="fieldName">css_classes</data>
312312
<data key="value">first-class second-class third-class</data>
313313
</entity>
314+
<entity name="PageBuilderAdvancedCssClassesPropertyCssSpecificity" type="pagebuilder_advanced_css_classes_property">
315+
<data key="name">CSS Classes</data>
316+
<data key="section">advanced</data>
317+
<data key="fieldName">css_classes</data>
318+
<data key="value">css__specificity</data>
319+
</entity>
320+
<entity name="PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling" type="pagebuilder_advanced_css_classes_property">
321+
<data key="name">CSS Classes</data>
322+
<data key="section">advanced</data>
323+
<data key="fieldName">css_classes</data>
324+
<data key="value">css__responsive-styling</data>
325+
</entity>
314326
<entity name="PageBuilderAdvancedCssClassesProperty_Invalid_GreaterThan" type="pagebuilder_advanced_css_classes_property">
315327
<data key="name">CSS Classes</data>
316328
<data key="section">advanced</data>
@@ -338,6 +350,41 @@
338350
<data key="fieldName">color</data>
339351
<data key="value">#ffffff</data>
340352
</entity>
353+
<entity name="PageBuilderAdvancedTextColorProperty_CadetBlue" type="pagebuilder_advanced_color_property">
354+
<data key="name">Text Color</data>
355+
<data key="section">advanced</data>
356+
<data key="fieldName">color</data>
357+
<data key="value">#5f9ea0</data>
358+
<data key="rgb">rgb(95, 158, 160)</data>
359+
</entity>
360+
<entity name="PageBuilderAdvancedTextColorProperty_CornflowerBlue" type="pagebuilder_advanced_color_property">
361+
<data key="name">Text Color</data>
362+
<data key="section">advanced</data>
363+
<data key="fieldName">color</data>
364+
<data key="value">#6495ed</data>
365+
<data key="rgb">rgb(100, 149, 237)</data>
366+
</entity>
367+
<entity name="PageBuilderAdvancedTextColorProperty_DarkOrchid" type="pagebuilder_advanced_color_property">
368+
<data key="name">Text Color</data>
369+
<data key="section">advanced</data>
370+
<data key="fieldName">color</data>
371+
<data key="value">#9932cc</data>
372+
<data key="rgb">rgb(153, 50, 204)</data>
373+
</entity>
374+
<entity name="PageBuilderAdvancedTextColorProperty_DeepPink" type="pagebuilder_advanced_color_property">
375+
<data key="name">Text Color</data>
376+
<data key="section">advanced</data>
377+
<data key="fieldName">color</data>
378+
<data key="value">#ff1493</data>
379+
<data key="rgb">rgb(255, 20, 147)</data>
380+
</entity>
381+
<entity name="PageBuilderAdvancedTextColorProperty_MidnightBlue" type="pagebuilder_advanced_color_property">
382+
<data key="name">Text Color</data>
383+
<data key="section">advanced</data>
384+
<data key="fieldName">color</data>
385+
<data key="value">#191970</data>
386+
<data key="rgb">rgb(25, 25, 112)</data>
387+
</entity>
341388
<!-- Margins -->
342389
<entity name="PageBuilderMarginsPropertyDefault" type="pagebuilder_margins_property">
343390
<data key="name">Margins and Padding</data>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,22 @@
3535
<data key="selector">[contains(text(), 'a class="pagebuilder-button-primary"')]</data>
3636
<data key="selectorOnFrontend">//a[@class='pagebuilder-button-primary' and @onclick=&quot;location.href = 'https://google.com';&quot;]//span[.='Duplicate Button']</data>
3737
</entity>
38+
<entity name="PageBuilderHtmlPropertyCssSpecificityWithoutBodyId" type="pagebuilder_html_property">
39+
<data key="name">HTML</data>
40+
<data key="section">general</data>
41+
<data key="fieldName">html</data>
42+
<data key="value">&lt;style type=&quot;text/css&quot;&gt;.css__specificity { text-align: center; }&lt;/style&gt;</data>
43+
</entity>
44+
<entity name="PageBuilderHtmlPropertyCssSpecificityWithBodyId" type="pagebuilder_html_property">
45+
<data key="name">HTML</data>
46+
<data key="section">general</data>
47+
<data key="fieldName">html</data>
48+
<data key="value">&lt;style type=&quot;text/css&quot;&gt;#html-body .css__specificity { text-align: center; }&lt;/style&gt;</data>
49+
</entity>
50+
<entity name="PageBuilderHtmlPropertyCssResponsiveStyling" type="pagebuilder_html_property">
51+
<data key="name">HTML</data>
52+
<data key="section">general</data>
53+
<data key="fieldName">html</data>
54+
<data key="value">&lt;style type=&quot;text/css&quot;&gt;#html-body .css__responsive-styling { color: #5f9ea0; } @media (min-width: 576px) { #html-body .css__responsive-styling { color: #6495ed; }} @media (min-width: 768px) { #html-body .css__responsive-styling { color: #9932cc; }} @media (min-width: 992px) { #html-body .css__responsive-styling { color: #ff1493; }} @media (min-width: 1200px) { #html-body .css__responsive-styling { color: #191970; }}&lt;/style&gt;</data>
55+
</entity>
3856
</entities>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStorefrontSection.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
109
<section name="HeadingOnStorefront">
1110
<element name="base" type="text" selector="(//*[@data-content-type='heading'])[{{arg2}}]" parameterized="true"/>
1211
<element name="baseByTagName" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}]" parameterized="true"/>
@@ -25,8 +24,8 @@
2524
<element name="noBorderColor" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][not(contains(@style,'border-color:'))]" parameterized="true" deprecated="Styles are not inline"/>
2625
<element name="borderWidth" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][contains(@style,'border-width: {{arg3}}px;')]" parameterized="true" deprecated="Styles are not inline"/>
2726
<element name="borderRadius" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][contains(@style,'border-radius: {{arg3}}px;')]" parameterized="true" deprecated="Styles are not inline"/>
28-
<element name="cssClasses" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][contains(@class,'{{arg3}}')]" parameterized="true"/>
29-
<element name="noCssClasses" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][not(@class)]" parameterized="true"/>
27+
<element name="cssClasses" type="text" selector="(//{{arg1}}[@data-content-type=&quot;heading&quot;])[{{arg2}}][contains(@class,&quot;{{arg3}}&quot;)]" parameterized="true"/>
28+
<element name="noCssClasses" type="text" selector="(//{{arg1}}[@data-content-type=&quot;heading&quot;])[{{arg2}}][not(@class)]" parameterized="true"/>
3029
<element name="margins" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][contains(@style,'margin: {{arg3}}px;')]" parameterized="true" deprecated="Styles are not inline"/>
3130
<element name="noMargins" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][not(contains(@style,'margin:'))]" parameterized="true" deprecated="Styles are not inline"/>
3231
<element name="padding" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}][contains(@style,'padding: {{arg3}}px;')]" parameterized="true" deprecated="Styles are not inline"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationCssResponsiveStylingTest.xml

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
<test name="AdvancedConfigurationCssResponsiveStylingTest">
10+
<annotations>
11+
<features value="PageBuilder"/>
12+
<stories value="Advanced Configuration"/>
13+
<title value="Heading - CSS Responsive Styling"/>
14+
<description value="Internal (or external) CSS should be able to use media queries to override Page Builder styles that would previously have been inlined."/>
15+
<severity value="MAJOR"/>
16+
<group value="pagebuilder"/>
17+
<group value="pagebuilder-heading"/>
18+
<group value="pagebuilder-advancedConfig"/>
19+
</annotations>
20+
<before>
21+
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
<actionGroup ref="AdminOpenCmsPageActionGroup" stepKey="goToCMSPage">
24+
<argument name="page_id" value="$$createCMSPage.id$$"/>
25+
</actionGroup>
26+
<actionGroup ref="switchToPageBuilderStage" stepKey="waitForPageBuilderDisplay"/>
27+
</before>
28+
<after>
29+
<deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
30+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
31+
</after>
32+
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
33+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
34+
</actionGroup>
35+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
36+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
37+
</actionGroup>
38+
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
39+
<argument name="index" value="1"/>
40+
</actionGroup>
41+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openPageBuilderEditPanel">
42+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
43+
</actionGroup>
44+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterHeadingTextProperty">
45+
<argument name="property" value="PageBuilderHeadingTextProperty"/>
46+
</actionGroup>
47+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterHeadingClassesProperty">
48+
<argument name="property" value="PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling"/>
49+
</actionGroup>
50+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
51+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage2">
52+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
53+
</actionGroup>
54+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openPageBuilderEditPanel2">
55+
<argument name="contentType" value="PageBuilderHtmlContentType"/>
56+
</actionGroup>
57+
<actionGroup ref="fillSlideOutPanelTextArea" stepKey="enterHtmlContent">
58+
<argument name="property" value="PageBuilderHtmlPropertyCssResponsiveStyling"/>
59+
</actionGroup>
60+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
61+
<!-- Verify in Stage -->
62+
<actionGroup ref="verifyHeadingInStage" stepKey="verifyHeadingInStage">
63+
<argument name="headingType" value="PageBuilderHeadingTypeDefaultProperty"/>
64+
</actionGroup>
65+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
66+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
67+
<!-- Verify in Storefront -->
68+
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">
69+
<argument name="page" value="$$createCMSPage.identifier$$"/>
70+
</actionGroup>
71+
<!-- Testing for Viewport: Extra Small -->
72+
<resizeWindow width="575" height="1000" stepKey="resizeWindowToExtraSmall"/>
73+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateContentTypesStyleEqualsExpectedStyleForExtraSmall">
74+
<argument name="selector" value="{{HeadingOnStorefront.cssClasses(PageBuilderHeadingTypeDefaultProperty.value, '1', PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling.value)}}"/>
75+
<argument name="expectedProperty" value="{{PageBuilderAdvancedTextColorProperty_CadetBlue.rgb}}"/>
76+
<argument name="cssProperty" value="color"/>
77+
</actionGroup>
78+
<!-- Testing for Viewport: Small -->
79+
<resizeWindow width="767" height="1000" stepKey="resizeWindowToSmall"/>
80+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateContentTypesStyleEqualsExpectedStyleForSmall">
81+
<argument name="selector" value="{{HeadingOnStorefront.cssClasses(PageBuilderHeadingTypeDefaultProperty.value, '1', PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling.value)}}"/>
82+
<argument name="expectedProperty" value="{{PageBuilderAdvancedTextColorProperty_CornflowerBlue.rgb}}"/>
83+
<argument name="cssProperty" value="color"/>
84+
</actionGroup>
85+
<!-- Testing for Viewport: Medium -->
86+
<resizeWindow width="991" height="1000" stepKey="resizeWindowToMedium"/>
87+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateContentTypesStyleEqualsExpectedStyleForMedium">
88+
<argument name="selector" value="{{HeadingOnStorefront.cssClasses(PageBuilderHeadingTypeDefaultProperty.value, '1', PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling.value)}}"/>
89+
<argument name="expectedProperty" value="{{PageBuilderAdvancedTextColorProperty_DarkOrchid.rgb}}"/>
90+
<argument name="cssProperty" value="color"/>
91+
</actionGroup>
92+
<!-- Testing for Viewport: Large -->
93+
<resizeWindow width="1199" height="1000" stepKey="resizeWindowToLarge"/>
94+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateContentTypesStyleEqualsExpectedStyleForLarge">
95+
<argument name="selector" value="{{HeadingOnStorefront.cssClasses(PageBuilderHeadingTypeDefaultProperty.value, '1', PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling.value)}}"/>
96+
<argument name="expectedProperty" value="{{PageBuilderAdvancedTextColorProperty_DeepPink.rgb}}"/>
97+
<argument name="cssProperty" value="color"/>
98+
</actionGroup>
99+
<!-- Testing for Viewport: Extra Large -->
100+
<resizeWindow width="1440" height="1000" stepKey="resizeWindowToExtraLarge"/>
101+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateContentTypesStyleEqualsExpectedStyleForExtraLarge">
102+
<argument name="selector" value="{{HeadingOnStorefront.cssClasses(PageBuilderHeadingTypeDefaultProperty.value, '1', PageBuilderAdvancedCssClassesPropertyCssResponsiveStyling.value)}}"/>
103+
<argument name="expectedProperty" value="{{PageBuilderAdvancedTextColorProperty_MidnightBlue.rgb}}"/>
104+
<argument name="cssProperty" value="color"/>
105+
</actionGroup>
106+
</test>
107+
</tests>

0 commit comments

Comments
 (0)